git-stack-cli 1.11.5 → 1.11.7

package/dist/cjs/index.cjs

@@ -30269,9 +30269,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$8 }, props.children));
+    return (reactExports.createElement(Await, { fallback: fallback, function: run$9 }, props.children));
 }
-async function run$8() {
+async function run$9() {
     const actions = Store.getState().actions;
     const argv = Store.getState().argv;
     try {
@@ -30365,9 +30365,9 @@ function format_time(date) {
 }
 
 function GithubApiError() {
-    return reactExports.createElement(Await, { fallback: null, function: run$7 });
+    return reactExports.createElement(Await, { fallback: null, function: run$8 });
 }
-async function run$7() {
+async function run$8() {
     const actions = Store.getState().actions;
     const res = await cli(`gh api https://api.github.com/rate_limit`);
     const res_json = JSON.parse(res.stdout);
@@ -30409,7 +30409,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$6 }, props.children));
+    return (reactExports.createElement(Await, { fallback: fallback, function: run$7 }, props.children));
 }
 async function mock_metadata() {
     const module = await Promise.resolve().then(function () { return metadata; });
@@ -30419,7 +30419,7 @@ async function mock_metadata() {
         state.step = "status";
     });
 }
-async function run$6() {
+async function run$7() {
     const actions = Store.getState().actions;
     try {
         const commit_range = await range();
@@ -30734,9 +30734,9 @@ const RE = {
 };
 
 function ManualRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$5 }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$6 }));
 }
-async function run$5() {
+async function run$6() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -31222,9 +31222,9 @@ function get_status_bold(row) {
 }
 
 function PostRebaseStatus() {
-    return reactExports.createElement(Await, { fallback: null, function: run$4 });
+    return reactExports.createElement(Await, { fallback: null, function: run$5 });
 }
-async function run$4() {
+async function run$5() {
     const actions = Store.getState().actions;
     // reset github pr cache before refreshing via commit range below
     actions.reset_pr();
@@ -31254,9 +31254,9 @@ function PreLocalMergeRebase() {
 }
 
 function PreManualRebase() {
-    return reactExports.createElement(Await, { fallback: null, function: run$3 });
+    return reactExports.createElement(Await, { fallback: null, function: run$4 });
 }
-async function run$3() {
+async function run$4() {
     const state = Store.getState();
     const actions = state.actions;
     const repo_root = state.repo_root;
@@ -31765,9 +31765,9 @@ const SYMBOL = {
 };
 
 function Status() {
-    return reactExports.createElement(Await, { fallback: null, function: run$2 });
+    return reactExports.createElement(Await, { fallback: null, function: run$3 });
 }
-async function run$2() {
+async function run$3() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -31910,6 +31910,30 @@ function RebaseCheck(props) {
     }
 }
 
+function VerboseDebugInfo(props) {
+    const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Logging verbose debug information\u2026"));
+    return (reactExports.createElement(Await, { fallback: fallback, function: run$2 }, props.children));
+}
+async function run$2() {
+    const actions = Store.getState().actions;
+    try {
+        await cli(`echo HOME=$HOME`);
+        await cli(`echo USER=$USER`);
+        await cli(`echo GIT_AUTHOR_NAME=$GIT_AUTHOR_NAME`);
+        await cli(`echo GIT_AUTHOR_EMAIL=$GIT_AUTHOR_EMAIL`);
+        await cli(`git config --list --show-origin`);
+    }
+    catch (err) {
+        actions.error("Unable to log verbose debug information.");
+        if (err instanceof Error) {
+            if (actions.isDebug()) {
+                actions.error(err.message);
+            }
+        }
+        actions.exit(14);
+    }
+}
+
 function Fixup() {
     return reactExports.createElement(Await, { fallback: null, function: run$1 });
 }
@@ -31952,6 +31976,10 @@ async function run$1() {
     // get the commit SHA of the target commit
     const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`))
         .stdout;
+    actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDEE0\uFE0F fixup {relative_number} {commit_sha}", values: {
+            commit_sha: reactExports.createElement(Parens, null, commit_sha),
+            relative_number: relative_number,
+        } }));
     await cli(`git commit --fixup ${commit_sha}`);
     // check if stash required
     let save_stash = false;
@@ -31963,21 +31991,26 @@ async function run$1() {
         await cli("git stash -q");
         actions.output(reactExports.createElement(Text, null, "\uD83D\uDCE6 Changes saved to stash"));
     }
-    // rebase target needs to account for new commit created above
-    const rebase_target = Number(relative_number) + 1;
-    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
-        env: {
-            PATH: process.env.PATH,
-            GIT_EDITOR: "true",
-        },
-    });
-    actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "\uD83D\uDEE0\uFE0F fixup {relative_number} {commit_sha}", values: {
-            commit_sha: reactExports.createElement(Parens, null, commit_sha),
-            relative_number: relative_number,
-        } }));
-    if (save_stash) {
-        await cli("git stash pop -q");
-        actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
+    try {
+        // rebase target needs to account for new commit created above
+        const rebase_target = Number(relative_number) + 1;
+        await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
+            env: {
+                ...process.env,
+                GIT_EDITOR: "true",
+            },
+        });
+    }
+    catch (error) {
+        actions.error("🚨 Fixup failed");
+        await cli("git rebase --abort");
+        await cli("git reset --soft HEAD~1");
+    }
+    finally {
+        if (save_stash) {
+            await cli("git stash pop -q");
+            actions.output(reactExports.createElement(Text, { color: colors.green }, "\u2705 Changes restored from stash"));
+        }
     }
 }
 
@@ -32050,10 +32083,11 @@ function App() {
                     actions.exit(0);
                 }
             } },
-            reactExports.createElement(DependencyCheck, null,
-                reactExports.createElement(RebaseCheck, null,
-                    reactExports.createElement(CherryPickCheck, null,
-                        reactExports.createElement(MaybeMain, null)))))));
+            reactExports.createElement(VerboseDebugInfo, null,
+                reactExports.createElement(DependencyCheck, null,
+                    reactExports.createElement(RebaseCheck, null,
+                        reactExports.createElement(CherryPickCheck, null,
+                            reactExports.createElement(MaybeMain, null))))))));
 }
 function MaybeMain() {
     const argv = Store.useState((state) => state.argv);
@@ -37395,7 +37429,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.5" )
+        .version("1.11.7" )
         .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.11.5",
+  "version": "1.11.7",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/App.tsx

@@ -14,6 +14,7 @@ import { Output } from "~/app/Output";
 import { Providers } from "~/app/Providers";
 import { RebaseCheck } from "~/app/RebaseCheck";
 import { Store } from "~/app/Store";
+import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
 import { Rebase } from "~/commands/Rebase";
@@ -54,13 +55,15 @@ export function App() {
           }
         }}
       >
-        <DependencyCheck>
-          <RebaseCheck>
-            <CherryPickCheck>
-              <MaybeMain />
-            </CherryPickCheck>
-          </RebaseCheck>
-        </DependencyCheck>
+        <VerboseDebugInfo>
+          <DependencyCheck>
+            <RebaseCheck>
+              <CherryPickCheck>
+                <MaybeMain />
+              </CherryPickCheck>
+            </RebaseCheck>
+          </DependencyCheck>
+        </VerboseDebugInfo>
       </AutoUpdate>
     </Providers>
   );

package/src/app/VerboseDebugInfo.tsx

@@ -0,0 +1,48 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Store } from "~/app/Store";
+import { cli } from "~/core/cli";
+import { colors } from "~/core/colors";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+export function VerboseDebugInfo(props: Props) {
+  const fallback = (
+    <Ink.Text color={colors.yellow}>
+      Logging verbose debug information…
+    </Ink.Text>
+  );
+
+  return (
+    <Await fallback={fallback} function={run}>
+      {props.children}
+    </Await>
+  );
+}
+
+async function run() {
+  const actions = Store.getState().actions;
+
+  try {
+    await cli(`echo HOME=$HOME`);
+    await cli(`echo USER=$USER`);
+    await cli(`echo GIT_AUTHOR_NAME=$GIT_AUTHOR_NAME`);
+    await cli(`echo GIT_AUTHOR_EMAIL=$GIT_AUTHOR_EMAIL`);
+    await cli(`git config --list --show-origin`);
+  } catch (err) {
+    actions.error("Unable to log verbose debug information.");
+
+    if (err instanceof Error) {
+      if (actions.isDebug()) {
+        actions.error(err.message);
+      }
+    }
+
+    actions.exit(14);
+  }
+}

package/src/commands/Fixup.tsx

@@ -74,6 +74,17 @@ async function run() {
   const commit_sha = (await cli(`git rev-parse HEAD~${adjusted_number}`))
     .stdout;
 
+  actions.output(
+    <FormatText
+      wrapper={<Ink.Text color={colors.yellow} />}
+      message="🛠️ fixup {relative_number} {commit_sha}"
+      values={{
+        commit_sha: <Parens>{commit_sha}</Parens>,
+        relative_number: relative_number,
+      }}
+    />
+  );
+
   await cli(`git commit --fixup ${commit_sha}`);
 
   // check if stash required
@@ -91,31 +102,27 @@ async function run() {
     actions.output(<Ink.Text>📦 Changes saved to stash</Ink.Text>);
   }
 
-  // rebase target needs to account for new commit created above
-  const rebase_target = Number(relative_number) + 1;
-  await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
-    env: {
-      PATH: process.env.PATH,
-      GIT_EDITOR: "true",
-    },
-  });
-
-  actions.output(
-    <FormatText
-      wrapper={<Ink.Text color={colors.yellow} />}
-      message="🛠️ fixup {relative_number} {commit_sha}"
-      values={{
-        commit_sha: <Parens>{commit_sha}</Parens>,
-        relative_number: relative_number,
-      }}
-    />
-  );
-
-  if (save_stash) {
-    await cli("git stash pop -q");
-
-    actions.output(
-      <Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>
-    );
+  try {
+    // rebase target needs to account for new commit created above
+    const rebase_target = Number(relative_number) + 1;
+
+    await cli(`git rebase -i --autosquash HEAD~${rebase_target}`, {
+      env: {
+        ...process.env,
+        GIT_EDITOR: "true",
+      },
+    });
+  } catch (error) {
+    actions.error("🚨 Fixup failed");
+    await cli("git rebase --abort");
+    await cli("git reset --soft HEAD~1");
+  } finally {
+    if (save_stash) {
+      await cli("git stash pop -q");
+
+      actions.output(
+        <Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>
+      );
+    }
   }
 }