diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
| commit | b38f5e6fea9ae63f826e849b0c037d28119604c9 (patch) | |
| tree | 9b786dbab02be01515eb923897b54a91db34aa6c /lisp/vc-hg.el | |
| parent | 896631767cce684848ebcbe72ddafdbab56d2201 (diff) | |
| download | emacs-b38f5e6fea9ae63f826e849b0c037d28119604c9.tar.gz | |
* mouse.el (mouse-popup-menubar): Fix typo.
* emacs-lisp/bytecomp.el (byte-compile-from-buffer): Move one more
form inside with-current-buffer.
* progmodes/antlr-mode.el (provide): Move to the end of file.
(require): Don't require font-lock and compile.
(outline-level, imenu-use-markers, imenu-create-index-function):
Move declarations to top level.
(cond-emacs-xemacs-macfn): Declare for compiler.
* vc-bzr.el (vc-bzr-root):
* vc-arch.el (vc-arch-root): Only set a property if the file is
managed by this backend.
* vc-hg.el (vc-hg-state): Support the new status code for
up-to-date.
Diffstat (limited to 'lisp/vc-hg.el')
| -rw-r--r-- | lisp/vc-hg.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index dd8cccb724b..d921de9bbd9 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -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) |