[RFC PATCH 02/14] am: Add dedicated function for reading worktree

[Kyle Meyer <kyle@kyleam.com>]

piem-am calls the value of the variable piem-am-read-worktree-function
and does a bit of error handling outside.  Another command will need
to do the same, so extract the logic to a dedicated function.
---
 piem.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/piem.el b/piem.el
index 9e5b0622..ac81c217 100644
--- a/piem.el
+++ b/piem.el
@@ -905,6 +905,14 @@ (defun piem-am-read-worktree-sibling-named-by-branch (coderepo branch)
           (concat (file-name-nondirectory fname) "-"
                   (replace-regexp-in-string "/" "-" branch))))))
 
+(defun piem-am--read-worktree (coderepo branch)
+  (let ((dir (expand-file-name
+              (funcall piem-am-read-worktree-function
+                       coderepo branch))))
+    (when (file-exists-p dir)
+      (user-error "Worktree directory already exists"))
+    dir))
+
 ;;;###autoload
 (defun piem-am (mbox &optional format info coderepo toggle-worktree)
   "Feed an am-ready mbox to `git am'.
@@ -958,11 +966,7 @@ (defun piem-am (mbox &optional format info coderepo toggle-worktree)
                    (if base (cons base cands) cands)))))
       (when use-worktree
         (setq am-directory
-              (expand-file-name
-               (funcall piem-am-read-worktree-function
-                        default-directory new-branch)))
-        (when (file-exists-p am-directory)
-          (user-error "Worktree directory already exists")))
+              (piem-am--read-worktree default-directory new-branch)))
       (apply #'piem-process-call nil piem-git-executable
              (append (if use-worktree
                          (list "worktree" "add")
-- 
2.34.0