gwqadd 0.3.1 → 0.3.3

package/bin/gwqadd.mjs

@@ -266,6 +266,18 @@ __${slug}_exec() {
 # ${desc}.
 ${fnName}() {
   emulate -L zsh
+  # These print to stdout for the caller — help text, a list, JSON — and one of
+  # them, --json, would collide with the --quiet added below. Capturing that and
+  # handing it to cd produced "file name too long" on --help. Pass them through.
+  local __a
+  for __a in "$@"; do
+    case $__a in
+      -h|--help|-V|--version|--init|--init=*|--json)
+        __${slug}_exec "$@"
+        return $?
+        ;;
+    esac
+  done
   local __dir
   __dir=$(__${slug}_exec --quiet "$@") || return $?
   # Empty is not a failure: --no-cd, --help and --version all succeed without
@@ -296,6 +308,18 @@ __${slug}_exec() {
 
 # ${desc}.
 ${fnName}() {
+  # These print to stdout for the caller — help text, a list, JSON — and one of
+  # them, --json, would collide with the --quiet added below. Capturing that and
+  # handing it to cd produced "file name too long" on --help. Pass them through.
+  local __a
+  for __a in "$@"; do
+    case "$__a" in
+      -h|--help|-V|--version|--init|--init=*|--json)
+        __${slug}_exec "$@"
+        return $?
+        ;;
+    esac
+  done
   local __dir
   __dir=$(__${slug}_exec --quiet "$@") || return $?
   [ -n "$__dir" ] || return 0
@@ -322,6 +346,15 @@ function __${slug}_exec
 end
 
 function ${fnName} --description ${fishq(desc)}
+    # Help text, a list or JSON goes to the caller, not to cd. --json would also
+    # collide with the --quiet added below.
+    for __a in $argv
+        switch $__a
+            case -h --help -V --version --init '--init=*' --json
+                __${slug}_exec $argv
+                return $status
+        end
+    end
     set -l __dir (__${slug}_exec --quiet $argv)
     # \`set\` reports the command substitution's status, but not every fish
     # release agrees on that. Capturing it keeps a failed run from cd'ing,
@@ -941,9 +974,36 @@ function copyToClipboard(text) {
 
 // ── worktree creation ────────────────────────────────────────────────────────
 
-// gwq reports the git command it ran, so a collision's destination can be read
-// back out of its error text.
-const COLLISION = /git worktree add (?:-b [^ ]* )?(\/[^ :]*)/;
+// A collision's destination has to be recovered from gwq's error text. Two
+// sources, in order of reliability:
+//
+//   fatal: '<path>' already exists            <- git, quoted, unambiguous
+//   ...: git worktree add [-b <branch>] <path>: ...
+//
+// The quoted form is preferred because the command echo is not parseable in
+// general: `-b` swaps the argument order (`add -b <branch> <path>` versus
+// `add <path> <branch>`), and a path containing a space silently truncated the
+// old pattern — a gwq basedir under a directory with a space made `-f` do
+// nothing at all, without saying so.
+const COLLISION_QUOTED = /fatal: '([^']+)' already exists/;
+
+// The command echo needs to know which form was used, because `-b` swaps the
+// argument order and both a path and a branch can follow `add`:
+//
+//   gwq add -b <branch>      ->  git worktree add -b <branch> <path>: …
+//   gwq add <branch>         ->  git worktree add <path> <branch>: …
+//
+// Guessing cost real time once already: a pattern that stopped at the first
+// space read the path-first form correctly by accident, and a pattern that ran
+// to the colon swallowed the branch with it.
+const collisionFromCmd = (out, withB) => (withB
+  ? out.match(/git worktree add -b \S+ (.+?): /)
+  : out.match(/git worktree add (.+?) \S+: /))?.[1];
+
+function collisionPath(out, withB) {
+  const quoted = out.match(COLLISION_QUOTED)?.[1];
+  return (quoted ?? collisionFromCmd(out, withB) ?? '').trim();
+}
 
 function timestamp() {
   const d = new Date();
@@ -1054,7 +1114,7 @@ async function main() {
   };
 
   if (status !== 0) {
-    const collide = out.match(COLLISION)?.[1] ?? '';
+    const collide = collisionPath(out, addArgs[0] === '-b');
     // gwq's own -f does not reach `git worktree add` (verified against v0.1.1),
     // so a collision has to be cleared here or not at all.
     if (collide && existsSync(collide) && force) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gwqadd",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Create a branch and its gwq worktree in the repository you are in, and cd there.",
   "type": "module",
   "bin": {