[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/vc-fossil abdb548 099/111: Update to pdo's latest
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/vc-fossil abdb548 099/111: Update to pdo's latest |
Date: |
Wed, 29 Sep 2021 08:59:29 -0400 (EDT) |
branch: elpa/vc-fossil
commit abdb5487831e641c291c0dcb3848f539ca11f400
Author: venks1 <venksi@gmail.com>
Commit: venks1 <venksi@gmail.com>
Update to pdo's latest
---
vc/el/vc-fossil.el | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 7c92165..60e1231 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -216,9 +216,22 @@ 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 '())
@@ -235,9 +248,7 @@ 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))
- (let ((line (vc-fossil--run "changes" "--classify" "--unchanged"
"--renamed"
- (file-truename file))))
- (setq state (and line (vc-fossil-state-code (car (split-string
line)))))))
+ (setq state (vc-fossil-state-code (cdr (assoc file
vc-fossil--file-classifications)))))
(push (list file state) result)))
(forward-line)))
;; now collect untracked files
@@ -264,8 +275,6 @@ 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"))
- [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., (continued)
- [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., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil da4d895 084/111: Refactored header-line propertizing function., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 9f90307 097/111: Add changes from pdo, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 7e84860 091/111: Attempted pushes. Sigh, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 73c5145 088/111: Tweaked :synchro and :checkout header line formats., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil d9190c0 100/111: Fossil at the end of the VC backends list., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 5d66231 107/111: Changes from upstream, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 4254ef5 104/111: Get changes from upstream upto 2020-09-20, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil f07cd00 108/111: Upstream updates, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil acb773e 098/111: Merge Changes, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil abdb548 099/111: Update to pdo's latest,
ELPA Syncer <=
- [nongnu] elpa/vc-fossil f365e43 110/111: vc-fossil.el: Update from fossil., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 9e52264 028/111: emacs style (cont), some logic issues seem apparent..., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 7c5af95 102/111: enable Fossil VC backend at load / autoload time, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 93c2104 101/111: Merge pull request #1 from barak/trunk, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil bf1969f 033/111: Undo file-truename in log because emacs-23.3.1 gives relative names which confuse fossil., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil c058f3d 039/111: Remove debug message from `vc-fossil-after-dir-status`., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil f4795ba 044/111: Pass `vc-checkout-switches` on checkout., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 6619ffb 048/111: Improve log command., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil b632993 050/111: Handle switches in diff command., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 560d708 051/111: Implement annotate commanad., ELPA Syncer, 2021/09/29