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

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/12/29 13:20:50

Index: vc-hg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- vc-hg.el    29 Dec 2007 05:54:23 -0000      1.36
+++ vc-hg.el    29 Dec 2007 13:20:48 -0000      1.37
@@ -194,8 +194,8 @@
               (buffer-substring-no-properties (+ (point) 2) 
                                               (line-end-position))))
        (cond
+        ;; State flag for a clean file is now C, might change to =.
         ;; The rest of the possible states in "hg status" output:
-        ;;      R = removed
         ;;      ! = deleted, but still tracked
         ;; should not show up in vc-dired, so don't deal with them
         ;; here.
@@ -203,14 +203,20 @@
          (vc-file-setprop file 'vc-state 'up-to-date))
         ((eq status-char ?A)
          (vc-file-setprop file 'vc-working-revision "0")
-         (vc-file-setprop file 'vc-state 'edited))
+         (vc-file-setprop file 'vc-state 'added))
+        ((eq status-char ?R)
+         (vc-file-setprop file 'vc-state 'removed))
         ((eq status-char ?M)
          (vc-file-setprop file 'vc-state 'edited))
         ((eq status-char ?I)
          (vc-file-setprop file 'vc-state 'ignored))
         ((eq status-char ??)
          (vc-file-setprop file 'vc-backend 'none)
-         (vc-file-setprop file 'vc-state 'unregistered)))
+         (vc-file-setprop file 'vc-state 'unregistered))
+        ((eq status-char ?!)
+         nil)
+        (t     ;; Presently C, might change to = in 0.9.6
+         (vc-file-setprop file 'vc-state 'up-to-date)))
        (forward-line)))))
 
 (defun vc-hg-working-revision (file)