git-stack-cli 1.11.4 → 1.11.6

package/dist/cjs/index.cjs

@@ -30109,6 +30109,9 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
         `git`,
         `revise --edit -i ${args.rebase_merge_base}`,
     ];
+    // ignore here is important to prevent scrollback clear
+    // change to pipe to see output temporarily
+    // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
     await cli(command, { stdio: ["ignore", "ignore", "ignore"] });
 };
 
@@ -30266,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 {
@@ -30362,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);
@@ -30406,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; });
@@ -30416,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();
@@ -30731,20 +30734,18 @@ 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;
     const branch_name = state.branch_name;
-    const original_commit_range = cloneDeep$1(state.commit_range);
     const commit_map = state.commit_map;
     const master_branch = state.master_branch;
     const cwd = state.cwd;
     const repo_root = state.repo_root;
     invariant(branch_name, "branch_name must exist");
-    invariant(original_commit_range, "original_commit_range must exist");
     invariant(commit_map, "commit_map must exist");
     invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
@@ -30752,8 +30753,10 @@ async function run$5() {
     // get latest merge_base relative to local master
     const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
     // immediately paint all commit to preserve selected commit ranges
-    original_commit_range.group_list.reverse();
-    for (const commit of original_commit_range.commit_list) {
+    let commit_range = await range(commit_map);
+    // reverse group list to ensure we create git revise in correct order
+    commit_range.group_list.reverse();
+    for (const commit of commit_range.commit_list) {
         const group_from_map = commit_map[commit.sha];
         commit.branch_id = group_from_map.id;
         commit.title = group_from_map.title;
@@ -30761,14 +30764,14 @@ async function run$5() {
     await GitReviseTodo.execute({
         rebase_group_index: 0,
         rebase_merge_base: merge_base,
-        commit_range: original_commit_range,
+        commit_range,
     });
     let DEFAULT_PR_BODY = "";
     if (state.pr_template_body) {
         DEFAULT_PR_BODY = state.pr_template_body;
     }
     const temp_branch_name = `${branch_name}_${short_id()}`;
-    const commit_range = await range(commit_map);
+    commit_range = await range(commit_map);
     // reverse commit list so that we can cherry-pick in order
     commit_range.group_list.reverse();
     let rebase_merge_base = merge_base;
@@ -31219,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();
@@ -31251,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;
@@ -31762,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;
@@ -31907,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(`git config --list --show-origin`);
+        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`);
+    }
+    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 });
 }
@@ -32047,10 +32074,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);
@@ -37392,7 +37420,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.4" )
+        .version("1.11.6" )
         .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.4",
+  "version": "1.11.6",
   "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/ManualRebase.tsx

@@ -3,7 +3,6 @@ import * as React from "react";
 import fs from "node:fs";
 
 import * as Ink from "ink-cjs";
-import cloneDeep from "lodash/cloneDeep";
 
 import { Await } from "~/app/Await";
 import { Brackets } from "~/app/Brackets";
@@ -33,14 +32,12 @@ async function run() {
   const actions = state.actions;
   const argv = state.argv;
   const branch_name = state.branch_name;
-  const original_commit_range = cloneDeep(state.commit_range);
   const commit_map = state.commit_map;
   const master_branch = state.master_branch;
   const cwd = state.cwd;
   const repo_root = state.repo_root;
 
   invariant(branch_name, "branch_name must exist");
-  invariant(original_commit_range, "original_commit_range must exist");
   invariant(commit_map, "commit_map must exist");
   invariant(repo_root, "repo_root must exist");
 
@@ -51,8 +48,12 @@ async function run() {
   const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
   // immediately paint all commit to preserve selected commit ranges
-  original_commit_range.group_list.reverse();
-  for (const commit of original_commit_range.commit_list) {
+  let commit_range = await CommitMetadata.range(commit_map);
+
+  // reverse group list to ensure we create git revise in correct order
+  commit_range.group_list.reverse();
+
+  for (const commit of commit_range.commit_list) {
     const group_from_map = commit_map[commit.sha];
     commit.branch_id = group_from_map.id;
     commit.title = group_from_map.title;
@@ -61,7 +62,7 @@ async function run() {
   await GitReviseTodo.execute({
     rebase_group_index: 0,
     rebase_merge_base: merge_base,
-    commit_range: original_commit_range,
+    commit_range,
   });
 
   let DEFAULT_PR_BODY = "";
@@ -71,7 +72,7 @@ async function run() {
 
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
-  const commit_range = await CommitMetadata.range(commit_map);
+  commit_range = await CommitMetadata.range(commit_map);
 
   // reverse commit list so that we can cherry-pick in order
   commit_range.group_list.reverse();

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(`git config --list --show-origin`);
+    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`);
+  } 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/core/GitReviseTodo.ts

@@ -136,6 +136,9 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
     `revise --edit -i ${args.rebase_merge_base}`,
   ];
 
+  // ignore here is important to prevent scrollback clear
+  // change to pipe to see output temporarily
+  // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
   await cli(command, { stdio: ["ignore", "ignore", "ignore"] });
 };