[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/vc-fossil 0ab9dce 057/111: Implement diff for the root dir
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/vc-fossil 0ab9dce 057/111: Implement diff for the root directory. |
Date: |
Wed, 29 Sep 2021 08:59:20 -0400 (EDT) |
branch: elpa/vc-fossil
commit 0ab9dceac55e485d0ae62d7517dbde7a201b5718
Author: fifr <fifr>
Commit: fifr <fifr>
Implement diff for the root directory.
Fossil does not allow to specify directories for the diff command. But
this is required for, e.g., `log-view-diff`. Currently only the
special case of the root directory being passed is handled (i.e. diff
the whole tree).
---
vc/el/vc-fossil.el | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 24eeeb6..84261a9 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -273,11 +273,18 @@ If `files` is nil return the status for all files."
("^=== \\(.*\\) ==="
(1 'change-log-date))))))
-(defun vc-fossil-diff (file &optional rev1 rev2 buffer)
+;; TODO: implement diff for directories
+(defun vc-fossil-diff (files &optional rev1 rev2 buffer)
"Get Differences for a file"
- (let ((buf (or buffer "*vc-diff*")))
+ (let ((buf (or buffer "*vc-diff*"))
+ (root (and files (expand-file-name (vc-fossil-root (car files))))))
+ ;; if we diff the root directory, do not specify a file
+ (if (or (null files)
+ (and (null (cdr files))
+ (equal root (expand-file-name (car files)))))
+ (setq files nil))
(apply #'vc-fossil-command
- buf 0 file "diff" "-i"
+ buf 0 files "diff" "-i"
(nconc
(cond
(rev2 (list "--from" (or rev1 "current") "--to" rev2))
- [nongnu] elpa/vc-fossil 0921094 023/111: whitespace and fiddle with a instructions comment, (continued)
- [nongnu] elpa/vc-fossil 0921094 023/111: whitespace and fiddle with a instructions comment, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil eeb48f4 024/111: fiddle with some if constructs so I can read this, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 5e71178 029/111: ideomatic lisp, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil adb17bc 034/111: Use file-truename in vc-fossil-state otherwise status is not returned if called from outside a fossil tree, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 13a0a69 036/111: Untabify, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 1319569 041/111: Show unregistered files in dir stat., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil f0f81f8 043/111: Fix `vc-fossil-find-revision`., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 49552ae 046/111: Delete and rename modify working directory., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 798b503 054/111: Fix file name expansion in log command., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 9f31709 055/111: Fix diff command if old rev is not specified., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 0ab9dce 057/111: Implement diff for the root directory.,
ELPA Syncer <=
- [nongnu] elpa/vc-fossil 141937e 062/111: Fix checkout command for special revisions., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil ec8c00c 058/111: Fix extraction of revision in annotate buffer., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 6eb44a2 064/111: Refactor next-revision and previous-revision commands., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 85119b6 068/111: Merge devel., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil dffd034 069/111: Pipe commit message through log-edit-extract-headers., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 26c16f3 072/111: Create new branch named "pdo", ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 6f26a92 070/111: Implement the pull/update command., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil 9b9736c 079/111: Add github mirror information and remove obsolete notes, ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil c63995e 074/111: Added ability to cope with renamed files., ELPA Syncer, 2021/09/29
- [nongnu] elpa/vc-fossil b468088 083/111: Fixed accidental breakage., ELPA Syncer, 2021/09/29