branch: externals/vc-jj
commit e85f69d62d2b61a1720cb83e099a191d74bfbacd
Author: Kristoffer Balintona <[email protected]>
Commit: Kristoffer Balintona <[email protected]>
fix: Transform files into fileset format in `vc-jj-diff'
---
NEWS.org | 2 ++
vc-jj.el | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/NEWS.org b/NEWS.org
index 0700607e56..36f0326f30 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -16,6 +16,8 @@
*** Fixed
+- Fixed =vc-jj-diff= not transforming filenames into jj fileset syntax. This
means commands like =vc-diff= and =log-view-diff= do not fail.
+
** [[https://codeberg.org/emacs-jj-vc/vc-jj.el/compare/v0.3...v0.4][0.4]] -
2025-09-03
*** Added
diff --git a/vc-jj.el b/vc-jj.el
index 64e479cf1e..74ca3b848c 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -757,7 +757,8 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
(defun vc-jj-diff (files &optional rev1 rev2 buffer _async)
"Display diffs for FILES between revisions REV1 and REV2."
;; TODO: handle async
- (setq buffer (get-buffer-create (or buffer "*vc-diff*")))
+ (setq buffer (get-buffer-create (or buffer "*vc-diff*"))
+ files (mapcar #'vc-jj--filename-to-fileset files))
(cond
((not (or rev1 rev2))
(setq rev1 "@-"))
