Mercurial > emacs

changeset 96539:d9bc43f652b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-bzr-after-dir-status): Deal with execute bit changes.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 07 Jul 2008 16:34:14 +0000
parents 187f69369145
children f534da0cc0ea
files lisp/ChangeLog lisp/vc-bzr.el
diffstat 2 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jul 07 14:39:35 2008 +0000
+++ b/lisp/ChangeLog	Mon Jul 07 16:34:14 2008 +0000
@@ -1,3 +1,7 @@
+2008-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-after-dir-status): Deal with execute bit changes.
+
 2008-07-06  John Paul Wallington  <jpw@pobox.com>
 
 	* kermit.el (kermit-esc-char, kermit-clean-off): Doc fixes.
--- a/lisp/vc-bzr.el	Mon Jul 07 14:39:35 2008 +0000
+++ b/lisp/vc-bzr.el	Mon Jul 07 16:34:14 2008 +0000
@@ -576,17 +576,19 @@
     ;; else fall back to default vc.el representation
     (vc-default-prettify-state-info 'Bzr file)))
 
-;; XXX: this needs testing, it's probably incomplete.
+;; FIXME: this needs testing, it's probably incomplete.
 (defun vc-bzr-after-dir-status (update-function)
   (let ((status-str nil)
-	(translation '(("+N" . added)
-		       ("-D" . removed)
-		       (" M" . edited)
-		       ;; XXX: what about ignored files?
-		       (" D" . missing)
+	(translation '(("+N " . added)
+		       ("-D " . removed)
+		       (" M " . edited) ;; file text modified
+		       ("  *" . edited) ;; execute bit changed
+		       (" M*" . edited) ;; text modified + execute bit changed
+		       ;; FIXME: what about ignored files?
+		       (" D " . missing)
                        ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
-		       ("C " . conflict)
-		       ("? " . unregistered)
+		       ("C  " . conflict)
+		       ("?  " . unregistered)
                        ;; Ignore "P " and "P." for pending patches.
                        ))
 	(translated nil)
@@ -594,7 +596,7 @@
       (goto-char (point-min))
       (while (not (eobp))
 	(setq status-str
-	      (buffer-substring-no-properties (point) (+ (point) 2)))
+	      (buffer-substring-no-properties (point) (+ (point) 3)))
 	(setq translated (cdr (assoc status-str translation)))
 	;; For conflicts the file appears twice in the listing: once
 	;; with the M flag and once with the C flag, so take care not