(vc-hg-registered): Return the false when vc-hg-state

returns 'ignored or 'unregistered.
(vc-hg-state): Pass "-A" to the status command and deal with the
output.
(vc-hg-dir-state): Pass "-A" to the status command.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37fe9fa861e6c8e9ef997507855a846240e53bf0..5b25d7336e39514fb5fe0b44b39c2e44a21cbb7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-hg.el (vc-hg-registered): Return the false when vc-hg-state
+       returns 'ignored or 'unregistered.
+       (vc-hg-state): Pass "-A" to the status command and deal with the
+       output.
+       (vc-hg-dir-state): Pass "-A" to the status command.
+
 2007-12-29  Richard Stallman  <rms@gnu.org>
 
        * progmodes/compile.el (compilation-start): Set initial visible

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 592bccaf5177352be6a9b7f36d4000a20b8b84ea..41cc883c0a4cd5920edbcb1f65c3fcd70e5fb02a 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -147,7 +147,9 @@
 (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
   (when (vc-hg-root file)           ; short cut
-    (vc-file-setprop file 'vc-state (vc-hg-state file)))) ; expensive
+    (let ((state (vc-hg-state file)))  ; expensive
+      (vc-file-setprop file 'vc-state state)
+      (not (memq state '(ignored unregistered))))))
 
 (defun vc-hg-state (file)
   "Hg-specific version of `vc-state'."
@@ -162,26 +164,26 @@
                      ;; Ignore all errors.
                      (call-process
                       "hg" nil t nil "--cwd" (file-name-directory file)
-                      "status" (file-name-nondirectory file))
+                      "status" "-A" (file-name-nondirectory file))
                    ;; Some problem happened.  E.g. We can't find an `hg'
                    ;; executable.
                    (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 ?C) 'up-to-date)
             ((eq state ?A) 'edited)
             ((eq state ?M) 'edited)
             ((eq state ?I) 'ignored)
             ((eq state ?R) 'unregistered)
             ((eq state ??) 'unregistered)
-            (t 'up-to-date))))))))
+            (t 'up-to-date)))))))
 
 (defun vc-hg-dir-state (dir)
   (with-temp-buffer
     (buffer-disable-undo)              ;; Because these buffers can get huge
-    (vc-hg-command (current-buffer) nil nil "status")
+    (vc-hg-command (current-buffer) nil nil "status" "-A")
     (goto-char (point-min))
     (let ((status-char nil)
          (file nil))