[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/07 16:34:17

Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- vc-bzr.el   24 Jun 2008 02:41:03 -0000      1.63
+++ vc-bzr.el   7 Jul 2008 16:34:14 -0000       1.64
@@ -576,14 +576,16 @@
     ;; 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)
@@ -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