emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/vc-fossil 31b0ee6 106/111: From ams: Work better when oper


From: ELPA Syncer
Subject: [nongnu] elpa/vc-fossil 31b0ee6 106/111: From ams: Work better when operating under a subdirectory. vc-fossil.el (vc-fossil--classify-all-files): List only files under directory we are in. (vc-fossil-dir-status-files): Since we are in DIR; don't try to figure out the relative name of the file.
Date: Wed, 29 Sep 2021 08:59:30 -0400 (EDT)

branch: elpa/vc-fossil
commit 31b0ee6285cca98d376eb5b6e1bc832c419c9fd0
Author: Venkat Iyer <venkat_iyer@apple.com>
Commit: Venkat Iyer <venkat_iyer@apple.com>

    From ams: Work better when operating under a subdirectory. vc-fossil.el 
(vc-fossil--classify-all-files): List only files under directory we are in. 
(vc-fossil-dir-status-files): Since we are in DIR; don't try to figure out the 
relative name of the file.
---
 vc-fossil.el | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vc-fossil.el b/vc-fossil.el
index 22eb57b..ca9d426 100644
--- a/vc-fossil.el
+++ b/vc-fossil.el
@@ -180,7 +180,7 @@
 (defun vc-fossil--classify-all-files (dir)
   (setq vc-fossil--file-classifications nil)
   (let* ((default-directory dir)
-        (lines (split-string (vc-fossil--run "changes" "--classify" "--all") 
"[\n\r]+" t)))
+        (lines (split-string (vc-fossil--run "changes" "--classify" "--all" 
".") "[\n\r]+" t)))
     (dolist (line lines)
       (string-match "^\\(\\w+\\)\\s-+\\(.+\\)$" line)
       (let ((pair (cons (match-string 2 line) (match-string 1 line))))
@@ -257,8 +257,6 @@ If nil, use the value of `vc-diff-switches'.  If t, use no 
switches."
            (goto-char (point-max))
          (let ((file (cadr (split-string line)))
                (state (vc-fossil--state-code status-word)))
-           (setq file (expand-file-name file root))
-           (setq file (file-relative-name file dir))
            ;; If 'fossil update' says file is UNCHANGED check to see
            ;; if it has been RENAMED.
            (when (or (not state) (eql state 'up-to-date))
@@ -272,8 +270,6 @@ If nil, use the value of `vc-diff-switches'.  If t, use no 
switches."
     (goto-char (point-min))
     (while (not (eobp))
       (let ((file (buffer-substring-no-properties (point) 
(line-end-position))))
-       (setq file (expand-file-name file dir))
-       (setq file (file-relative-name file dir))
        (push (list file (vc-fossil--state-code nil)) result)
        (forward-line)))
     (funcall update-function result nil)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]