git-stack-cli 2.2.8 → 2.3.1

package/dist/js/index.js

@@ -37296,6 +37296,7 @@ async function cli(unsafe_command, unsafe_options) {
       state.actions.debug(log.end(result));
       state.actions.debug(log.output(result));
       if (!options.ignoreExitCode && result.code !== 0) {
+        state.actions.debug(log.non_zero_exit(result));
         reject(new Error(log.error(result)));
       } else {
         resolve(result);
@@ -37332,6 +37333,7 @@ cli.sync = function cli_sync(unsafe_command, unsafe_options) {
   state.actions.debug(log.end(result));
   state.actions.debug(log.output(result));
   if (!options.ignoreExitCode && result.code !== 0) {
+    state.actions.debug(log.non_zero_exit(result));
     throw new Error(log.error(result));
   }
   return result;
@@ -37352,9 +37354,14 @@ var log = {
     return `${result.output}
 `;
   },
-  error(result) {
+  non_zero_exit(result) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;
+  },
+  error(result) {
+    const lines = [result.output, this.non_zero_exit(result)];
+    return lines.join(`
+`);
   }
 };
 
@@ -37704,15 +37711,17 @@ function CherryPickCheck(props) {
     try {
       const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
       const cherry_pick_file = path2.join(git_dir, "CHERRY_PICK_HEAD");
-      const is_cherry_pick = await safe_exists(cherry_pick_file);
-      const status = is_cherry_pick ? "prompt" : "done";
-      patch({ status });
+      if (await safe_exists(cherry_pick_file)) {
+        return patch({ status: "prompt" });
+      }
+      const git_sequencer_dir = (await cli(`git rev-parse --git-path sequencer`)).stdout;
+      if (await safe_exists(git_sequencer_dir)) {
+        return patch({ status: "prompt" });
+      }
+      patch({ status: "done" });
     } catch (err) {
-      actions2.error("Must be run from within a git repository.");
       if (err instanceof Error) {
-        if (actions2.isDebug()) {
-          actions2.error(err.message);
-        }
+        actions2.error(err.message);
       }
       actions2.exit(11);
     }
@@ -38552,11 +38561,8 @@ function DetectInitialPR(props) {
       }
       patch({ status: "done" });
     } catch (err) {
-      actions2.error("Must be run from within a git repository.");
       if (err instanceof Error) {
-        if (actions2.isDebug()) {
-          actions2.error(err.message);
-        }
+        actions2.error(err.message);
       }
       actions2.exit(9);
     }
@@ -38672,11 +38678,8 @@ function DirtyCheck(props) {
         patch({ status: "prompt" });
       }
     } catch (err) {
-      actions2.error("Must be run from within a git repository.");
       if (err instanceof Error) {
-        if (actions2.isDebug()) {
-          actions2.error(err.message);
-        }
+        actions2.error(err.message);
       }
       actions2.exit(12);
     }
@@ -38757,9 +38760,7 @@ async function run() {
   } catch (err) {
     actions.error("Unable to gather git metadata.");
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
     actions.exit(7);
   }
@@ -38885,9 +38886,7 @@ async function run3() {
   } catch (err) {
     actions.error("Unable to retrieve local commit status.");
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
   }
 }
@@ -39194,15 +39193,15 @@ function encode(value) {
 }
 
 // src/commands/Rebase.tsx
-function Rebase() {
+function Rebase(props) {
   return /* @__PURE__ */ React34.createElement(Await, {
     fallback: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
     }, "Rebasing commits…"),
-    function: Rebase.run
+    function: () => Rebase.run(props)
   });
 }
-Rebase.run = async function run5() {
+Rebase.run = async function run5(props) {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -39234,34 +39233,35 @@ Rebase.run = async function run5() {
       const commit2 = commit_range.commit_list[i2];
       const commit_pr = commit_range.pr_lookup[commit2.branch_id || ""];
       const merged_pr = commit_pr?.state === "MERGED";
+      const commit_message = /* @__PURE__ */ React34.createElement(Text, {
+        color: colors.blue
+      }, commit2.subject_line);
       if (merged_pr) {
-        if (actions.isDebug()) {
-          actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
-            wrapper: /* @__PURE__ */ React34.createElement(Text, {
-              color: colors.yellow,
-              wrap: "truncate-end"
-            }),
-            message: "Dropping {commit_message} {pr_status}",
-            values: {
-              commit_message: /* @__PURE__ */ React34.createElement(Brackets, null, commit2.subject_line),
-              pr_status: /* @__PURE__ */ React34.createElement(Parens, null, "MERGED")
-            }
-          }));
-        }
-        continue;
-      }
-      if (actions.isDebug()) {
         actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
           wrapper: /* @__PURE__ */ React34.createElement(Text, {
             color: colors.yellow,
             wrap: "truncate-end"
           }),
-          message: "Picking {commit_message}",
+          message: "Dropping {pr_status} {commit_message}",
           values: {
-            commit_message: /* @__PURE__ */ React34.createElement(Brackets, null, commit2.subject_line)
+            pr_status: /* @__PURE__ */ React34.createElement(Text, {
+              color: colors.purple
+            }, "MERGED"),
+            commit_message
           }
         }));
+        continue;
       }
+      actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
+        wrapper: /* @__PURE__ */ React34.createElement(Text, {
+          color: colors.yellow,
+          wrap: "truncate-end"
+        }),
+        message: "Picking {commit_message}",
+        values: {
+          commit_message
+        }
+      }));
       picked_commit_list.push(commit2);
     }
     if (picked_commit_list.length > 0) {
@@ -39271,33 +39271,34 @@ Rebase.run = async function run5() {
     }
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
     restore_git();
-    const next_commit_range = await range();
-    actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
-      wrapper: /* @__PURE__ */ React34.createElement(Text, {
-        color: colors.green
-      }),
-      message: "✅ {branch_name} in sync with {origin_branch}",
-      values: {
-        branch_name: /* @__PURE__ */ React34.createElement(Brackets, null, branch_name),
-        origin_branch: /* @__PURE__ */ React34.createElement(Brackets, null, master_branch)
-      }
-    }));
     actions.unregister_abort_handler();
-    actions.set((state2) => {
-      state2.commit_range = next_commit_range;
-    });
-    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
-    actions.exit(0);
   } catch (err) {
     actions.error("Unable to rebase.");
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
-    handle_exit();
     actions.exit(20);
   }
+  const next_commit_range = await range();
+  actions.output(/* @__PURE__ */ React34.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React34.createElement(Text, {
+      color: colors.green
+    }),
+    message: "✅ {branch_name} in sync with {origin_branch}",
+    values: {
+      branch_name: /* @__PURE__ */ React34.createElement(Brackets, null, branch_name),
+      origin_branch: /* @__PURE__ */ React34.createElement(Brackets, null, master_branch)
+    }
+  }));
+  actions.set((state2) => {
+    state2.commit_range = next_commit_range;
+  });
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
+    actions.exit(0);
+  }
   function restore_git() {
     const spawn_options = { ignoreExitCode: true };
     cli.sync(`git reset --hard`, spawn_options);
@@ -39322,7 +39323,14 @@ Rebase.run = async function run5() {
 
 // src/app/LocalMergeRebase.tsx
 function LocalMergeRebase() {
-  return /* @__PURE__ */ React35.createElement(Rebase, null);
+  const actions = Store.useActions();
+  return /* @__PURE__ */ React35.createElement(Rebase, {
+    onComplete: () => {
+      actions.set((state) => {
+        state.step = "status";
+      });
+    }
+  });
 }
 
 // src/app/ManualRebase.tsx
@@ -39418,7 +39426,6 @@ async function run6() {
     if (!argv.verbose) {
       actions.error("Try again with `--verbose` to see more information.");
     }
-    handle_exit();
     actions.exit(16);
   }
   function restore_git() {
@@ -40302,7 +40309,6 @@ async function run9() {
     if (!argv.verbose) {
       actions.error("Try again with `--verbose` to see more information.");
     }
-    handle_exit();
     actions.exit(18);
   }
   function get_push_group_list() {
@@ -40526,11 +40532,8 @@ function RebaseCheck(props) {
       const status = is_rebase ? "prompt" : "done";
       patch({ status });
     } catch (err) {
-      actions2.error("Must be run from within a git repository.");
       if (err instanceof Error) {
-        if (actions2.isDebug()) {
-          actions2.error(err.message);
-        }
+        actions2.error(err.message);
       }
       actions2.exit(13);
     }
@@ -40559,9 +40562,7 @@ async function run10() {
   } catch (err) {
     actions.error("Unable to log verbose debug information.");
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
     actions.exit(14);
   }
@@ -45663,7 +45664,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.8").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.3.1").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.2.8",
+  "version": "2.3.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/CherryPickCheck.tsx

@@ -73,18 +73,19 @@ export function CherryPickCheck(props: Props) {
       const git_dir = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
 
       const cherry_pick_file = path.join(git_dir, "CHERRY_PICK_HEAD");
-      const is_cherry_pick = await safe_exists(cherry_pick_file);
+      if (await safe_exists(cherry_pick_file)) {
+        return patch({ status: "prompt" });
+      }
 
-      const status = is_cherry_pick ? "prompt" : "done";
+      const git_sequencer_dir = (await cli(`git rev-parse --git-path sequencer`)).stdout;
+      if (await safe_exists(git_sequencer_dir)) {
+        return patch({ status: "prompt" });
+      }
 
-      patch({ status });
+      patch({ status: "done" });
     } catch (err) {
-      actions.error("Must be run from within a git repository.");
-
       if (err instanceof Error) {
-        if (actions.isDebug()) {
-          actions.error(err.message);
-        }
+        actions.error(err.message);
       }
 
       actions.exit(11);

package/src/app/DetectInitialPR.tsx

@@ -130,12 +130,8 @@ export function DetectInitialPR(props: Props) {
 
       patch({ status: "done" });
     } catch (err) {
-      actions.error("Must be run from within a git repository.");
-
       if (err instanceof Error) {
-        if (actions.isDebug()) {
-          actions.error(err.message);
-        }
+        actions.error(err.message);
       }
 
       actions.exit(9);

package/src/app/DirtyCheck.tsx

@@ -112,12 +112,8 @@ export function DirtyCheck(props: Props) {
         patch({ status: "prompt" });
       }
     } catch (err) {
-      actions.error("Must be run from within a git repository.");
-
       if (err instanceof Error) {
-        if (actions.isDebug()) {
-          actions.error(err.message);
-        }
+        actions.error(err.message);
       }
 
       actions.exit(12);

package/src/app/GatherMetadata.tsx

@@ -112,9 +112,7 @@ async function run() {
     actions.error("Unable to gather git metadata.");
 
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
 
     actions.exit(7);

package/src/app/LocalCommitStatus.tsx

@@ -57,9 +57,7 @@ async function run() {
     actions.error("Unable to retrieve local commit status.");
 
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
   }
 }

package/src/app/LocalMergeRebase.tsx

@@ -1,7 +1,18 @@
 import * as React from "react";
 
+import { Store } from "~/app/Store";
 import { Rebase } from "~/commands/Rebase";
 
 export function LocalMergeRebase() {
-  return <Rebase />;
+  const actions = Store.useActions();
+
+  return (
+    <Rebase
+      onComplete={() => {
+        actions.set((state) => {
+          state.step = "status";
+        });
+      }}
+    />
+  );
 }

package/src/app/ManualRebase.tsx

@@ -136,7 +136,6 @@ async function run() {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    handle_exit();
     actions.exit(16);
   }
 

package/src/app/RebaseCheck.tsx

@@ -79,12 +79,8 @@ export function RebaseCheck(props: Props) {
       const status = is_rebase ? "prompt" : "done";
       patch({ status });
     } catch (err) {
-      actions.error("Must be run from within a git repository.");
-
       if (err instanceof Error) {
-        if (actions.isDebug()) {
-          actions.error(err.message);
-        }
+        actions.error(err.message);
       }
 
       actions.exit(13);

package/src/app/SyncGithub.tsx

@@ -142,7 +142,6 @@ async function run() {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    handle_exit();
     actions.exit(18);
   }
 

package/src/app/VerboseDebugInfo.tsx

@@ -34,9 +34,7 @@ async function run() {
     actions.error("Unable to log verbose debug information.");
 
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
 
     actions.exit(14);

package/src/commands/Rebase.tsx

@@ -7,7 +7,6 @@ import * as Ink from "ink-cjs";
 import { Await } from "~/app/Await";
 import { Brackets } from "~/app/Brackets";
 import { FormatText } from "~/app/FormatText";
-import { Parens } from "~/app/Parens";
 import { Status } from "~/app/Status";
 import { Store } from "~/app/Store";
 import * as CommitMetadata from "~/core/CommitMetadata";
@@ -16,16 +15,20 @@ import { colors } from "~/core/colors";
 import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
-export function Rebase() {
+type Props = {
+  onComplete?: () => void;
+};
+
+export function Rebase(props: Props) {
   return (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={Rebase.run}
+      function={() => Rebase.run(props)}
     />
   );
 }
 
-Rebase.run = async function run() {
+Rebase.run = async function run(props: Props) {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -72,36 +75,33 @@ Rebase.run = async function run() {
 
       // drop commits that are in groups of merged PRs
       const merged_pr = commit_pr?.state === "MERGED";
+      const commit_message = <Ink.Text color={colors.blue}>{commit.subject_line}</Ink.Text>;
 
       if (merged_pr) {
-        if (actions.isDebug()) {
-          actions.output(
-            <FormatText
-              wrapper={<Ink.Text color={colors.yellow} wrap="truncate-end" />}
-              message="Dropping {commit_message} {pr_status}"
-              values={{
-                commit_message: <Brackets>{commit.subject_line}</Brackets>,
-                pr_status: <Parens>MERGED</Parens>,
-              }}
-            />,
-          );
-        }
-
-        continue;
-      }
-
-      if (actions.isDebug()) {
         actions.output(
           <FormatText
             wrapper={<Ink.Text color={colors.yellow} wrap="truncate-end" />}
-            message="Picking {commit_message}"
+            message="Dropping {pr_status} {commit_message}"
             values={{
-              commit_message: <Brackets>{commit.subject_line}</Brackets>,
+              pr_status: <Ink.Text color={colors.purple}>MERGED</Ink.Text>,
+              commit_message,
             }}
           />,
         );
+
+        continue;
       }
 
+      actions.output(
+        <FormatText
+          wrapper={<Ink.Text color={colors.yellow} wrap="truncate-end" />}
+          message="Picking {commit_message}"
+          values={{
+            commit_message,
+          }}
+        />,
+      );
+
       picked_commit_list.push(commit);
     }
 
@@ -121,41 +121,41 @@ Rebase.run = async function run() {
 
     restore_git();
 
-    const next_commit_range = await CommitMetadata.range();
-
-    actions.output(
-      <FormatText
-        wrapper={<Ink.Text color={colors.green} />}
-        message="✅ {branch_name} in sync with {origin_branch}"
-        values={{
-          branch_name: <Brackets>{branch_name}</Brackets>,
-          origin_branch: <Brackets>{master_branch}</Brackets>,
-        }}
-      />,
-    );
-
     actions.unregister_abort_handler();
-
-    actions.set((state) => {
-      state.commit_range = next_commit_range;
-    });
-
-    actions.output(<Status />);
-
-    actions.exit(0);
   } catch (err) {
     actions.error("Unable to rebase.");
 
     if (err instanceof Error) {
-      if (actions.isDebug()) {
-        actions.error(err.message);
-      }
+      actions.error(err.message);
     }
 
-    handle_exit();
     actions.exit(20);
   }
 
+  const next_commit_range = await CommitMetadata.range();
+
+  actions.output(
+    <FormatText
+      wrapper={<Ink.Text color={colors.green} />}
+      message="✅ {branch_name} in sync with {origin_branch}"
+      values={{
+        branch_name: <Brackets>{branch_name}</Brackets>,
+        origin_branch: <Brackets>{master_branch}</Brackets>,
+      }}
+    />,
+  );
+
+  actions.set((state) => {
+    state.commit_range = next_commit_range;
+  });
+
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(<Status />);
+    actions.exit(0);
+  }
+
   // cleanup git operations if cancelled during manual rebase
   function restore_git() {
     // signint handler MUST run synchronously

package/src/core/cli.ts

@@ -82,6 +82,7 @@ export async function cli(
       state.actions.debug(log.output(result));
 
       if (!options.ignoreExitCode && result.code !== 0) {
+        state.actions.debug(log.non_zero_exit(result));
         reject(new Error(log.error(result)));
       } else {
         resolve(result);
@@ -133,6 +134,7 @@ cli.sync = function cli_sync(
   state.actions.debug(log.output(result));
 
   if (!options.ignoreExitCode && result.code !== 0) {
+    state.actions.debug(log.non_zero_exit(result));
     throw new Error(log.error(result));
   }
 
@@ -157,8 +159,13 @@ const log = {
     return `${result.output}\n`;
   },
 
-  error(result: Return) {
+  non_zero_exit(result: Return) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;
   },
+
+  error(result: Return) {
+    const lines = [result.output, this.non_zero_exit(result)];
+    return lines.join("\n");
+  },
 };