git-stack-cli 1.10.0 → 1.11.1

package/dist/cjs/index.cjs

@@ -30147,6 +30147,10 @@ function DetectInitialPR(props) {
         for (const group of commit_range.group_list) {
             group.id = branch_name;
             group.title = state.pr?.title || "-";
+            for (const commit of commit_range.commit_list) {
+                commit.branch_id = group.id;
+                commit.title = group.title;
+            }
         }
         // get latest merge_base relative to local master
         const rebase_group_index = 0;
@@ -30220,9 +30224,9 @@ function DirtyCheck(props) {
 
 function GatherMetadata(props) {
     const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information\u2026"));
-    return (reactExports.createElement(Await, { fallback: fallback, function: run$9 }, props.children));
+    return (reactExports.createElement(Await, { fallback: fallback, function: run$8 }, props.children));
 }
-async function run$9() {
+async function run$8() {
     const actions = Store.getState().actions;
     const argv = Store.getState().argv;
     try {
@@ -30316,9 +30320,9 @@ function format_time(date) {
 }
 
 function GithubApiError() {
-    return reactExports.createElement(Await, { fallback: null, function: run$8 });
+    return reactExports.createElement(Await, { fallback: null, function: run$7 });
 }
-async function run$8() {
+async function run$7() {
     const actions = Store.getState().actions;
     const res = await cli(`gh api https://api.github.com/rate_limit`);
     const res_json = JSON.parse(res.stdout);
@@ -30360,7 +30364,7 @@ function LocalCommitStatus(props) {
     if (argv["mock-metadata"]) {
         return (reactExports.createElement(Await, { fallback: fallback, function: mock_metadata }, props.children));
     }
-    return (reactExports.createElement(Await, { fallback: fallback, function: run$7 }, props.children));
+    return (reactExports.createElement(Await, { fallback: fallback, function: run$6 }, props.children));
 }
 async function mock_metadata() {
     const module = await Promise.resolve().then(function () { return metadata; });
@@ -30370,7 +30374,7 @@ async function mock_metadata() {
         state.step = "status";
     });
 }
-async function run$7() {
+async function run$6() {
     const actions = Store.getState().actions;
     try {
         const commit_range = await range();
@@ -30449,10 +30453,10 @@ function encode(value) {
     return result.padStart(max_char_size, "=");
 }
 
-function LocalMergeRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$6 }));
+function Rebase$1() {
+    return (reactExports.createElement(Await, { function: Rebase$1.run, fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026") }));
 }
-async function run$6() {
+Rebase$1.run = async function run() {
     const state = Store.getState();
     const actions = state.actions;
     const branch_name = state.branch_name;
@@ -30512,6 +30516,10 @@ async function run$6() {
         await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
         restore_git();
         const next_commit_range = await range();
+        actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.green }), message: "\u2705 {branch_name} in sync with {origin_branch}", values: {
+                branch_name: reactExports.createElement(Brackets, null, branch_name),
+                origin_branch: reactExports.createElement(Brackets, null, `origin/${master_branch}`),
+            } }));
         actions.set((state) => {
             state.commit_range = next_commit_range;
             state.step = "status";
@@ -30566,9 +30574,13 @@ async function run$6() {
             "."));
         actions.exit(6);
     }
-}
+};
 const PATCH_FILE$1 = "git-stack-cli-patch.patch";
 
+function LocalMergeRebase() {
+    return reactExports.createElement(Rebase$1, null);
+}
+
 function write(args) {
     const stack_table = table(args);
     let result = args.body;
@@ -32042,6 +32054,11 @@ function MaybeMain() {
     else if (positional_list.has("log")) {
         return reactExports.createElement(Log, null);
     }
+    else if (positional_list.has("rebase")) {
+        return (reactExports.createElement(GatherMetadata, null,
+            reactExports.createElement(LocalCommitStatus, null,
+                reactExports.createElement(Rebase$1, null))));
+    }
     return (reactExports.createElement(DirtyCheck, null,
         !argv.verbose ? null : reactExports.createElement(GithubApiError, null),
         reactExports.createElement(GatherMetadata, null,
@@ -37360,6 +37377,7 @@ async function command() {
         .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)
         // yargs default wraps to 80 columns
         // passing null will wrap to terminal width
@@ -37367,7 +37385,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.10.0" )
+        .version("1.11.1" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`")
         .argv;

package/package.json

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

package/src/app/App.tsx

@@ -16,6 +16,7 @@ import { RebaseCheck } from "~/app/RebaseCheck";
 import { Store } from "~/app/Store";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
+import { Rebase } from "~/commands/Rebase";
 
 export function App() {
   const actions = Store.useActions();
@@ -73,6 +74,14 @@ function MaybeMain() {
     return <Fixup />;
   } else if (positional_list.has("log")) {
     return <Log />;
+  } else if (positional_list.has("rebase")) {
+    return (
+      <GatherMetadata>
+        <LocalCommitStatus>
+          <Rebase />
+        </LocalCommitStatus>
+      </GatherMetadata>
+    );
   }
 
   return (

package/src/app/DetectInitialPR.tsx

@@ -157,6 +157,10 @@ export function DetectInitialPR(props: Props) {
     for (const group of commit_range.group_list) {
       group.id = branch_name;
       group.title = state.pr?.title || "-";
+      for (const commit of commit_range.commit_list) {
+        commit.branch_id = group.id;
+        commit.title = group.title;
+      }
     }
 
     // get latest merge_base relative to local master

package/src/app/LocalMergeRebase.tsx

@@ -1,193 +1,7 @@
 import * as React from "react";
 
-import fs from "node:fs";
-
-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 { Store } from "~/app/Store";
-import * as CommitMetadata from "~/core/CommitMetadata";
-import { cli } from "~/core/cli";
-import { colors } from "~/core/colors";
-import { invariant } from "~/core/invariant";
-import { short_id } from "~/core/short_id";
+import { Rebase } from "~/commands/Rebase";
 
 export function LocalMergeRebase() {
-  return (
-    <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={run}
-    />
-  );
-}
-
-async function run() {
-  const state = Store.getState();
-  const actions = state.actions;
-  const branch_name = state.branch_name;
-  const commit_range = state.commit_range;
-  const master_branch = state.master_branch;
-  const cwd = state.cwd;
-  const repo_root = state.repo_root;
-
-  invariant(branch_name, "branch_name must exist");
-  invariant(commit_range, "commit_range must exist");
-  invariant(repo_root, "repo_root must exist");
-
-  // always listen for SIGINT event and restore git state
-  process.once("SIGINT", handle_exit);
-
-  const temp_branch_name = `${branch_name}_${short_id()}`;
-
-  try {
-    // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
-
-    // must perform rebase from repo root for applying git patch
-    process.chdir(repo_root);
-    await cli(`pwd`);
-
-    // update local master to match remote
-    await cli(
-      `git fetch --no-tags -v origin ${master_branch}:${master_branch}`
-    );
-
-    const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
-    const rebase_merge_base = master_sha;
-
-    // create temporary branch based on merge base
-    await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
-
-    const picked_commit_list = [];
-
-    for (let i = 0; i < commit_range.commit_list.length; i++) {
-      const commit = commit_range.commit_list[i];
-      const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
-
-      // drop commits that are in groups of merged PRs
-      const merged_pr = commit_pr?.state === "MERGED";
-
-      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}"
-            values={{
-              commit_message: <Brackets>{commit.subject_line}</Brackets>,
-            }}
-          />
-        );
-      }
-
-      picked_commit_list.push(commit);
-    }
-
-    if (picked_commit_list.length > 0) {
-      // ensure clean base to avoid conflicts when applying patch
-      await cli(`git clean -fd`);
-
-      // create list of sha for cherry-pick
-      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
-
-      await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
-    }
-
-    // after all commits have been cherry-picked and amended
-    // move the branch pointer to the newly created temporary branch
-    // now we are locally in sync with github and on the original branch
-    await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
-
-    restore_git();
-
-    const next_commit_range = await CommitMetadata.range();
-
-    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);
-      }
-    }
-
-    handle_exit();
-  }
-
-  // cleanup git operations if cancelled during manual rebase
-  function restore_git() {
-    // signint handler MUST run synchronously
-    // trying to use `await cli(...)` here will silently fail since
-    // all children processes receive the SIGINT signal
-    const spawn_options = { ignoreExitCode: true };
-
-    // always clean up any patch files
-    cli.sync(`rm ${PATCH_FILE}`, spawn_options);
-
-    // always hard reset and clean to allow subsequent checkout
-    // if there are files checkout will fail and cascade fail subsequent commands
-    cli.sync(`git reset --hard`, spawn_options);
-    cli.sync(`git clean -df`, spawn_options);
-
-    // always put self back in original branch
-    cli.sync(`git checkout ${branch_name}`, spawn_options);
-
-    // ...and cleanup temporary branch
-    cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
-
-    if (commit_range) {
-      // ...and cleanup pr group branches
-      for (const group of commit_range.group_list) {
-        cli.sync(`git branch -D ${group.id}`, spawn_options);
-      }
-    }
-
-    // restore back to original dir
-    if (fs.existsSync(cwd)) {
-      process.chdir(cwd);
-    }
-    cli.sync(`pwd`, spawn_options);
-  }
-
-  function handle_exit() {
-    actions.output(
-      <Ink.Text color={colors.yellow}>
-        Restoring <Brackets>{branch_name}</Brackets>…
-      </Ink.Text>
-    );
-
-    restore_git();
-
-    actions.output(
-      <Ink.Text color={colors.yellow}>
-        Restored <Brackets>{branch_name}</Brackets>.
-      </Ink.Text>
-    );
-
-    actions.exit(6);
-  }
+  return <Rebase />;
 }
-
-const PATCH_FILE = "git-stack-cli-patch.patch";

package/src/command.ts

@@ -27,6 +27,12 @@ export async function command() {
         (yargs) => yargs.strict(false)
       )
 
+      .command(
+        "rebase",
+        "Update local branch via rebase with latest changes from origin master branch",
+        (yargs) => yargs
+      )
+
       .option("verbose", GlobalOptions.verbose)
 
       // yargs default wraps to 80 columns

package/src/commands/Rebase.tsx

@@ -0,0 +1,204 @@
+import * as React from "react";
+
+import fs from "node:fs";
+
+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 { Store } from "~/app/Store";
+import * as CommitMetadata from "~/core/CommitMetadata";
+import { cli } from "~/core/cli";
+import { colors } from "~/core/colors";
+import { invariant } from "~/core/invariant";
+import { short_id } from "~/core/short_id";
+
+export function Rebase() {
+  return (
+    <Await
+      function={Rebase.run}
+      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
+    />
+  );
+}
+
+Rebase.run = async function run() {
+  const state = Store.getState();
+  const actions = state.actions;
+  const branch_name = state.branch_name;
+  const commit_range = state.commit_range;
+  const master_branch = state.master_branch;
+  const cwd = state.cwd;
+  const repo_root = state.repo_root;
+
+  invariant(branch_name, "branch_name must exist");
+  invariant(commit_range, "commit_range must exist");
+  invariant(repo_root, "repo_root must exist");
+
+  // always listen for SIGINT event and restore git state
+  process.once("SIGINT", handle_exit);
+
+  const temp_branch_name = `${branch_name}_${short_id()}`;
+
+  try {
+    // actions.debug(`commit_range=${JSON.stringify(commit_range, null, 2)}`);
+
+    // must perform rebase from repo root for applying git patch
+    process.chdir(repo_root);
+    await cli(`pwd`);
+
+    // update local master to match remote
+    await cli(
+      `git fetch --no-tags -v origin ${master_branch}:${master_branch}`
+    );
+
+    const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
+    const rebase_merge_base = master_sha;
+
+    // create temporary branch based on merge base
+    await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
+
+    const picked_commit_list = [];
+
+    for (let i = 0; i < commit_range.commit_list.length; i++) {
+      const commit = commit_range.commit_list[i];
+      const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
+
+      // drop commits that are in groups of merged PRs
+      const merged_pr = commit_pr?.state === "MERGED";
+
+      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}"
+            values={{
+              commit_message: <Brackets>{commit.subject_line}</Brackets>,
+            }}
+          />
+        );
+      }
+
+      picked_commit_list.push(commit);
+    }
+
+    if (picked_commit_list.length > 0) {
+      // ensure clean base to avoid conflicts when applying patch
+      await cli(`git clean -fd`);
+
+      // create list of sha for cherry-pick
+      const sha_list = picked_commit_list.map((commit) => commit.sha).join(" ");
+
+      await cli(`git cherry-pick --keep-redundant-commits ${sha_list}`);
+    }
+
+    // after all commits have been cherry-picked and amended
+    // move the branch pointer to the newly created temporary branch
+    // now we are locally in sync with github and on the original branch
+    await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
+
+    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.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);
+      }
+    }
+
+    handle_exit();
+  }
+
+  // cleanup git operations if cancelled during manual rebase
+  function restore_git() {
+    // signint handler MUST run synchronously
+    // trying to use `await cli(...)` here will silently fail since
+    // all children processes receive the SIGINT signal
+    const spawn_options = { ignoreExitCode: true };
+
+    // always clean up any patch files
+    cli.sync(`rm ${PATCH_FILE}`, spawn_options);
+
+    // always hard reset and clean to allow subsequent checkout
+    // if there are files checkout will fail and cascade fail subsequent commands
+    cli.sync(`git reset --hard`, spawn_options);
+    cli.sync(`git clean -df`, spawn_options);
+
+    // always put self back in original branch
+    cli.sync(`git checkout ${branch_name}`, spawn_options);
+
+    // ...and cleanup temporary branch
+    cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
+
+    if (commit_range) {
+      // ...and cleanup pr group branches
+      for (const group of commit_range.group_list) {
+        cli.sync(`git branch -D ${group.id}`, spawn_options);
+      }
+    }
+
+    // restore back to original dir
+    if (fs.existsSync(cwd)) {
+      process.chdir(cwd);
+    }
+    cli.sync(`pwd`, spawn_options);
+  }
+
+  function handle_exit() {
+    actions.output(
+      <Ink.Text color={colors.yellow}>
+        Restoring <Brackets>{branch_name}</Brackets>…
+      </Ink.Text>
+    );
+
+    restore_git();
+
+    actions.output(
+      <Ink.Text color={colors.yellow}>
+        Restored <Brackets>{branch_name}</Brackets>.
+      </Ink.Text>
+    );
+
+    actions.exit(6);
+  }
+};
+
+const PATCH_FILE = "git-stack-cli-patch.patch";