git-stack-cli 2.2.7 → 2.3.0

package/package.json

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

package/scripts/release-brew.ts

@@ -66,6 +66,8 @@ const re_token = (name: string) => new RegExp(`{{ ${name} }}`, "g");
 process.chdir(HOMEBREW_DIR);
 await spawn.sync(`git reset --hard`);
 await spawn.sync(`git checkout master`);
+await spawn.sync("git fetch --prune");
+await spawn.sync("git reset --hard origin/master");
 
 // homebrew tap formula (binaries)
 

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/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/command.ts

@@ -9,6 +9,7 @@ export async function command() {
   // https://yargs.js.org/docs/#api-reference-optionkey-opt
   return (
     yargs(hideBin(process.argv))
+      .scriptName("git stack")
       .usage("Usage: git stack [command] [options]")
 
       .command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions))

package/src/commands/Rebase.tsx

@@ -7,7 +7,7 @@ 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";
 import { cli } from "~/core/cli";
@@ -71,36 +71,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);
     }
 
@@ -120,38 +117,38 @@ 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>{`origin/${master_branch}`}</Brackets>,
-        }}
-      />,
-    );
-
     actions.unregister_abort_handler();
-
-    actions.set((state) => {
-      state.commit_range = next_commit_range;
-      state.step = "status";
-    });
   } 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;
+  });
+
+  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");
+  },
 };