git-stack-cli 1.14.0 → 1.15.1

package/src/app/ManualRebase.tsx

@@ -15,35 +15,12 @@ import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
 export function ManualRebase() {
-  const abort_handler = React.useRef(() => {});
-
-  React.useEffect(function listen_sigint() {
-    process.once("SIGINT", sigint_handler);
-
-    return function cleanup() {
-      process.removeListener("SIGINT", sigint_handler);
-    };
-
-    async function sigint_handler() {
-      abort_handler.current();
-    }
-  }, []);
-
   return (
-    <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={async function () {
-        await run({ abort_handler });
-      }}
-    />
+    <Await fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>} function={run} />
   );
 }
 
-type Args = {
-  abort_handler: React.MutableRefObject<() => void>;
-};
-
-async function run(args: Args) {
+async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -57,18 +34,18 @@ async function run(args: Args) {
   invariant(commit_map, "commit_map must exist");
   invariant(repo_root, "repo_root must exist");
 
-  // always listen for SIGINT event and restore git state
-  args.abort_handler.current = function sigint_handler() {
+  // immediately register abort_handler in case of ctrl+c exit
+  actions.register_abort_handler(async function abort_manual_rebase() {
     actions.output(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit(15);
-  };
+    handle_exit();
+    return 15;
+  });
 
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
   try {
     // get latest merge_base relative to local master
-    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
-      .stdout;
+    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
     // immediately paint all commit to preserve selected commit ranges
     let commit_range = await CommitMetadata.range(commit_map);
@@ -137,6 +114,8 @@ async function run(args: Args) {
 
     restore_git();
 
+    actions.unregister_abort_handler();
+
     if (argv.sync) {
       actions.set((state) => {
         state.step = "sync-github";
@@ -157,7 +136,8 @@ async function run(args: Args) {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    handle_exit(16);
+    handle_exit();
+    actions.exit(16);
   }
 
   // cleanup git operations if cancelled during manual rebase
@@ -185,11 +165,11 @@ async function run(args: Args) {
     cli.sync(`pwd`, spawn_options);
   }
 
-  function handle_exit(code: number) {
+  function handle_exit() {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restoring <Brackets>{branch_name}</Brackets>…
-      </Ink.Text>
+      </Ink.Text>,
     );
 
     restore_git();
@@ -197,9 +177,7 @@ async function run(args: Args) {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restored <Brackets>{branch_name}</Brackets>.
-      </Ink.Text>
+      </Ink.Text>,
     );
-
-    actions.exit(code);
   }
 }

package/src/app/MultiSelect.tsx

@@ -51,7 +51,7 @@ export function MultiSelect<T>(props: Props<T>) {
       });
 
       return set;
-    }
+    },
   );
 
   // clamp index to keep in item range
@@ -81,7 +81,7 @@ export function MultiSelect<T>(props: Props<T>) {
       }
 
       return 0;
-    }
+    },
   );
 
   const selectRef = React.useRef(false);

package/src/app/PostRebaseStatus.tsx

@@ -26,4 +26,6 @@ async function run() {
   actions.output(<StatusTable />);
 
   actions.output(<Ink.Text>✅ Everything up to date.</Ink.Text>);
+
+  actions.exit(0);
 }

package/src/app/PreManualRebase.tsx

@@ -51,7 +51,7 @@ async function run() {
           values={{
             pr_filepath: <Brackets>{pr_template_fn("")}</Brackets>,
           }}
-        />
+        />,
       );
 
       break;
@@ -75,12 +75,10 @@ async function run() {
           wrapper={<Ink.Text color={colors.yellow} />}
           message="{count} queryable templates found under {dir}, but not supported."
           values={{
-            count: (
-              <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>
-            ),
+            count: <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>,
             dir: <Brackets>{PR_TEMPLATE.TemplateDir("")}</Brackets>,
           }}
-        />
+        />,
       );
     }
 

package/src/app/RebaseCheck.tsx

@@ -40,8 +40,7 @@ export function RebaseCheck(props: Props) {
         <YesNoPrompt
           message={
             <Ink.Text color={colors.yellow}>
-              <Command>git rebase</Command> detected, would you like to abort
-              it?
+              <Command>git rebase</Command> detected, would you like to abort it?
             </Ink.Text>
           }
           onYes={async () => {

package/src/app/SelectCommitRanges.tsx

@@ -37,7 +37,7 @@ function SelectCommitRangesInternal(props: Props) {
 
   const [selected_group_id, set_selected_group_id] = React.useState(() => {
     const first_group = props.commit_range.group_list.find(
-      (g) => g.id !== props.commit_range.UNASSIGNED
+      (g) => g.id !== props.commit_range.UNASSIGNED,
     );
 
     if (first_group) {
@@ -54,14 +54,11 @@ function SelectCommitRangesInternal(props: Props) {
       const next_group_list = group_list.concat(group);
       return next_group_list;
     },
-    []
+    [],
   );
 
   const [commit_map, update_commit_map] = React.useReducer(
-    (
-      map: Map<string, null | string>,
-      args: { key: string; value: null | string }
-    ) => {
+    (map: Map<string, null | string>, args: { key: string; value: null | string }) => {
       map.set(args.key, args.value);
 
       // console.debug("update_commit_map", map, args);
@@ -74,7 +71,7 @@ function SelectCommitRangesInternal(props: Props) {
       }
 
       return new Map(map);
-    }
+    },
   );
 
   const group_list: Array<SimpleGroup> = [];
@@ -88,8 +85,7 @@ function SelectCommitRangesInternal(props: Props) {
     }
   }
 
-  const total_group_count =
-    new_group_list.length + props.commit_range.group_list.length;
+  const total_group_count = new_group_list.length + props.commit_range.group_list.length;
 
   for (let i = 0; i < props.commit_range.group_list.length; i++) {
     const index = props.commit_range.group_list.length - i - 1;
@@ -411,7 +407,7 @@ function SelectCommitRangesInternal(props: Props) {
           group: <Brackets>{title}</Brackets>,
           note: <Parens>{id}</Parens>,
         }}
-      />
+      />,
     );
 
     // console.debug("submit_group_input", { title, id });

package/src/app/Status.tsx

@@ -59,7 +59,7 @@ async function run() {
           {` --force `}
         </Ink.Text>
         <Ink.Text>to force update all pull requests.</Ink.Text>
-      </Ink.Text>
+      </Ink.Text>,
     );
 
     actions.exit(0);

package/src/app/StatusTable.tsx

@@ -84,10 +84,7 @@ function StatusColumn(props: TableColumnProps<Row>) {
   const value = props.row[props.column];
 
   return (
-    <Ink.Text
-      color={get_status_color(props.row)}
-      bold={get_status_bold(props.row)}
-    >
+    <Ink.Text color={get_status_color(props.row)} bold={get_status_bold(props.row)}>
       {get_status_icon(props.row)} {value}
     </Ink.Text>
   );

package/src/app/Store.tsx

@@ -7,6 +7,7 @@ import { immer } from "zustand/middleware/immer";
 import { Exit } from "~/app/Exit";
 import { LogTimestamp } from "~/app/LogTimestamp";
 import { colors } from "~/core/colors";
+import { pretty_json } from "~/core/pretty_json";
 
 import type { Instance as InkInstance } from "ink-cjs";
 import type { Argv } from "~/command";
@@ -29,6 +30,9 @@ type SyncGithubState = {
   rebase_group_index: number;
 };
 
+// async function that returns exit code
+type AbortHandler = () => Promise<number>;
+
 export type State = {
   // set immediately in `index.tsx` so no `null` scenario
   process_argv: Array<string>;
@@ -47,6 +51,9 @@ export type State = {
   pr_templates: Array<string>;
   pr_template_body: null | string;
   sync_github: null | SyncGithubState;
+  is_dirty_check_stash: boolean;
+  abort_handler: null | AbortHandler;
+  is_exiting: boolean;
 
   step:
     | "github-api-error"
@@ -71,7 +78,7 @@ export type State = {
     clear(): void;
     unmount(): void;
     newline(): void;
-    json(value: object): void;
+    json(value: pretty_json.JSONValue): void;
     error(message: string): void;
     output(node: React.ReactNode): void;
     debug(node: React.ReactNode, id?: string): void;
@@ -79,6 +86,8 @@ export type State = {
     isDebug(): boolean;
 
     reset_pr(): void;
+    register_abort_handler(abort_handler: AbortHandler): void;
+    unregister_abort_handler(): void;
 
     set(setter: Setter): void;
   };
@@ -113,6 +122,9 @@ const BaseStore = createStore<State>()(
     pr_templates: [],
     pr_template_body: null,
     sync_github: null,
+    is_dirty_check_stash: false,
+    abort_handler: null,
+    is_exiting: false,
 
     step: "loading",
 
@@ -124,6 +136,8 @@ const BaseStore = createStore<State>()(
     actions: {
       exit(code, clear = true) {
         set((state) => {
+          state.is_exiting = true;
+
           const node = <Exit clear={clear} code={code} />;
           state.mutate.output(state, { node });
         });
@@ -146,7 +160,7 @@ const BaseStore = createStore<State>()(
 
       json(value) {
         set((state) => {
-          const node = JSON.stringify(value, null, 2);
+          const node = pretty_json(value);
           state.mutate.output(state, { node });
         });
       },
@@ -189,6 +203,18 @@ const BaseStore = createStore<State>()(
         });
       },
 
+      register_abort_handler(abort_handler) {
+        set((state) => {
+          state.abort_handler = abort_handler;
+        });
+      },
+
+      unregister_abort_handler() {
+        set((state) => {
+          state.abort_handler = null;
+        });
+      },
+
       set(setter) {
         set((state) => {
           setter(state);
@@ -238,7 +264,7 @@ const BaseStore = createStore<State>()(
         return state.argv?.verbose || false;
       },
     },
-  }))
+  })),
 );
 
 function renderOutputArgs(args: MutateOutputArgs) {

package/src/app/SyncGithub.tsx

@@ -14,35 +14,10 @@ import { invariant } from "~/core/invariant";
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
 export function SyncGithub() {
-  const abort_handler = React.useRef(() => {});
-
-  React.useEffect(function listen_sigint() {
-    process.once("SIGINT", sigint_handler);
-
-    return function cleanup() {
-      process.removeListener("SIGINT", sigint_handler);
-    };
-
-    function sigint_handler() {
-      abort_handler.current();
-    }
-  }, []);
-
-  return (
-    <Await
-      fallback={<Ink.Text color={colors.yellow}>Syncing…</Ink.Text>}
-      function={async function () {
-        await run({ abort_handler });
-      }}
-    />
-  );
+  return <Await fallback={<Ink.Text color={colors.yellow}>Syncing…</Ink.Text>} function={run} />;
 }
 
-type Args = {
-  abort_handler: React.MutableRefObject<() => void>;
-};
-
-async function run(args: Args) {
+async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -60,11 +35,12 @@ async function run(args: Args) {
   const commit_range = sync_github.commit_range;
   const rebase_group_index = sync_github.rebase_group_index;
 
-  // always listen for SIGINT event and restore pr state
-  args.abort_handler.current = function sigint_handler() {
+  // immediately register abort_handler in case of ctrl+c exit
+  actions.register_abort_handler(async function abort_sync_github() {
     actions.output(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit(17);
-  };
+    handle_exit();
+    return 17;
+  });
 
   let DEFAULT_PR_BODY = "";
   if (state.pr_template_body) {
@@ -151,6 +127,8 @@ async function run(args: Args) {
 
     await Promise.all(update_pr_body_tasks);
 
+    actions.unregister_abort_handler();
+
     actions.set((state) => {
       state.step = "post-rebase-status";
     });
@@ -164,7 +142,8 @@ async function run(args: Args) {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    await handle_exit(18);
+    handle_exit();
+    actions.exit(18);
   }
 
   function get_push_group_list() {
@@ -218,10 +197,7 @@ async function run(args: Args) {
     }
   }
 
-  async function after_push(args: {
-    group: CommitMetadataGroup;
-    pr_url_list: Array<string>;
-  }) {
+  async function after_push(args: { group: CommitMetadataGroup; pr_url_list: Array<string> }) {
     const { group, pr_url_list } = args;
 
     invariant(group.base, "group.base must exist");
@@ -305,10 +281,8 @@ async function run(args: Args) {
     }
   }
 
-  function handle_exit(code: number) {
-    actions.output(
-      <Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>
-    );
+  function handle_exit() {
+    actions.output(<Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>);
 
     for (const group of push_group_list) {
       // we may temporarily mark PR as a draft before editing it
@@ -326,11 +300,7 @@ async function run(args: Args) {
       }
     }
 
-    actions.output(
-      <Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>
-    );
-
-    actions.exit(code);
+    actions.output(<Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>);
   }
 }
 

package/src/app/Table.tsx

@@ -70,10 +70,7 @@ export function Table<T extends BaseRow>(props: Props<T>) {
     remaining_space -= breathing_room;
 
     if (props.fillColumn) {
-      max_col_width[props.fillColumn] = Math.min(
-        max_col_width[props.fillColumn],
-        remaining_space
-      );
+      max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
     }
   }
 
@@ -91,9 +88,7 @@ export function Table<T extends BaseRow>(props: Props<T>) {
             width={available_width}
           >
             {RowColumnList.map((column) => {
-              const ColumnComponent = props.columns[
-                column
-              ] as ColumnComponent<T>;
+              const ColumnComponent = props.columns[column] as ColumnComponent<T>;
 
               return (
                 <Ink.Box key={String(column)} width={max_col_width[column]}>
@@ -122,14 +117,9 @@ type BaseRow = Record<string, string | number>;
 
 type Column<T extends BaseRow> = keyof T;
 
-type ColumnComponent<T extends BaseRow> = (
-  props: TableColumnProps<T>
-) => React.ReactNode;
+type ColumnComponent<T extends BaseRow> = (props: TableColumnProps<T>) => React.ReactNode;
 
-type ColumnComponentMap<T extends BaseRow> = Record<
-  Column<T>,
-  ColumnComponent<T>
->;
+type ColumnComponentMap<T extends BaseRow> = Record<Column<T>, ColumnComponent<T>>;
 
 export type TableColumnProps<T extends BaseRow> = {
   row: T;

package/src/app/TextInput.tsx

@@ -19,7 +19,7 @@ export function TextInput(props: Props) {
     function sync_value_prop() {
       set_value(get_value(props));
     },
-    [props.value]
+    [props.value],
   );
 
   const [caret_visible, set_caret_visible] = React.useState(false);
@@ -69,12 +69,7 @@ export function TextInput(props: Props) {
   // console.debug("[TextInput]", { value });
 
   return (
-    <Ink.Box
-      borderStyle="single"
-      minHeight={1}
-      borderColor={colors.yellow}
-      borderDimColor
-    >
+    <Ink.Box borderStyle="single" minHeight={1} borderColor={colors.yellow} borderDimColor>
       <Ink.Text>{value || ""}</Ink.Text>
 
       <Ink.Text color={colors.yellow} dimColor inverse={caret_visible}>

package/src/app/VerboseDebugInfo.tsx

@@ -12,11 +12,7 @@ type Props = {
 };
 
 export function VerboseDebugInfo(props: Props) {
-  const fallback = (
-    <Ink.Text color={colors.yellow}>
-      Logging verbose debug information…
-    </Ink.Text>
-  );
+  const fallback = <Ink.Text color={colors.yellow}>Logging verbose debug information…</Ink.Text>;
 
   return (
     <Await fallback={fallback} function={run}>

package/src/app/YesNoPrompt.tsx

@@ -2,56 +2,67 @@ import * as React from "react";
 
 import * as Ink from "ink-cjs";
 
+import { FormatText } from "~/app/FormatText";
 import { Parens } from "~/app/Parens";
 import { colors } from "~/core/colors";
 
+type Handler = () => void;
+
 type Props = {
   message: React.ReactNode;
-  onYes(): void;
-  onNo(): void;
+  onYes: Handler;
+  onNo: Handler;
 };
 
 export function YesNoPrompt(props: Props) {
   const [answer, set_answer] = React.useState("");
 
+  const answered_ref = React.useRef(false);
+
   Ink.useInput((input) => {
-    const inputLower = input.toLowerCase();
+    // prevent answering multiple times
+    if (answered_ref.current) {
+      return;
+    }
 
-    set_answer(inputLower);
+    const input_lower = input.toLowerCase();
 
-    switch (inputLower) {
+    let handler: undefined | Handler;
+
+    switch (input_lower) {
       case "n":
-        return props.onNo();
+        handler = props.onNo;
+        break;
 
       case "y":
-        return props.onYes();
+        handler = props.onYes;
+        break;
+    }
+
+    // handler if valid answer (y or n)
+    if (handler) {
+      answered_ref.current = true;
+      set_answer(input_lower);
+      handler();
     }
   });
 
-  // prettier-ignore
-  const y = <Ink.Text bold color={colors.green}>Y</Ink.Text>;
-  const n = <Ink.Text color={colors.red}>n</Ink.Text>;
-
-  let choices;
-
-  switch (answer) {
-    case "y":
-      choices = y;
-      break;
-
-    case "n":
-      choices = n;
-      break;
-
-    default:
-      choices = (
-        <React.Fragment>
-          {y}
-          <Ink.Text>/</Ink.Text>
-          {n}
-        </React.Fragment>
-      );
-  }
+  const choices = (function get_choices() {
+    // prettier-ignore
+    const y = <Ink.Text bold color={colors.green}>Y</Ink.Text>;
+    const n = <Ink.Text color={colors.red}>n</Ink.Text>;
+
+    switch (answer) {
+      case "y":
+        return y;
+
+      case "n":
+        return n;
+
+      default:
+        return <FormatText message="{y}/{n}" values={{ y, n }} />;
+    }
+  })();
 
   return (
     <Ink.Box flexDirection="column">

package/src/command.ts

@@ -11,26 +11,22 @@ export async function command() {
     yargs(hideBin(process.argv))
       .usage("Usage: git stack [command] [options]")
 
-      .command("$0", "Sync commit ranges to Github", (yargs) =>
-        yargs.options(DefaultOptions)
-      )
+      .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("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)
+        (yargs) => yargs.strict(false),
       )
 
       .command(
         "rebase",
         "Update local branch via rebase with latest changes from origin master branch",
-        (yargs) => yargs
+        (yargs) => yargs,
       )
 
       .option("verbose", GlobalOptions.verbose)
@@ -43,12 +39,8 @@ export async function command() {
       // disallow unknown options
       .strict()
       .version(process.env.CLI_VERSION || "unknown")
-      .showHidden(
-        "show-hidden",
-        "Show hidden options via `git stack help --show-hidden`"
-      )
-      .help("help", "Show usage via `git stack help`")
-      .argv as unknown as Promise<Argv>
+      .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
+      .help("help", "Show usage via `git stack help`").argv as unknown as Promise<Argv>
   );
 }
 
@@ -86,8 +78,7 @@ const DefaultOptions = {
   "verify": {
     type: "boolean",
     default: true,
-    description:
-      "Run git hooks such as pre-commit and pre-push, disable with --no-verify",
+    description: "Run git hooks such as pre-commit and pre-push, disable with --no-verify",
   },
 
   "update": {