aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2009-12-30 15:22:45 +1300
committerNick Roberts2009-12-30 15:22:45 +1300
commita9c8a2cdf87cac01ea79da989059846ea86a9b72 (patch)
treec186f0d1d9c288df56c62ff3e91eb453a96e34a6
parent3570691b24eadb24088dd904dc85adb30755db85 (diff)
downloademacs-a9c8a2cdf87cac01ea79da989059846ea86a9b72.tar.gz
emacs-a9c8a2cdf87cac01ea79da989059846ea86a9b72.zip
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>,
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc-hg.el7
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c59b6ed87c..4d78d53c81c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-12-30 Nick Roberts <nickrob@snap.net.nz>
2
3 Show working revision correctly for mercurial.
4 * vc-hg.el (vc-hg-working-revision): Use hg parent instead of
5 hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>,
6
12009-12-29 Juanma Barranquero <lekktu@gmail.com> 72009-12-29 Juanma Barranquero <lekktu@gmail.com>
2 8
3 Declare some functions for the byte-compiler. 9 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."
209 ;; Ignore all errors. 209 ;; Ignore all errors.
210 (process-file 210 (process-file
211 "hg" nil t nil 211 "hg" nil t nil
212 "log" "-l1" (file-relative-name file))) 212 "parent" "--template" "\"{rev}\"" (file-relative-name file)))
213 ;; Some problem happened. E.g. We can't find an `hg' 213 ;; Some problem happened. E.g. We can't find an `hg'
214 ;; executable. 214 ;; executable.
215 (error nil))))))) 215 (error nil)))))))
216 (when (eq 0 status) 216 (when (eq 0 status) (read out))))
217 (if (string-match "changeset: *\\([0-9]*\\)" out)
218 (match-string 1 out)
219 "0"))))
220 217
221;;; History functions 218;;; History functions
222 219