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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Dan Nicolaescu <dann>   07/07/19 23:51:30

Index: vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -b -r1.12.2.4 -r1.12.2.5
--- vc-hg.el    16 Jul 2007 03:58:53 -0000      1.12.2.4
+++ vc-hg.el    19 Jul 2007 23:51:27 -0000      1.12.2.5
@@ -4,7 +4,6 @@
 
 ;; Author: Ivan Kanis
 ;; Keywords: tools
-;; Version: 1889
 
 ;; This file is part of GNU Emacs.
 
@@ -137,7 +136,7 @@
 ;; Modelled after the similar function in vc-bzr.el
 (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
-  (if (vc-hg-root file)               ; short cut
+  (when (vc-hg-root file)           ; short cut
       (vc-hg-state file)))            ; expensive
 
 (defun vc-hg-state (file)
@@ -159,13 +158,14 @@
                    (error nil)))))))
     (when (eq 0 status)
       (if (eq 0 (length out)) 'up-to-date
+       (when (null (string-match ".*: No such file or directory$" out))
        (let ((state (aref out 0)))
          (cond
           ((eq state ?A) 'edited)
           ((eq state ?M) 'edited)
           ((eq state ?R) nil)
           ((eq state ??) nil)
-          (t 'up-to-date)))))))
+            (t 'up-to-date))))))))
 
 (defun vc-hg-dir-state (dir)
   (with-temp-buffer