From: Kyle Meyer <kyle@kyleam.com>
To: piem@inbox.kyleam.com
Subject: [RFC PATCH 09/14] piem-am-create: Move info argument to the end
Date: Wed, 29 Dec 2021 18:50:31 -0500 [thread overview]
Message-ID: <20211229235036.372313-10-kyle@kyleam.com> (raw)
In-Reply-To: <20211229235036.372313-1-kyle@kyleam.com>
The new -extend variant will share all the same arguments except for
INFO, so move that to the end.
---
piem-b4.el | 6 +++---
piem.el | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/piem-b4.el b/piem-b4.el
index 01004c4b..d2370124 100644
--- a/piem-b4.el
+++ b/piem-b4.el
@@ -164,11 +164,11 @@ (defun piem-b4-am-from-mid-create (mid &optional args toggle-worktree)
(unwind-protect
(piem-am-create mbox-file
nil
+ coderepo
+ toggle-worktree
(with-temp-buffer
(insert-file-contents (or cover mbox-file))
- (piem-extract-mbox-info))
- coderepo
- toggle-worktree)
+ (piem-extract-mbox-info)))
(when clean-fn
(funcall clean-fn)))))
diff --git a/piem.el b/piem.el
index 1c00cab8..cb931489 100644
--- a/piem.el
+++ b/piem.el
@@ -948,13 +948,13 @@ (defun piem-am--arguments ()
;; downstream code know.
(list (cons :interactive mbox)
format
- (piem-extract-mbox-info mbox)
(or piem-edit-patch--coderepo
(piem-inbox-coderepo-maybe-read))
- current-prefix-arg)))
+ current-prefix-arg
+ (piem-extract-mbox-info mbox))))
;;;###autoload
-(defun piem-am-create (mbox &optional format info coderepo toggle-worktree)
+(defun piem-am-create (mbox &optional format coderepo toggle-worktree info)
"Create a new branch by feeding an am-ready mbox to `git am'.
MBOX is a buffer whose contents are an am-ready mbox (obtained
@@ -963,16 +963,16 @@ (defun piem-am-create (mbox &optional format info coderepo toggle-worktree)
am'. \"mbox\" and \"mboxrd\" are valid values, and \"mboxrd\" is
the default.
-INFO is a plist that with information to help choose a default
-branch name or starting point (see `piem-default-branch-function'
-for a list of possible properties).
-
CODEREPO, if given, indicates the code repository to operate
within. If not specified, the default directory is used.
When prefix argument TOGGLE-WORKTREE is non-nil, invert the
meaning of `piem-am-create-worktree'. With the default value,
-this triggers the creation of a new worktree."
+this triggers the creation of a new worktree.
+
+INFO is a plist that with information to help choose a default
+branch name or starting point (see `piem-default-branch-function'
+for a list of possible properties)."
(interactive (piem-am--arguments))
(let* ((default-directory (or coderepo default-directory))
(am-directory default-directory)
--
2.34.0
next prev parent reply other threads:[~2021-12-29 23:51 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 ` [RFC PATCH 03/14] am: Extract git-am logic to dedicated function Kyle Meyer
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 ` Kyle Meyer [this message]
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-10-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).