From: Nick Roberts <nickrob@snap.net.nz>
Date: Wed, 30 Dec 2009 02:22:45 +0000 (+1300)
Subject: Show working revision correctly for mercurial.
X-Git-Tag: emacs-pretest-23.1.91~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9c8a2cdf87cac01ea79da989059846ea86a9b72;p=emacs.git

Show working revision correctly for mercurial.
* vc-hg.el (vc-hg-working-revision): Use hg parent instead of
hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>,
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c59b6ed87c..4d78d53c81c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-30  Nick Roberts  <nickrob@snap.net.nz>
+
+	Show working revision correctly for mercurial.
+	* vc-hg.el (vc-hg-working-revision): Use hg parent instead of
+	hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>,
+
 2009-12-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	Declare some functions for the byte-compiler.
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 91e9d682f88..9dc1d380b0a 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -209,14 +209,11 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 			;; Ignore all errors.
 			(process-file
 			 "hg" nil t nil
-			 "log" "-l1" (file-relative-name file)))
+			 "parent" "--template" "\"{rev}\"" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))
-    (when (eq 0 status)
-      (if (string-match "changeset: *\\([0-9]*\\)" out)
-          (match-string 1 out)
-        "0"))))
+    (when (eq 0 status) (read out))))
 
 ;;; History functions