diff options
| author | Santiago PayĆ i Miralta | 2014-06-06 12:29:55 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-06-06 12:29:55 -0400 |
| commit | f4be80b783f23a54b18dfe43ca649a2f4f31b2a5 (patch) | |
| tree | b4fd363fa178addd598e4b09caa6241b4d5f414e | |
| parent | 28b83297264341b404856fd6e96dd366fa0c1fd0 (diff) | |
| download | emacs-f4be80b783f23a54b18dfe43ca649a2f4f31b2a5.tar.gz emacs-f4be80b783f23a54b18dfe43ca649a2f4f31b2a5.zip | |
* lisp/vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and
vc-hg-command.
Fixes: debbugs:17570
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77b1585dcbe..a3f061a7d93 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-06-06 Santiago PayĆ i Miralta <santiagopim@gmail.com> | ||
| 2 | |||
| 3 | * vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and | ||
| 4 | vc-hg-command (bug#17570). | ||
| 5 | |||
| 1 | 2014-06-06 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-06-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * international/mule-cmds.el (ucs-names): Add special entry for BEL | 8 | * international/mule-cmds.el (ucs-names): Add special entry for BEL |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 05b53a3eeb6..b800c64c869 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -227,14 +227,11 @@ highlighting the Log View buffer." | |||
| 227 | 227 | ||
| 228 | (defun vc-hg-working-revision (file) | 228 | (defun vc-hg-working-revision (file) |
| 229 | "Hg-specific version of `vc-working-revision'." | 229 | "Hg-specific version of `vc-working-revision'." |
| 230 | (let ((default-directory (if (file-directory-p file) | 230 | (or (ignore-errors |
| 231 | (file-name-as-directory file) | 231 | (with-output-to-string |
| 232 | (file-name-directory file)))) | 232 | (vc-hg-command standard-output 0 file |
| 233 | (ignore-errors | 233 | "parent" "--template" "{rev}"))) |
| 234 | (with-output-to-string | 234 | "0")) |
| 235 | (process-file vc-hg-program nil standard-output nil | ||
| 236 | "log" "-l" "1" "--template" "{rev}" | ||
| 237 | (file-relative-name file)))))) | ||
| 238 | 235 | ||
| 239 | ;;; History functions | 236 | ;;; History functions |
| 240 | 237 | ||