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

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

[nongnu] elpa/vc-fossil 9f90307 097/111: Add changes from pdo


From: ELPA Syncer
Subject: [nongnu] elpa/vc-fossil 9f90307 097/111: Add changes from pdo
Date: Wed, 29 Sep 2021 08:59:28 -0400 (EDT)

branch: elpa/vc-fossil
commit 9f90307e2bb0607313c2e5f41a71728a043e6c69
Author: venks1 <venksi@gmail.com>
Commit: venks1 <venksi@gmail.com>

    Add changes from pdo
---
 README.md          |  4 ++++
 vc/el/vc-fossil.el | 19 +++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..bd313d4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+# emacs-fossil
+VC Mode for Emacs to work with the Fossil SCM
+
+This is mirrored from https://chiselapp.com/user/venks/repository/emacs-fossil
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 60e1231..7c92165 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -216,22 +216,9 @@ Allow user to edit command in minibuffer if PROMPT is 
non-nil."
   "Get fossil status for all files in a directory"
   (vc-fossil--dir-status-files dir nil update-function))
 
-(defvar vc-fossil--file-classifications nil
-  "An alist of (filename . classification) pairs.")
-
-(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)))
-    (dolist (line lines)
-      (string-match "^\\(\\w+\\)\\s-+\\(.+\\)$" line)
-      (let ((pair (cons (match-string 2 line) (match-string 1 line))))
-        (push pair vc-fossil--file-classifications)))))
-
 (defun vc-fossil--dir-status-files (dir files update-function)
   "Get fossil status for all specified files in a directory.
 If `files` is nil return the status for all files."
-  (vc-fossil--classify-all-files dir)
   (insert (apply 'vc-fossil--run "update" "-n" "-v" "current"
                  (or files (list dir))))
   (let ((result '())
@@ -248,7 +235,9 @@ If `files` is nil return the status for all files."
             (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))
-              (setq state (vc-fossil-state-code (cdr (assoc file 
vc-fossil--file-classifications)))))
+              (let ((line (vc-fossil--run "changes" "--classify" "--unchanged" 
"--renamed"
+                                          (file-truename file))))
+                (setq state (and line (vc-fossil-state-code (car (split-string 
line)))))))
             (push (list file state) result)))
         (forward-line)))
     ;; now collect untracked files
@@ -275,6 +264,8 @@ If `files` is nil return the status for all files."
   (concat (propertize name  'face 'font-lock-type-face)
           (propertize value 'face 'font-lock-variable-name-face)))
 
+(defun vc-fossil-checkout-model (files) 'implicit)
+
 (defun vc-fossil-dir-extra-headers (dir)
   (let ((info (vc-fossil--run "info"))
         (settings (vc-fossil--run "settings"))



reply via email to

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