From: Kyle Meyer <kyle@kyleam.com>
To: piem@inbox.kyleam.com
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [PATCH 4/6] am: Add option to configure how worktree is read
Date: Sun, 15 Nov 2020 01:15:16 -0500 [thread overview]
Message-ID: <20201115061518.22191-5-kyle@kyleam.com> (raw)
In-Reply-To: <20201115061518.22191-1-kyle@kyleam.com>
It seems likely that piem-am-read-worktree won't quite behave as some
callers want. Let users specify a custom function.
---
piem.el | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/piem.el b/piem.el
index da7f9f8..ac9812c 100644
--- a/piem.el
+++ b/piem.el
@@ -158,6 +158,14 @@ (defcustom piem-am-create-worktree nil
"Whether to create a dedicated worktree for applying patches."
:type 'boolean)
+(defcustom piem-am-read-worktree-function #'piem-am-read-worktree
+ "Function that reads a to-be-created worktree from the user.
+This function is called with two arguments, the directory of the
+code repository that the worktree will be created from and the
+name of the branch that will be created. The branch may be nil
+if the caller requested a detached HEAD."
+ :type 'function)
+
(defcustom piem-maildir-directory nil
"Inject public-inbox threads into this directory.
If non-nil, this must be an existing Maildir directory."
@@ -702,7 +710,8 @@ (defun piem-am (mbox &optional format info coderepo)
(when piem-am-create-worktree
(setq am-directory
(expand-file-name
- (piem-am-read-worktree default-directory new-branch)))
+ (funcall piem-am-read-worktree-function
+ default-directory new-branch)))
(when (file-exists-p am-directory)
(user-error "Worktree directory already exists")))
(apply #'piem-process-call nil piem-git-executable
--
2.29.2
next prev parent reply other threads:[~2020-11-15 6:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 6:15 [PATCH 0/6] Support applying patches in a new worktree Kyle Meyer
2020-11-15 6:15 ` [PATCH 1/6] piem-am: Rephrase CODEREPO description Kyle Meyer
2020-11-15 6:15 ` [PATCH 2/6] piem-am: Store "empty string" branch check Kyle Meyer
2020-11-15 6:15 ` [PATCH 3/6] am: Support creating a new worktree Kyle Meyer
2020-11-15 6:15 ` Kyle Meyer [this message]
2020-11-15 6:15 ` [PATCH 5/6] am: Allow flipping worktree creation with prefix argument Kyle Meyer
2020-11-15 6:15 ` [PATCH 6/6] manual: Document worktree-related options Kyle Meyer
2020-11-15 13:31 ` [PATCH 0/6] Support applying patches in a new worktree zimoun
2020-11-15 19:26 ` Kyle Meyer
2020-11-15 22:32 ` Kyle Meyer
2020-11-15 23:47 ` zimoun
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=20201115061518.22191-5-kyle@kyleam.com \
--to=kyle@kyleam.com \
--cc=piem@inbox.kyleam.com \
--cc=zimon.toutoune@gmail.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).