From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 11 Dec 2014 10:12:13 +0000 (+0100)
Subject: * vc/vc-hg.el (vc-hg-state): Make FILE absolute.  Handle the case
X-Git-Tag: emacs-25.0.90~2635^2~114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=452921cfc11b0e0f93130e57c4aa31036d91964e;p=emacs.git

* vc/vc-hg.el (vc-hg-state): Make FILE absolute.  Handle the case
that there is empty output.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ed1f083976..452f4c3e4a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	* vc/vc-hg.el (vc-hg-state): Make FILE absolute.  Handle the case
+	that there is empty output.
+
 2014-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/eldoc.el (eldoc-documentation-function): Change default.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a56ed672828..e049aab4316 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -188,6 +188,7 @@ highlighting the Log View buffer."
 
 (defun vc-hg-state (file)
   "Hg-specific version of `vc-state'."
+  (setq file (expand-file-name file))
   (let*
       ((status nil)
        (default-directory (file-name-directory file))
@@ -212,19 +213,20 @@ highlighting the Log View buffer."
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))
-    (when (eq 0 status)
-        (when (null (string-match ".*: No such file or directory$" out))
-          (let ((state (aref out 0)))
-            (cond
-             ((eq state ?=) 'up-to-date)
-             ((eq state ?A) 'added)
-             ((eq state ?M) 'edited)
-             ((eq state ?I) 'ignored)
-             ((eq state ?R) 'removed)
-             ((eq state ?!) 'missing)
-             ((eq state ??) 'unregistered)
-             ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
-             (t 'up-to-date)))))))
+    (when (and (eq 0 status)
+	       (> (length out) 0)
+	       (null (string-match ".*: No such file or directory$" out)))
+      (let ((state (aref out 0)))
+	(cond
+	 ((eq state ?=) 'up-to-date)
+	 ((eq state ?A) 'added)
+	 ((eq state ?M) 'edited)
+	 ((eq state ?I) 'ignored)
+	 ((eq state ?R) 'removed)
+	 ((eq state ?!) 'missing)
+	 ((eq state ??) 'unregistered)
+	 ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
+	 (t 'up-to-date))))))
 
 (defun vc-hg-working-revision (file)
   "Hg-specific version of `vc-working-revision'."