[elpa] externals/org bab1b26 1/3: lisp/org-attach-git.el: New option `org-attach-git-dir'

[ELPA Syncer]

branch: externals/org
commit bab1b26eb1da0b2d9f574a8cbc313ee00757742d
Author: Juan Manuel Macías <maciaschain@posteo.net>
Commit: Bastien <bzg@gnu.org>

    lisp/org-attach-git.el: New option `org-attach-git-dir'
    
    * lisp/org-attach-git.el (org-attach-git-dir): New option to allow
    using the attachment directory of the current node as a Git
    repository, if correctly initialized.
    (org-attach-git-use-annex, org-attach-git-annex-get-maybe)
    (org-attach-git-commit): Use the new option.
    
    * etc/ORG-NEWS: Announce the new option.
    
    Link: https://orgmode.org/list/87y2g8rj7s.fsf@posteo.net/
---
 etc/ORG-NEWS           |  6 ++++++
 lisp/org-attach-git.el | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index d9000de..0baf93a 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -169,6 +169,12 @@ step that runs inkscape text-to-path replacement over the 
output file.
 ~org-html-scripts~ and ~org-html-style-default~ used to be constants,
 you can now configure them.
 
+*** New option ~org-attach-git-dir~
+
+~org-attach-git-dir~ will decide whether to use ~org-attach-git-dir~
+(the default) or use the attachment directory of the current node, if
+it is correctly configured as a Git repository.
+
 *** Some faces now use fixed-pitch
 
 See [[msg:875z8njaol.fsf@protesilaos.com][this thread]].
diff --git a/lisp/org-attach-git.el b/lisp/org-attach-git.el
index 2091cbc..4c6bdc9 100644
--- a/lisp/org-attach-git.el
+++ b/lisp/org-attach-git.el
@@ -24,7 +24,7 @@
 ;;; Commentary:
 
 ;; An extension to org-attach.  If `org-attach-id-dir' is initialized
-;; as a Git repository, then org-attach-git will automatically commit
+;; as a Git repository, then `org-attach-git' will automatically commit
 ;; changes when it sees them.  Requires git-annex.
 
 ;;; Code:
@@ -52,9 +52,25 @@ If \\='ask, prompt using `y-or-n-p'.  If t, always get.  If 
nil, never get."
          (const :tag "always get from annex if necessary" t)
          (const :tag "never get from annex" nil)))
 
+(defcustom org-attach-git-dir 'default
+  "Attachment directory with the Git repository to use.
+The default value is to use `org-attach-id-dir'.  When set to
+`individual-repository', then the directory attached to the
+current node, if correctly initialized as a Git repository, will
+be used instead."
+  :group 'org-attach
+  :package-version '(Org . "9.5")
+  :type '(choice
+          (const :tag "Default" default)
+          (const :tag "Individual repository" individual-repository)))
+
 (defun org-attach-git-use-annex ()
   "Return non-nil if git annex can be used."
-  (let ((git-dir (vc-git-root (expand-file-name org-attach-id-dir))))
+  (let ((git-dir (vc-git-root
+                  (cond ((eq org-attach-git-dir 'default)
+                         (expand-file-name org-attach-id-dir))
+                        ((eq org-attach-git-dir 'individual-repository)
+                         (org-attach-dir))))))
     (and org-attach-git-annex-cutoff
          (or (file-exists-p (expand-file-name "annex" git-dir))
              (file-exists-p (expand-file-name ".git/annex" git-dir))))))
@@ -62,7 +78,11 @@ If \\='ask, prompt using `y-or-n-p'.  If t, always get.  If 
nil, never get."
 (defun org-attach-git-annex-get-maybe (path)
   "Call git annex get PATH (via shell) if using git annex.
 Signals an error if the file content is not available and it was not 
retrieved."
-  (let* ((default-directory (expand-file-name org-attach-id-dir))
+  (let* ((default-directory
+           (cond ((eq org-attach-git-dir 'default)
+                  (expand-file-name org-attach-id-dir))
+                 ((eq org-attach-git-dir 'individual-repository)
+                  (org-attach-dir))))
         (path-relative (file-relative-name path)))
     (when (and (org-attach-git-use-annex)
               (not
@@ -86,7 +106,10 @@ This checks for the existence of a \".git\" directory in 
that directory.
 
 Takes an unused optional argument for the sake of being compatible
 with hook `org-attach-after-change-hook'."
-  (let* ((dir (expand-file-name org-attach-id-dir))
+  (let* ((dir (cond ((eq org-attach-git-dir 'default)
+                     (expand-file-name org-attach-id-dir))
+                    ((eq org-attach-git-dir 'individual-repository)
+                     (org-attach-dir))))
         (git-dir (vc-git-root dir))
         (use-annex (org-attach-git-use-annex))
         (changes 0))
@@ -102,7 +125,7 @@ with hook `org-attach-after-change-hook'."
                        org-attach-git-annex-cutoff))
               (call-process "git" nil nil nil "annex" "add" new-or-modified)
             (call-process "git" nil nil nil "add" new-or-modified))
-           (cl-incf changes))
+         (cl-incf changes))
        (dolist (deleted
                 (split-string
                  (shell-command-to-string "git ls-files -z --deleted") "\0" t))