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

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

[nongnu] elpa/orgit 0bec3ea912 03/76: orgit-log-{store, open}: kludge to


From: ELPA Syncer
Subject: [nongnu] elpa/orgit 0bec3ea912 03/76: orgit-log-{store, open}: kludge to support version 2.1.0 of Magit
Date: Thu, 13 Jan 2022 13:58:43 -0500 (EST)

branch: elpa/orgit
commit 0bec3ea9128eecd8aa25aaffe73f2487fe9df634
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    orgit-log-{store,open}: kludge to support version 2.1.0 of Magit
    
    Version 2.1.0 of Magit supports logs for multiple revisions.  Orgit
    does not do so yet.  When storing a link to a multi-rev log it now
    discards all but the first rev, but at least it no longer blows up
    when using this version of Magit.
---
 orgit.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/orgit.el b/orgit.el
index e648ba1428..2e57439833 100644
--- a/orgit.el
+++ b/orgit.el
@@ -160,6 +160,10 @@ If all of the above fails then `orgit-export' raises an 
error."
   (when (eq major-mode 'magit-log-mode)
     (let ((repo (abbreviate-file-name default-directory))
           (rev  (cadr magit-refresh-args)))
+      ;; FIXME Once version 2.1.0 of Magit is released,
+      ;; support multi-rev logs.
+      (when (listp rev)
+        (setq rev (car rev)))
       (org-store-link-props
        :type        "orgit-log"
        :link        (format "orgit-log:%s::%s" repo rev)
@@ -168,7 +172,7 @@ If all of the above fails then `orgit-export' raises an 
error."
 (defun orgit-log-open (path)
   (cl-destructuring-bind (default-directory rev)
       (split-string path "::")
-    (magit-log rev)))
+    (magit-log (list rev))))
 
 (defun orgit-log-export (path desc format)
   (orgit-export path desc format "rev" 2))



reply via email to

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