changeset 106683:17778dd7f114

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>,
author Nick Roberts <nickrob@snap.net.nz>
date Wed, 30 Dec 2009 15:22:45 +1300
parents 598bffb4b64e
children 232c05e79d96
files lisp/ChangeLog lisp/vc-hg.el
diffstat 2 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Dec 29 19:29:33 2009 +0100
+++ b/lisp/ChangeLog	Wed Dec 30 15:22:45 2009 +1300
@@ -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.
--- a/lisp/vc-hg.el	Tue Dec 29 19:29:33 2009 +0100
+++ b/lisp/vc-hg.el	Wed Dec 30 15:22:45 2009 +1300
@@ -209,14 +209,11 @@
 			;; 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