diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-12-18 06:58:49 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-12-18 06:59:03 +0200 |
| commit | f4747f6c51a07522ea4d9863b20357489f03ce69 (patch) | |
| tree | 2fd39fcadb13a2ebf9b45df0c996bcc676531dfe /lisp/vc/vc-hg.el | |
| parent | ecce24b34ba51f10d2a729bf5496a1cbec0bf329 (diff) | |
| download | emacs-f4747f6c51a07522ea4d9863b20357489f03ce69.tar.gz | |
Use 'hg id' in vc-hg-previous-revision
* lisp/vc/vc-hg.el (vc-hg-previous-revision):
Use 'hg id' to retrieve it (bug#22032).
Diffstat (limited to 'lisp/vc/vc-hg.el')
| -rw-r--r-- | lisp/vc/vc-hg.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index dd897adc59c..62fbfde5f87 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -430,9 +430,13 @@ Optional arg REVISION is a revision to annotate from." ;;; Miscellaneous (defun vc-hg-previous-revision (_file rev) - (let ((newrev (1- (string-to-number rev)))) - (when (>= newrev 0) - (number-to-string newrev)))) + ;; We can't simply decrement by 1, because that revision might be + ;; e.g. on a different branch (bug#22032). + (with-temp-buffer + (and (eq 0 + (vc-hg-command t nil nil "id" "-n" "-r" (concat rev "^"))) + ;; Trim the trailing newline. + (buffer-substring (point-min) (1- (point-max)))))) (defun vc-hg-next-revision (_file rev) (let ((newrev (1+ (string-to-number rev))) |