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

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

[elpa] externals/vc-got e9a5df0 098/145: make vc-annotate-show-diff-revi


From: ELPA Syncer
Subject: [elpa] externals/vc-got e9a5df0 098/145: make vc-annotate-show-diff-revision-at-line works
Date: Thu, 9 Sep 2021 15:58:41 -0400 (EDT)

branch: externals/vc-got
commit e9a5df0576d660dfc5d1d3e6bbb45406654e7dde
Author: Omar Polo <op@omarpolo.com>
Commit: Omar Polo <op@omarpolo.com>

    make vc-annotate-show-diff-revision-at-line works
    
    Improving vc-got-diff so the diff-at-line works in *Annotate* buffer.
    
    vc-got-diff is still not 100% compliant to the interface thought.  The
    ``diff against an empty tree'' is still missing.
---
 vc-got.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/vc-got.el b/vc-got.el
index 1da7887..92b9a8c 100755
--- a/vc-got.el
+++ b/vc-got.el
@@ -698,11 +698,15 @@ Heavily inspired by `vc-git-log-view-mode'."
          (inhibit-read-only t))
     (with-current-buffer buffer
       (vc-got-with-worktree (car files)
-        (cond ((and (null rev1)
-                    (null rev2))
-               (dolist (file files)
-                 (vc-got--diff file)))
-              (t (error "Not implemented")))))))
+        (if (and (null rev1)
+                 (null rev2))
+            (dolist (file files)
+              (vc-got--diff file))
+          ;; TODO: if rev1 is nil, diff from the current version until
+          ;; rev2.
+          ;; TODO: if rev2 is nil as well, diff against an empty tree
+          ;; (i.e. get the patch from `got log -p rev1')
+          (vc-got--diff rev1 rev2))))))
 
 (defun vc-got-annotate-command (file buf &optional rev)
   "Show annotated contents of FILE in buffer BUF.  If given, use revision REV."



reply via email to

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