git-stack-cli 2.3.0 → 2.3.1

package/dist/js/index.js

@@ -39193,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;
@@ -39293,8 +39293,12 @@ Rebase.run = async function run5() {
   actions.set((state2) => {
     state2.commit_range = next_commit_range;
   });
-  actions.output(/* @__PURE__ */ React34.createElement(Status, null));
-  actions.exit(0);
+  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);
@@ -39319,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
@@ -45653,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.3.0").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.3.0",
+  "version": "2.3.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

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/commands/Rebase.tsx

@@ -15,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;
@@ -145,9 +149,12 @@ Rebase.run = async function run() {
     state.commit_range = next_commit_range;
   });
 
-  actions.output(<Status />);
-
-  actions.exit(0);
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(<Status />);
+    actions.exit(0);
+  }
 
   // cleanup git operations if cancelled during manual rebase
   function restore_git() {