discussion and development of piem
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: piem@inbox.kyleam.com
Subject: [RFC PATCH 03/14] am: Extract git-am logic to dedicated function
Date: Wed, 29 Dec 2021 18:50:25 -0500	[thread overview]
Message-ID: <20211229235036.372313-4-kyle@kyleam.com> (raw)
In-Reply-To: <20211229235036.372313-1-kyle@kyleam.com>

Another command will need the same code.
---
 piem.el | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/piem.el b/piem.el
index ac81c217..4b0457a2 100644
--- a/piem.el
+++ b/piem.el
@@ -913,6 +913,26 @@ (defun piem-am--read-worktree (coderepo branch)
       (user-error "Worktree directory already exists"))
     dir))
 
+(defun piem--git-am (mbox format dir)
+  (setq dir (or dir default-directory))
+  (let ((interactivep (eq (car-safe mbox) :interactive))
+        (args (cons (concat "--patch-format=" (or format "mboxrd"))
+                    piem-am-args)))
+    (when interactivep
+      (setq mbox (cdr mbox)))
+    (if (bufferp mbox)
+        (unwind-protect
+            (apply #'piem-process-call-with-buffer-input
+                   dir mbox piem-git-executable "am" args)
+          (when interactivep
+            (kill-buffer mbox)))
+      (apply #'piem-process-call dir piem-git-executable "am"
+             (append args (list mbox)))))
+  (if (and piem-use-magit
+           (fboundp 'magit-status-setup-buffer))
+      (magit-status-setup-buffer dir)
+    (dired dir)))
+
 ;;;###autoload
 (defun piem-am (mbox &optional format info coderepo toggle-worktree)
   "Feed an am-ready mbox to `git am'.
@@ -975,20 +995,7 @@ (defun piem-am (mbox &optional format info coderepo toggle-worktree)
                      (and use-worktree (list am-directory))
                      (and (not (string-blank-p base))
                           (list base)))))
-    (let ((args (cons (concat "--patch-format=" format)
-                      piem-am-args)))
-      (if (bufferp mbox)
-          (unwind-protect
-              (apply #'piem-process-call-with-buffer-input
-                     am-directory mbox piem-git-executable "am" args)
-            (when interactivep
-              (kill-buffer mbox)))
-        (apply #'piem-process-call am-directory piem-git-executable "am"
-               (append args (list mbox)))))
-    (if (and piem-use-magit
-             (fboundp 'magit-status-setup-buffer))
-        (magit-status-setup-buffer am-directory)
-      (dired am-directory))))
+    (piem--git-am mbox format am-directory)))
 
 (defvar-local piem-edit-patch--coderepo nil)
 (defvar-local piem-edit-patch--format nil)
-- 
2.34.0


  parent reply	other threads:[~2021-12-29 23:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-29 23:50 [RFC PATCH 00/14] am, b4-am: Add commands to extend an existing branch Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 01/14] am: Give better name to default piem-am-read-worktree-function value Kyle Meyer
2022-02-05 17:37   ` Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 02/14] am: Add dedicated function for reading worktree Kyle Meyer
2021-12-29 23:50 ` Kyle Meyer [this message]
2021-12-29 23:50 ` [RFC PATCH 04/14] am: Add function for reading piem-am's arguments Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 05/14] am: Add comment header for patch editing subsection Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 06/14] edit patch: Inject values via interactive arguments Kyle Meyer
2022-02-05 17:48   ` Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 07/14] am, b4-am: Rename piem-am to piem-am-create Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 08/14] am, b4-am: Rewrite -create docstrings to emphasize branch creation Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 09/14] piem-am-create: Move info argument to the end Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 10/14] piem-am--arguments: Make info extraction optional Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 11/14] b4: Move logic for checking arguments to a dedicated function Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 12/14] am, b4-am: Add commands that extend an existing branch Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 13/14] am: Move functionality under a dedicated transient Kyle Meyer
2021-12-29 23:50 ` [RFC PATCH 14/14] b4: Add piem-b4-am-from-mid-extend to transient Kyle Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://git.kyleam.com/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211229235036.372313-4-kyle@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=piem@inbox.kyleam.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.kyleam.com/piem/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).