sync with upstream
This commit is contained in:
parent
6204ce81e5
commit
dcbdc55089
@ -93,7 +93,7 @@ Special commands:
|
|||||||
"Show `xhg-log' corresponding to current line in `xhg-annotate' buffer."
|
"Show `xhg-log' corresponding to current line in `xhg-annotate' buffer."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((rev-number (xhg-annotate-get-rev-num-on-line))
|
(let ((rev-number (xhg-annotate-get-rev-num-on-line))
|
||||||
(fname xhg-annotate-current-buffer))
|
(fname (buffer-file-name xhg-annotate-current-buffer)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(xhg-log rev-number rev-number t fname)
|
(xhg-log rev-number rev-number t fname)
|
||||||
(other-window 1))))
|
(other-window 1))))
|
||||||
|
|||||||
@ -327,11 +327,15 @@ negative : Don't show patches, limit to n revisions."
|
|||||||
(setq command-list (append command-list (list "-p"))))
|
(setq command-list (append command-list (list "-p"))))
|
||||||
;; be verbose or not
|
;; be verbose or not
|
||||||
(setq xhg-log-remember-last-args command-list)
|
(setq xhg-log-remember-last-args command-list)
|
||||||
(setq xhg-log-remember-func-args (list r1 r2 show-patch file))
|
|
||||||
(if (and xhg-log-remember-last-args
|
(if (and xhg-log-remember-last-args
|
||||||
xhg-log-verbose)
|
xhg-log-verbose)
|
||||||
(setq command-list (append '("-v") xhg-log-remember-last-args))
|
(setq command-list (append '("-v") xhg-log-remember-last-args))
|
||||||
(setq command-list xhg-log-remember-last-args))
|
(setq command-list xhg-log-remember-last-args))
|
||||||
|
|
||||||
|
(setf file (expand-file-name (or file (buffer-file-name) default-directory)))
|
||||||
|
(setq command-list (append command-list (list file)))
|
||||||
|
(setq xhg-log-remember-func-args (list r1 r2 show-patch file))
|
||||||
|
|
||||||
(dvc-switch-to-buffer-maybe buffer)
|
(dvc-switch-to-buffer-maybe buffer)
|
||||||
(let ((inhibit-read-only t))
|
(let ((inhibit-read-only t))
|
||||||
(erase-buffer))
|
(erase-buffer))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user