branch: externals/vc-jj
commit 346bd34848371bde75f84f266ef3f6009c6e42a6
Author: Rudi Schlatte <[email protected]>
Commit: Rudi Schlatte <[email protected]>
Unbreak dired, vc-dir
---
vc-jj.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index 8b8578e4cd..6b7cf8f324 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -73,15 +73,18 @@
'up-to-date)))))
(defun vc-jj-dir-status-files (dir _files update-function)
+ "Return a list of (FILE STATE EXTRA) entries for DIR."
;; TODO: should be async!
- (let ((files (apply #'process-lines "jj" "file" "list" "--" dir))
- (modified (apply #'process-lines "jj" "diff" "--name-only" "--" dir)))
+ (let* ((dir (expand-file-name dir))
+ (files (process-lines "jj" "file" "list" "--" dir))
+ (modified (process-lines "jj" "diff" "--name-only" "--" dir)))
(let ((result
(mapcar (lambda (file)
(let ((vc-state (if (member file modified)
'edited
'up-to-date)))
- (list file vc-state))))))
+ (list file vc-state)))
+ files)))
(funcall update-function result nil))))
(defun vc-jj-working-revision (file)
