From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Fri, 29 Jan 2010 09:29:15 -0800 (PST) Message-ID: <201001291729.o0THTFam010863@godzilla.ics.uci.edu> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> <873a1qt32z.fsf@telefonica.net> <83aavyt0bt.fsf@gnu.org> <201001290200.o0T200xh010567@godzilla.ics.uci.edu> <83y6jhs2b6.fsf@gnu.org> <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1264786384 17059 80.91.229.12 (29 Jan 2010 17:33:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 17:33:04 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 29 18:32:59 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NauiF-0002Cr-AC for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 18:32:56 +0100 Original-Received: from localhost ([127.0.0.1]:41948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NauiD-0001ld-3c for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 12:32:53 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nauhv-0001h7-BO for emacs-devel@gnu.org; Fri, 29 Jan 2010 12:32:35 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Nauhq-0001gN-P3 for emacs-devel@gnu.org; Fri, 29 Jan 2010 12:32:35 -0500 Original-Received: from [199.232.76.173] (port=60252 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nauhq-0001gK-J4 for emacs-devel@gnu.org; Fri, 29 Jan 2010 12:32:30 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:43146) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nauhl-0004Az-04; Fri, 29 Jan 2010 12:32:25 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o0THTGB3011458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 29 Jan 2010 09:29:16 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o0THTFam010863; Fri, 29 Jan 2010 09:29:15 -0800 (PST) In-Reply-To: <83vdelrx60.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 29 Jan 2010 13:02:47 +0200") Original-Lines: 77 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o0THTGB3011458 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-0.263, required 5, autolearn=disabled, ALL_TRUSTED -1.44, FM_MULTI_ODD2 1.10, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120659 Archived-At: Eli Zaretskii writes: > > From: =C3=93scar Fuentes > > Date: Fri, 29 Jan 2010 11:48:00 +0100 > > Cc: Dan Nicolaescu > >=20 > > Maybe it is a good idea to display the condition that there are pendi= ng > > merges >=20 > Display how? If in the modeline, then that indicator might not be > prominent enough to draw the attention. I've already said that in a previous message: "If yes, then vc-dir can insert a header to tell the user to do a commit with no arguments." Here's an untested p Index: vc-bzr.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v retrieving revision 1.94 diff -u -3 -p -u -p -r1.94 vc-bzr.el --- vc-bzr.el 9 Dec 2009 06:04:12 -0000 1.94 +++ vc-bzr.el 29 Jan 2010 17:20:25 -0000 @@ -663,6 +657,8 @@ stream. Standard error output is discar ;; FIXME: maybe this warning can be put in the vc-dir header... ("wor" . not-found) ;; Ignore "P " and "P." for pending patches. - ("P " . not-found) - ("P. " . not-found) + ("P " . pending-merge) + ("P. " . pending-merge) )) (translated nil) (result nil)) @@ -685,5 +681,7 @@ stream. Standard error output is discar (entry (assoc file result))) (when entry (setf (nth 1 entry) 'conflict)))) + ((eq translated 'pending-merge) + (setq vc-bzr-dir-pending-merge t)) ((eq translated 'renamed) (re-search-forward "R \\(.*\\) =3D> \\(.*\\)$" (line-end-position) t) @@ -702,6 +701,7 @@ (funcall update-function result))) =20 (defun vc-bzr-dir-status (dir update-function) "Return a list of conses (file . state) for DIR." + (set (make-local-variable 'vc-bzr-dir-pending-merge) nil) (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S") (vc-exec-after @@ -749,6 +766,8 @@ stream. Standard error output is discar =20 (defun vc-bzr-extra-status-menu () vc-bzr-extra-menu-map) =20 +(defvar vc-bzr-dir-pending-merge nil) + (defun vc-bzr-dir-extra-headers (dir) (let* ((str (with-temp-buffer @@ -798,7 +817,14 @@ stream. Standard error output is discar 'help-echo shelve-help-echo) (propertize "No shelved changes" 'help-echo shelve-help-echo - 'face 'font-lock-variable-name-face)))))) + 'face 'font-lock-variable-name-face))) + (when vc-bzr-dir-pending-merge + (concat + (propertize "Warning : " 'face 'font-lock-warning-face + 'help-echo shelve-help-echo) + (propertize "Pending merges, commit recommended before any other action" + 'help-echo "Explain here what is going on" + 'face 'font-lock-warning-face)))))) =20 (defun vc-bzr-shelve (name) "Create a shelve."