branch: externals/vc-jj
commit e0fcb943d2c251524f08d7e2063e2404f5b55273
Author: Rob <bruno.rob...@gmail.com>
Commit: Rob <bruno.rob...@gmail.com>
Fix vc-jj-annotate breaking on following previous revisions
Small refactor to use a cleaner api, but also to fix buffer not being set
as a
vc buffer, which would break following previous revisions on the vc annotate
buffer
---
vc-jj.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index a9780478e4..7f9f114e91 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -405,10 +405,11 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
(defun vc-jj-annotate-command (file buf &optional rev)
"Fill BUF with per-line commit history of FILE at REV."
- (with-current-buffer buf
- (erase-buffer)
- (let ((rev (or rev "@")))
- (vc-jj--call-jj "file" "annotate" "-r" rev file))))
+ (let ((rev (or rev "@"))
+ (file (file-relative-name file)))
+ (apply #'vc-jj-command buf 'async nil "file" "annotate"
+ (append (vc-switches 'jj 'annotate)
+ (list "-r" rev file)))))
(defconst vc-jj--annotation-line-prefix-re
(rx bol
