diff options
| author | Glenn Morris | 2014-06-07 17:35:27 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-06-07 17:35:27 -0700 |
| commit | 36cf8493aff99b652b2ad8c9e4d55a18688e8484 (patch) | |
| tree | f8ff499c2ee5e91b20d8576841f0e6bf91d1ba34 /lisp/vc | |
| parent | 2be772ff45057215c1c70252008c1f9703ef3bff (diff) | |
| parent | da8de2908c35ad1fd5c437486d2ea5f6ebb75ca3 (diff) | |
| download | emacs-36cf8493aff99b652b2ad8c9e4d55a18688e8484.tar.gz emacs-36cf8493aff99b652b2ad8c9e4d55a18688e8484.zip | |
Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-hg.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 598a84a5739..df61006ad51 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -234,14 +234,11 @@ highlighting the Log View buffer." | |||
| 234 | 234 | ||
| 235 | (defun vc-hg-working-revision (file) | 235 | (defun vc-hg-working-revision (file) |
| 236 | "Hg-specific version of `vc-working-revision'." | 236 | "Hg-specific version of `vc-working-revision'." |
| 237 | (let ((default-directory (if (file-directory-p file) | 237 | (or (ignore-errors |
| 238 | (file-name-as-directory file) | 238 | (with-output-to-string |
| 239 | (file-name-directory file)))) | 239 | (vc-hg-command standard-output 0 file |
| 240 | (ignore-errors | 240 | "parent" "--template" "{rev}"))) |
| 241 | (with-output-to-string | 241 | "0")) |
| 242 | (process-file vc-hg-program nil standard-output nil | ||
| 243 | "log" "-l" "1" "--template" "{rev}" | ||
| 244 | (file-relative-name file)))))) | ||
| 245 | 242 | ||
| 246 | ;;; History functions | 243 | ;;; History functions |
| 247 | 244 | ||