branch: externals/vc-jj
commit 7a595e37dd8af8dc574c2b06aeccdbde6ade5806
Author: Rudi Schlatte <r...@constantly.at>
Commit: Rudi Schlatte <r...@constantly.at>
Fix vc-annotate
'jj file annotate' takes a "raw" filename, do not expand it into a
fileset expression.
---
vc-jj.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index f19f2077a8..84e663dd63 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -679,9 +679,12 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
"Fill BUF with per-line commit history of FILE at REV."
(let ((rev (or rev "@"))
(file (file-relative-name file)))
- (apply #'vc-jj--command-dispatched buf 'async file "file" "annotate"
+ ;; Contrary to most other jj commands, 'jj file annotate' takes a
+ ;; path instead of a fileset expression, so we append FILE to the
+ ;; unprocessed argument list here.
+ (apply #'vc-jj--command-dispatched buf 'async nil "file" "annotate"
(append (vc-switches 'jj 'annotate)
- (list "-r" rev)))))
+ (list "-r" rev file)))))
(defconst vc-jj--annotation-line-prefix-re
(rx bol
