[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: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v |
Date: |
Fri, 04 Jan 2008 08:34:17 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/04 08:34:16
Index: vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- vc-hg.el 29 Dec 2007 23:00:36 -0000 1.38
+++ vc-hg.el 4 Jan 2008 08:34:14 -0000 1.39
@@ -172,12 +172,13 @@
(when (null (string-match ".*: No such file or directory$" out))
(let ((state (aref out 0)))
(cond
- ((eq state ?C) 'up-to-date)
+ ((eq state ?=) 'up-to-date)
((eq state ?A) 'edited)
((eq state ?M) 'edited)
((eq state ?I) 'ignored)
((eq state ?R) 'unregistered)
((eq state ??) 'unregistered)
+ ((eq state ?C) 'up-to-date) ;; Older mercurials use this
(t 'up-to-date)))))))
(defun vc-hg-dir-state (dir)
@@ -199,7 +200,9 @@
;; ! = deleted, but still tracked
;; should not show up in vc-dired, so don't deal with them
;; here.
- ((eq status-char ?C)
+
+ ;; Mercurial up to 0.9.5 used C, = is used now.
+ ((or (eq status-char ?=) (eq status-char ?C))
(vc-file-setprop file 'vc-backend 'Hg)
(vc-file-setprop file 'vc-state 'up-to-date))
((eq status-char ?A)
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/06
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/06
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/07
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Miles Bader, 2008/01/08
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/09
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/18
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2008/01/20
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Miles Bader, 2008/01/22