[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v |
Date: |
Fri, 28 Dec 2007 18:16:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Eric S. Raymond <esr> 07/12/28 18:16:58
Index: vc-hg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- vc-hg.el 28 Dec 2007 08:59:49 -0000 1.33
+++ vc-hg.el 28 Dec 2007 18:16:54 -0000 1.34
@@ -173,8 +173,9 @@
(cond
((eq state ?A) 'edited)
((eq state ?M) 'edited)
- ((eq state ?R) nil)
- ((eq state ??) nil)
+ ((eq state ?I) 'ignored)
+ ((eq state ?R) 'unregistered)
+ ((eq state ??) 'unregistered)
(t 'up-to-date))))))))
(defun vc-hg-dir-state (dir)
@@ -194,7 +195,6 @@
;; The rest of the possible states in "hg status" output:
;; R = removed
;; ! = deleted, but still tracked
- ;; ? = not tracked
;; should not show up in vc-dired, so don't deal with them
;; here.
((eq status-char ?A)
@@ -202,9 +202,11 @@
(vc-file-setprop file 'vc-state 'edited))
((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 'nil)))
+ (vc-file-setprop file 'vc-state 'unregistered)))
(forward-line)))))
(defun vc-hg-working-revision (file)
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Eric S. Raymond, 2007/12/26
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Eric S. Raymond, 2007/12/26
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Eric S. Raymond, 2007/12/28
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v,
Eric S. Raymond <=
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/12/28
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/12/29
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Eric S. Raymond, 2007/12/29
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/12/29