From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 1 Feb 2010 04:58:35 +0000 (-0800)
Subject: (vc-bzr-dir-extra-headers): Add a header when a
X-Git-Tag: emacs-pretest-23.1.93~128
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a444e2a993a26daeb15364e8ccff3ba31b3525e;p=emacs.git

(vc-bzr-dir-extra-headers): Add a header when a
pending merge is detected.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96f210a2ba8..09a5d256464 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-dir-extra-headers): Add a header when a
+	pending merge is detected.
+
 2010-01-31  Juri Linkov  <juri@jurta.org>
 
 	* progmodes/grep.el (zrgrep): Call `grep-compute-defaults' at the
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 5f01d297971..1b0206ce70c 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -794,6 +794,12 @@ stream.  Standard error output is discarded."
 	      (buffer-string)))
        (shelve (vc-bzr-shelve-list))
        (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
+       (root-dir (vc-bzr-root dir))
+       (pending-merge
+	(file-exists-p
+	 (expand-file-name ".bzr/checkout/merge-hashes" root-dir)))
+       (pending-merge-help-echo
+	(format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir))
        (light-checkout
 	(when (string-match ".+light checkout root: \\(.+\\)$" str)
 	  (match-string 1 str)))
@@ -819,24 +825,32 @@ stream.  Standard error output is discarded."
 	 (propertize "Checkout of branch : " 'face 'font-lock-type-face)
 	 (propertize light-checkout-branch 'face 'font-lock-variable-name-face)
 	 "\n"))
-     (if shelve
-	 (concat
-	  (propertize "Shelves            :\n" 'face 'font-lock-type-face
-		      'help-echo shelve-help-echo)
-	  (mapconcat
-	   (lambda (x)
-	     (propertize x
-			 'face 'font-lock-variable-name-face
-			 'mouse-face 'highlight
-			 'help-echo "mouse-3: Show shelve menu\nP: Apply and remove shelf (pop)\nC-k: Delete shelf"
-			 'keymap vc-bzr-shelve-map))
-	   shelve "\n"))
-       (concat
-	(propertize "Shelves            : " 'face 'font-lock-type-face
-		    'help-echo shelve-help-echo)
-	(propertize "No shelved changes"
-		    'help-echo shelve-help-echo
-		    'face 'font-lock-variable-name-face))))))
+      (when pending-merge
+	(concat
+	 (propertize "Warning            : " 'face 'font-lock-warning-face
+		     'help-echo pending-merge-help-echo)
+	 (propertize "Pending merges, commit recommended before any other action"
+		     'help-echo pending-merge-help-echo
+		     'face 'font-lock-warning-face)
+	 "\n"))
+      (if shelve
+	  (concat
+	   (propertize "Shelves            :\n" 'face 'font-lock-type-face
+		       'help-echo shelve-help-echo)
+	   (mapconcat
+	    (lambda (x)
+	      (propertize x
+			  'face 'font-lock-variable-name-face
+			  'mouse-face 'highlight
+			  'help-echo "mouse-3: Show shelve menu\nA: Apply and keep shelf\nP: Apply and remove shelf (pop)\nS: Snapshot to a shelf\nC-k: Delete shelf"
+			  'keymap vc-bzr-shelve-map))
+	    shelve "\n"))
+	(concat
+	 (propertize "Shelves            : " 'face 'font-lock-type-face
+		     'help-echo shelve-help-echo)
+	 (propertize "No shelved changes"
+		     'help-echo shelve-help-echo
+		     'face 'font-lock-variable-name-face))))))
 
 (defun vc-bzr-shelve (name)
   "Create a shelve."