git-stack-cli 2.6.0 → 2.6.1

package/package.json

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

package/scripts/bun-build.ts

@@ -111,6 +111,11 @@ if (!WATCH) {
       continue;
     }
 
+    // ignore bun build files
+    if (filename.includes(".bun-build")) {
+      continue;
+    }
+
     log(`⚠️ Change ${filename}`);
 
     if (VERBOSE) {

package/src/app/App.tsx

@@ -14,6 +14,7 @@ import { Main } from "~/app/Main";
 import { Output } from "~/app/Output";
 import { Providers } from "~/app/Providers";
 import { RebaseCheck } from "~/app/RebaseCheck";
+import { RequireBranch } from "~/app/RequireBranch";
 import { Store } from "~/app/Store";
 import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
 import { Fixup } from "~/commands/Fixup";
@@ -112,11 +113,13 @@ function MaybeMain() {
       <DependencyCheck>
         <DirtyCheck>
           <GatherMetadata>
-            <LocalCommitStatus>
-              <DetectInitialPR>
-                <Main />
-              </DetectInitialPR>
-            </LocalCommitStatus>
+            <RequireBranch>
+              <LocalCommitStatus>
+                <DetectInitialPR>
+                  <Main />
+                </DetectInitialPR>
+              </LocalCommitStatus>
+            </RequireBranch>
           </GatherMetadata>
         </DirtyCheck>
       </DependencyCheck>

package/src/app/AutoUpdate.tsx

@@ -6,6 +6,7 @@ import { Brackets } from "~/app/Brackets";
 import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
+import { assertNever } from "~/core/assertNever";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { fetch_json } from "~/core/fetch_json";
@@ -28,7 +29,7 @@ type State = {
   error: null | Error;
   local_version: null | string;
   latest_version: null | string;
-  status: "init" | "prompt" | "install" | "done" | "exit";
+  status: "init" | "prompt" | "install" | "done";
   is_brew_bun_standalone: boolean;
 };
 
@@ -61,7 +62,24 @@ export function AutoUpdate(props: Props) {
   }
 
   React.useEffect(() => {
-    let status: State["status"] = "done";
+    switch (state.status) {
+      case "init":
+      case "prompt":
+      case "install":
+        break;
+
+      case "done": {
+        props.onDone?.();
+        break;
+      }
+
+      default:
+        assertNever(state.status);
+    }
+  }, [state.status]);
+
+  React.useEffect(() => {
+    let status: State["status"] = "init";
     let latest_version: string | null = null;
     let is_brew_bun_standalone = false;
 
@@ -73,17 +91,13 @@ export function AutoUpdate(props: Props) {
         throw new Error("Auto update requires process.env.CLI_VERSION to be set");
       }
 
-      if (is_output) {
-        handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
-      }
-
       const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
 
       const npm_json = await Promise.race([
         fetch_json(`https://registry.npmjs.org/${props.name}`),
 
         sleep(timeout_ms).then(() => {
-          throw new Error("Timeout");
+          throw new Error("AutoUpdate timeout");
         }),
       ]);
 
@@ -126,8 +140,13 @@ export function AutoUpdate(props: Props) {
       }
 
       const semver_result = semver_compare(latest_version, local_version);
+      if (props_ref.current.verbose) {
+        handle_output(<Ink.Text dimColor>{JSON.stringify({ semver_result })}</Ink.Text>);
+      }
 
       if (semver_result === 0) {
+        status = "done";
+
         if (is_output) {
           handle_output(
             <Ink.Text>
@@ -138,15 +157,12 @@ export function AutoUpdate(props: Props) {
         return;
       }
 
-      if (semver_result === -1) {
-        // latest version is less than or equal to local version, skip auto update
-        throw new Error(
-          `latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`,
-        );
+      if (semver_result === 1) {
+        // trigger yes no prompt
+        status = "prompt";
       }
 
-      // trigger yes no prompt
-      status = "prompt";
+      throw new Error("AutoUpdate failed");
     }
 
     const onError = props_ref.current.onError || (() => {});
@@ -156,9 +172,6 @@ export function AutoUpdate(props: Props) {
         patch({ status, local_version, latest_version, is_brew_bun_standalone });
       })
       .catch((error) => {
-        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
-        onError(error);
-
         if (props_ref.current.verbose) {
           handle_output(
             <Ink.Text key="error" color={colors.red}>
@@ -166,9 +179,11 @@ export function AutoUpdate(props: Props) {
             </Ink.Text>,
           );
         }
-      })
-      .finally(() => {
-        props.onDone?.();
+
+        // ensure we always exit
+        status = "done";
+        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
+        onError(error);
       });
   }, []);
 
@@ -180,54 +195,60 @@ export function AutoUpdate(props: Props) {
       case "prompt": {
         let install_command = "";
         if (state.is_brew_bun_standalone) {
-          install_command = `npm install -g ${props.name}@latest`;
+          install_command = "brew install magus/git-stack/git-stack";
         } else {
-          install_command = "brew upgrade magus/git-stack/git-stack";
+          install_command = `npm install -g ${props.name}@latest`;
         }
 
         return (
           <YesNoPrompt
             message={
               <Ink.Box flexDirection="column">
-                <Ink.Text color={colors.yellow}>
+                <Ink.Box flexDirection="column">
+                  <Ink.Text color={colors.yellow}>
+                    <FormatText
+                      wrapper={<Ink.Text />}
+                      message="New version available {latest_version}"
+                      values={{
+                        latest_version: <Brackets>{state.latest_version}</Brackets>,
+                      }}
+                    />
+                    ,
+                  </Ink.Text>
+                  <Ink.Text> </Ink.Text>
+                  <Command>{install_command}</Command>
+                  <Ink.Text> </Ink.Text>
+                </Ink.Box>
+                <Ink.Box>
                   <FormatText
-                    wrapper={<Ink.Text />}
-                    message="New version available {latest_version}, would you like to update?"
-                    values={{
-                      latest_version: <Brackets>{state.latest_version}</Brackets>,
-                    }}
+                    wrapper={<Ink.Text color={colors.yellow} />}
+                    message="Would you like to run the above command to update?"
                   />
-                  ,
-                </Ink.Text>
-                <Ink.Text> </Ink.Text>
-                <Command>{install_command}</Command>
-                <Ink.Text> </Ink.Text>
-                <FormatText
-                  wrapper={<Ink.Text color={colors.yellow} />}
-                  message="Would you like to run the above command to update?"
-                />
+                </Ink.Box>
               </Ink.Box>
             }
             onYes={async () => {
-              handle_output(
-                <FormatText
-                  key="install"
-                  wrapper={<Ink.Text />}
-                  message="Installing {name}@{version}..."
-                  values={{
-                    name: <Ink.Text color={colors.yellow}>{props.name}</Ink.Text>,
-                    version: <Ink.Text color={colors.blue}>{state.latest_version}</Ink.Text>,
-                  }}
-                />,
-              );
+              handle_output(<Command>{install_command}</Command>);
 
               patch({ status: "install" });
 
-              await cli(install_command);
+              await cli(install_command, {
+                env: {
+                  ...process.env,
+                  HOMEBREW_COLOR: "1",
+                },
+                onOutput: (data: string) => {
+                  handle_output(<Ink.Text>{data}</Ink.Text>);
+                },
+              });
 
-              patch({ status: "exit" });
+              handle_output(
+                <Ink.Text key="done">
+                  ✅ Installed <Brackets>{state.latest_version}</Brackets>
+                </Ink.Text>,
+              );
 
-              handle_output(<Ink.Text key="done">Auto update done.</Ink.Text>);
+              patch({ status: "done" });
             }}
             onNo={() => {
               patch({ status: "done" });
@@ -239,9 +260,6 @@ export function AutoUpdate(props: Props) {
       case "install":
         return null;
 
-      case "exit":
-        return null;
-
       case "done":
         return props.children;
     }

package/src/app/GatherMetadata.tsx

@@ -67,33 +67,10 @@ async function run() {
 
     actions.debug(`master_branch = ${master_branch}`);
 
-    const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
-
-    // handle detahed head state
-    if (branch_name === "HEAD") {
-      actions.error("Must run within a branch.");
-      actions.exit(0);
-      return;
-    }
-
-    // handle when there are no detected changes
-    if (`origin/${branch_name}` === master_branch) {
-      actions.error("Must run within a branch.");
-      actions.exit(0);
-      return;
-    }
-
     const head = (await cli("git rev-parse HEAD")).stdout;
+    const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
-    // handle when there are no detected changes
-    if (head === merge_base) {
-      actions.newline();
-      actions.output(<Ink.Text color={colors.gray}>No changes detected.</Ink.Text>);
-      actions.exit(0);
-      return;
-    }
-
     // git@github.com:magus/git-multi-diff-playground.git
     // https://github.com/magus/git-multi-diff-playground.git
     const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
@@ -107,6 +84,7 @@ async function run() {
       state.master_branch = master_branch;
       state.head = head;
       state.branch_name = branch_name;
+      state.merge_base = merge_base;
     });
   } catch (err) {
     actions.error("Unable to gather git metadata.");

package/src/app/Main.tsx

@@ -6,7 +6,6 @@ import { ManualRebase } from "~/app/ManualRebase";
 import { PostRebaseStatus } from "~/app/PostRebaseStatus";
 import { PreLocalMergeRebase } from "~/app/PreLocalMergeRebase";
 import { PreManualRebase } from "~/app/PreManualRebase";
-import { PreSelectCommitRanges } from "~/app/PreSelectCommitRanges";
 import { SelectCommitRanges } from "~/app/SelectCommitRanges";
 import { Status } from "~/app/Status";
 import { Store } from "~/app/Store";
@@ -32,9 +31,6 @@ export function Main() {
     case "pre-local-merge-rebase":
       return <PreLocalMergeRebase />;
 
-    case "pre-select-commit-ranges":
-      return <PreSelectCommitRanges />;
-
     case "select-commit-ranges":
       return <SelectCommitRanges />;
 

package/src/app/MultiSelect.tsx

@@ -191,7 +191,6 @@ type ItemRowProps = {
 
 function ItemRow(props: ItemRowProps) {
   let color;
-  let bold;
   let underline;
   let dimColor;
 
@@ -200,14 +199,8 @@ function ItemRow(props: ItemRowProps) {
     underline = true;
   }
 
-  if (props.selected) {
-    // color = "";
-    bold = true;
-  }
-
   if (props.disabled) {
     color = "";
-    bold = false;
     underline = false;
     dimColor = true;
   }
@@ -218,7 +211,7 @@ function ItemRow(props: ItemRowProps) {
 
       <Ink.Box width={props.maxWidth}>
         <Ink.Text
-          bold={bold}
+          // force line break
           underline={underline}
           color={color}
           dimColor={dimColor}

package/src/app/RequireBranch.tsx

@@ -0,0 +1,67 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Store } from "~/app/Store";
+import { colors } from "~/core/colors";
+import { invariant } from "~/core/invariant";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+export function RequireBranch(props: Props) {
+  const fallback = <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>;
+
+  return (
+    <Await fallback={fallback} function={run}>
+      {props.children}
+    </Await>
+  );
+}
+
+async function run() {
+  const state = Store.getState();
+  const actions = Store.getState().actions;
+  const master_branch = state.master_branch;
+  const head = state.head;
+  const branch_name = state.branch_name;
+  const merge_base = state.merge_base;
+
+  invariant(head, "head must exist");
+  invariant(branch_name, "branch_name must exist");
+  invariant(merge_base, "merge_base must exist");
+
+  try {
+    // handle detahed head state
+    if (branch_name === "HEAD") {
+      actions.error("Must run within a branch.");
+      actions.exit(0);
+      return;
+    }
+
+    // handle when there are no detected changes
+    if (`origin/${branch_name}` === master_branch) {
+      actions.error("Must run within a branch.");
+      actions.exit(0);
+      return;
+    }
+
+    // handle when there are no detected changes
+    if (head === merge_base) {
+      actions.newline();
+      actions.output(<Ink.Text color={colors.gray}>No changes detected.</Ink.Text>);
+      actions.exit(0);
+      return;
+    }
+  } catch (err) {
+    actions.error("Unable to detect branch changes.");
+
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+
+    actions.exit(17);
+  }
+}

package/src/app/SelectCommitRanges.tsx

@@ -232,7 +232,7 @@ function SelectCommitRangesInternal(props: Props) {
           </Ink.Text>
           <Ink.Text color={colors.blue}>
             <FormatText
-              message="Press {c} to {create} a new PR group"
+              message="Press {c} to {create} a new PR"
               values={{
                 c: (
                   <Ink.Text bold color={colors.green}>
@@ -271,7 +271,7 @@ function SelectCommitRangesInternal(props: Props) {
           </Ink.Box>
 
           <Ink.Box width={max_width}>
-            <Ink.Text wrap="truncate-end" bold color={colors.green}>
+            <Ink.Text wrap="truncate-end" bold color={colors.white}>
               {group.title}
             </Ink.Text>
           </Ink.Box>
@@ -359,7 +359,7 @@ function SelectCommitRangesInternal(props: Props) {
           {group_input ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
-              message="Press {c} to {create} a new PR group"
+              message="Press {c} to {create} a new PR"
               values={{
                 c: (
                   <Ink.Text bold color={colors.green}>
@@ -411,7 +411,7 @@ function SelectCommitRangesInternal(props: Props) {
       <Ink.Box>
         <FormatText
           wrapper={<Ink.Text color={colors.gray} />}
-          message="Press {left} and {right} to view PR groups"
+          message="Press {left} and {right} to view PRs"
           values={{
             left: (
               <Ink.Text bold color={colors.green}>
@@ -463,7 +463,7 @@ function SelectCommitRangesInternal(props: Props) {
     actions.output(
       <FormatText
         wrapper={<Ink.Text dimColor />}
-        message="Created new PR group {group} {note}"
+        message="Created new PR {group} {note}"
         values={{
           group: <Brackets>{title}</Brackets>,
           note: <Parens>{id}</Parens>,

package/src/app/Status.tsx

@@ -42,11 +42,7 @@ async function run() {
     Store.setState((state) => {
       state.step = "pre-local-merge-rebase";
     });
-  } else if (needs_update) {
-    Store.setState((state) => {
-      state.step = "pre-select-commit-ranges";
-    });
-  } else if (argv.force) {
+  } else if (needs_update || argv.force) {
     Store.setState((state) => {
       state.step = "select-commit-ranges";
     });

package/src/app/Store.tsx

@@ -51,6 +51,7 @@ export type State = {
   master_branch: string;
   head: null | string;
   branch_name: null | string;
+  merge_base: null | string;
   commit_range: null | CommitMetadata.CommitRange;
   commit_map: null | CommitMap;
   pr_templates: Array<string>;
@@ -66,7 +67,6 @@ export type State = {
     | "status"
     | "pre-local-merge-rebase"
     | "local-merge-rebase"
-    | "pre-select-commit-ranges"
     | "select-commit-ranges"
     | "pre-manual-rebase"
     | "manual-rebase"
@@ -122,6 +122,7 @@ const BaseStore = createStore<State>()(
     master_branch: "origin/master",
     head: null,
     branch_name: null,
+    merge_base: null,
     commit_range: null,
     commit_map: null,
     pr_templates: [],

package/src/commands/Rebase.tsx

@@ -22,7 +22,7 @@ type Props = {
 export function Rebase(props: Props) {
   return (
     <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
+      fallback={<Ink.Text color={colors.yellow}>Rebasing…</Ink.Text>}
       function={() => Rebase.run(props)}
     />
   );
@@ -48,6 +48,7 @@ Rebase.run = async function run(props: Props) {
     return 19;
   });
 
+  const master_branch_name = master_branch.replace(/^origin\//, "");
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
   try {
@@ -58,9 +59,56 @@ Rebase.run = async function run(props: Props) {
     await cli(`pwd`);
 
     // fetch origin master branch for latest sha
-    const master_branch_name = master_branch.replace(/^origin\//, "");
     await cli(`git fetch --no-tags -v origin ${master_branch_name}`);
 
+    if (branch_name === master_branch_name) {
+      await rebase_master();
+    } else {
+      await rebase_branch();
+    }
+
+    actions.unregister_abort_handler();
+  } catch (err) {
+    actions.error("Unable to rebase.");
+
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+
+    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);
+  }
+
+  async function rebase_master() {
+    await cli(`git switch -C "${master_branch_name}" "${master_branch}"`);
+  }
+
+  async function rebase_branch() {
+    invariant(commit_range, "commit_range must exist");
+
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
     const rebase_merge_base = master_sha;
 
@@ -120,40 +168,6 @@ Rebase.run = async function run(props: Props) {
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
 
     restore_git();
-
-    actions.unregister_abort_handler();
-  } catch (err) {
-    actions.error("Unable to rebase.");
-
-    if (err instanceof Error) {
-      actions.error(err.message);
-    }
-
-    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

package/src/components/ColorTest.tsx

@@ -0,0 +1,49 @@
+import * as React from "react";
+
+import { colors } from "~/core/colors";
+
+type RenderOptions = {
+  color: string;
+  name: string;
+};
+
+type Props = {
+  children: (render_options: RenderOptions) => React.ReactNode;
+};
+
+export function ColorTest(props: Props) {
+  return (
+    <React.Fragment>
+      {Object.entries(colors).map(([key, color]) => {
+        const name = `colors:${key}`;
+        return props.children({ color, name });
+      })}
+
+      {INK_COLORS.map((color) => {
+        const name = `ink:${color}`;
+        return props.children({ color, name });
+      })}
+    </React.Fragment>
+  );
+}
+
+// ForegroundColor
+// https://github.com/magus/git-stack-cli/blob/master/node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.d.ts#L75
+const INK_COLORS = [
+  "black",
+  "red",
+  "green",
+  "yellow",
+  "blue",
+  "cyan",
+  "magenta",
+  "white",
+  "blackBright",
+  "redBright",
+  "greenBright",
+  "yellowBright",
+  "blueBright",
+  "cyanBright",
+  "magentaBright",
+  "whiteBright",
+];