git-stack-cli 2.4.1 → 2.5.1

package/dist/js/index.js

@@ -37869,7 +37869,13 @@ var RE = {
 
 // src/app/DependencyCheck.tsx
 function DependencyCheck(props) {
-  return /* @__PURE__ */ React23.createElement(CheckGit, null, /* @__PURE__ */ React23.createElement(CheckGithubCli, null, /* @__PURE__ */ React23.createElement(CheckGithubCliAuth, null, /* @__PURE__ */ React23.createElement(CheckGitRevise, null, props.children))));
+  return /* @__PURE__ */ React23.createElement(CheckGit, null, /* @__PURE__ */ React23.createElement(CheckGithubCli, {
+    ...props
+  }, /* @__PURE__ */ React23.createElement(CheckGithubCliAuth, {
+    ...props
+  }, /* @__PURE__ */ React23.createElement(CheckGitRevise, {
+    ...props
+  }, props.children))));
 }
 function CheckGit(props) {
   const actions = Store.useActions();
@@ -37890,6 +37896,9 @@ function CheckGit(props) {
 }
 function CheckGithubCli(props) {
   const actions = Store.useActions();
+  if (props.disableGithubCli) {
+    return /* @__PURE__ */ React23.createElement(React23.Fragment, null, props.children);
+  }
   return /* @__PURE__ */ React23.createElement(Await, {
     fallback: /* @__PURE__ */ React23.createElement(Text, {
       color: colors.yellow
@@ -37917,6 +37926,9 @@ function CheckGithubCli(props) {
 }
 function CheckGithubCliAuth(props) {
   const actions = Store.useActions();
+  if (props.disableGithubCliAuth) {
+    return /* @__PURE__ */ React23.createElement(React23.Fragment, null, props.children);
+  }
   return /* @__PURE__ */ React23.createElement(Await, {
     fallback: /* @__PURE__ */ React23.createElement(Text, {
       color: colors.yellow
@@ -37952,6 +37964,9 @@ function CheckGithubCliAuth(props) {
 }
 function CheckGitRevise(props) {
   const actions = Store.useActions();
+  if (props.disableGitRevise) {
+    return /* @__PURE__ */ React23.createElement(React23.Fragment, null, props.children);
+  }
   return /* @__PURE__ */ React23.createElement(Await, {
     fallback: /* @__PURE__ */ React23.createElement(Text, {
       color: colors.yellow
@@ -38161,32 +38176,6 @@ async function pr_edit(args) {
     await safe_rm(body_file);
   }
 }
-async function pr_draft(args) {
-  const mutation_name = args.draft ? "convertPullRequestToDraft" : "markPullRequestReadyForReview";
-  let query = `
-    mutation($id: ID!) {
-      ${mutation_name}(input: { pullRequestId: $id }) {
-        pullRequest {
-          id
-          number
-          isDraft
-        }
-      }
-    }
-  `;
-  query = query.replace(/\n/g, " ");
-  query = query.replace(/\s+/g, " ");
-  query = query.trim();
-  const state = Store.getState();
-  const cache_pr = state.pr[args.branch];
-  invariant(cache_pr, "cache_pr must exist");
-  const command_parts = [`gh api graphql -F id="${cache_pr.id}" -f query='${query}'`];
-  const command = command_parts.join(" ");
-  const cli_result = await cli(command);
-  if (cli_result.code !== 0) {
-    handle_error(cli_result.output);
-  }
-}
 var JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 async function gh_json(command) {
   let hash = crypto.createHash("md5").update(command).digest("hex");
@@ -38415,6 +38404,8 @@ GitReviseTodo.todo = function todo(args) {
   return todo2;
 };
 GitReviseTodo.execute = async function grt_execute(args) {
+  const argv = Store.getState().argv;
+  const actions = Store.getState().actions;
   const GIT_SEQUENCE_EDITOR_SCRIPT = `#!/bin/sh
 
 # Example
@@ -38472,10 +38463,30 @@ echo
   const command = [
     `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
     `GIT_REVISE_TODO="${tmp_path_git_revise_todo}"`,
-    `git`,
-    `revise --edit -i ${args.rebase_merge_base}`
+    `git`
   ];
-  await cli(command, { stdio: ["pipe", "pipe", "pipe"] });
+  if (!argv["revise-sign"]) {
+    command.push(...["-c", "commit.gpgsign=false"]);
+  }
+  command.push(`revise --edit -i ${args.rebase_merge_base}`);
+  try {
+    await cli(command, { stdio: ["pipe", "pipe", "pipe"] });
+  } catch (err) {
+    if (err instanceof Error) {
+      actions.error(err.message);
+      if (err.message.includes("gpg failed to sign commit")) {
+        actions.error(`
+
+`);
+        actions.error("\uD83D\uDEA8 git revise failed to sign commit");
+        actions.error("\uD83D\uDCA1 Try again with `--no-revise-sign`?");
+        actions.error(`
+
+`);
+        actions.exit(21);
+      }
+    }
+  }
   await safe_rm(tmp_git_sequence_editor_path);
 };
 
@@ -40250,13 +40261,6 @@ async function run9() {
   invariant(sync_github, "sync_github must exist");
   const commit_range = sync_github.commit_range;
   const rebase_group_index = sync_github.rebase_group_index;
-  actions.register_abort_handler(async function abort_sync_github() {
-    actions.output(/* @__PURE__ */ React44.createElement(Text, {
-      color: colors.red
-    }, "\uD83D\uDEA8 Abort"));
-    handle_exit2();
-    return 17;
-  });
   let DEFAULT_PR_BODY = "";
   if (state.pr_template_body) {
     DEFAULT_PR_BODY = state.pr_template_body;
@@ -40322,17 +40326,7 @@ async function run9() {
   async function before_push(args) {
     const { group } = args;
     invariant(group.base, "group.base must exist");
-    let is_temp_draft = !group.pr?.isDraft;
     if (group.pr) {
-      if (!group.pr.isDraft) {
-        is_temp_draft = true;
-      }
-      if (is_temp_draft) {
-        await pr_draft({
-          branch: group.id,
-          draft: true
-        });
-      }
       await pr_edit({
         branch: group.id,
         base: master_branch
@@ -40353,13 +40347,6 @@ async function run9() {
           selected_url
         })
       });
-      let is_temp_draft = !group.pr?.isDraft;
-      if (is_temp_draft) {
-        await pr_draft({
-          branch: group.id,
-          draft: false
-        });
-      }
     } else {
       const pr_url = await pr_create({
         branch: group.id,
@@ -40399,23 +40386,6 @@ async function run9() {
       });
     }
   }
-  function handle_exit2() {
-    actions.output(/* @__PURE__ */ React44.createElement(Text, {
-      color: colors.yellow
-    }, "Restoring PR state…"));
-    for (const group of push_group_list) {
-      let is_temp_draft = !group.pr?.isDraft;
-      if (is_temp_draft) {
-        pr_draft({
-          branch: group.id,
-          draft: false
-        }).catch(actions.error);
-      }
-    }
-    actions.output(/* @__PURE__ */ React44.createElement(Text, {
-      color: colors.yellow
-    }, "Restored PR state."));
-  }
 }
 var get_group_url = (group) => group.pr?.url || group.id;
 
@@ -40785,7 +40755,7 @@ function App2() {
         actions.exit(0);
       }
     }
-  }, /* @__PURE__ */ React54.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React54.createElement(DependencyCheck, null, /* @__PURE__ */ React54.createElement(RebaseCheck, null, /* @__PURE__ */ React54.createElement(CherryPickCheck, null, /* @__PURE__ */ React54.createElement(MaybeMain, null)))))), /* @__PURE__ */ React54.createElement(HandleCtrlCSigint, null))));
+  }, /* @__PURE__ */ React54.createElement(VerboseDebugInfo, null, /* @__PURE__ */ React54.createElement(RebaseCheck, null, /* @__PURE__ */ React54.createElement(CherryPickCheck, null, /* @__PURE__ */ React54.createElement(MaybeMain, null))))), /* @__PURE__ */ React54.createElement(HandleCtrlCSigint, null))));
 }
 function MaybeMain() {
   const argv = Store.useState((state) => state.argv);
@@ -40797,7 +40767,7 @@ function MaybeMain() {
   } else if (positional_list.has("rebase")) {
     return /* @__PURE__ */ React54.createElement(GatherMetadata, null, /* @__PURE__ */ React54.createElement(LocalCommitStatus, null, /* @__PURE__ */ React54.createElement(Rebase, null)));
   }
-  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React54.createElement(GithubApiError, null), /* @__PURE__ */ React54.createElement(GatherMetadata, null, /* @__PURE__ */ React54.createElement(DirtyCheck, null, /* @__PURE__ */ React54.createElement(LocalCommitStatus, null, /* @__PURE__ */ React54.createElement(DetectInitialPR, null, /* @__PURE__ */ React54.createElement(Main, null))))));
+  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, !argv.verbose ? null : /* @__PURE__ */ React54.createElement(GithubApiError, null), /* @__PURE__ */ React54.createElement(DependencyCheck, null, /* @__PURE__ */ React54.createElement(GatherMetadata, null, /* @__PURE__ */ React54.createElement(DirtyCheck, null, /* @__PURE__ */ React54.createElement(LocalCommitStatus, null, /* @__PURE__ */ React54.createElement(DetectInitialPR, null, /* @__PURE__ */ React54.createElement(Main, null)))))));
 }
 
 // node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
@@ -45662,7 +45632,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.4.1").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.5.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: {
@@ -45694,7 +45664,11 @@ var DefaultOptions = {
   verify: {
     type: "boolean",
     default: true,
-    description: "Run git hooks such as pre-commit and pre-push, disable with --no-verify"
+    description: [
+      "Run git hooks such as pre-commit and pre-push",
+      "Disable with --no-verify"
+    ].join(`
+`)
   },
   update: {
     type: "boolean",
@@ -45705,7 +45679,11 @@ var DefaultOptions = {
   branch: {
     type: "string",
     alias: ["b"],
-    description: 'Set the master branch name, defaults to "origin/master" (or "origin/main" if "origin/master" is not found)'
+    description: [
+      "Set the master branch name, defaults to 'origin/master'",
+      "(or 'origin/main' if 'origin/master' is not found)"
+    ].join(`
+`)
   },
   draft: {
     type: "boolean",
@@ -45718,10 +45696,19 @@ var DefaultOptions = {
     default: "",
     description: "Prefix for generated branch names, e.g. dev/magus/"
   },
+  "revise-sign": {
+    type: "boolean",
+    default: true,
+    description: "Disable GPG signing for git revise with --no-revise-sign"
+  },
   template: {
     type: "boolean",
     default: true,
-    description: "Use automatic Github PR template, e.g. .github/pull_request_template.md, disable with --no-template"
+    description: [
+      "Use automatic Github PR template, e.g. .github/pull_request_template.md",
+      "Disable with --no-template"
+    ].join(`
+`)
   },
   "write-state-json": {
     hidden: true,

package/package.json

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

package/src/app/App.tsx

@@ -61,13 +61,11 @@ export function App() {
             }}
           >
             <VerboseDebugInfo>
-              <DependencyCheck>
-                <RebaseCheck>
-                  <CherryPickCheck>
-                    <MaybeMain />
-                  </CherryPickCheck>
-                </RebaseCheck>
-              </DependencyCheck>
+              <RebaseCheck>
+                <CherryPickCheck>
+                  <MaybeMain />
+                </CherryPickCheck>
+              </RebaseCheck>
             </VerboseDebugInfo>
           </AutoUpdate>
 
@@ -100,15 +98,17 @@ function MaybeMain() {
     <React.Fragment>
       {!argv.verbose ? null : <GithubApiError />}
 
-      <GatherMetadata>
-        <DirtyCheck>
-          <LocalCommitStatus>
-            <DetectInitialPR>
-              <Main />
-            </DetectInitialPR>
-          </LocalCommitStatus>
-        </DirtyCheck>
-      </GatherMetadata>
+      <DependencyCheck>
+        <GatherMetadata>
+          <DirtyCheck>
+            <LocalCommitStatus>
+              <DetectInitialPR>
+                <Main />
+              </DetectInitialPR>
+            </LocalCommitStatus>
+          </DirtyCheck>
+        </GatherMetadata>
+      </DependencyCheck>
     </React.Fragment>
   );
 }

package/src/app/DependencyCheck.tsx

@@ -15,14 +15,17 @@ import * as gh from "~/github/gh";
 
 type Props = {
   children: React.ReactNode;
+  disableGithubCli?: boolean;
+  disableGithubCliAuth?: boolean;
+  disableGitRevise?: boolean;
 };
 
 export function DependencyCheck(props: Props) {
   return (
     <CheckGit>
-      <CheckGithubCli>
-        <CheckGithubCliAuth>
-          <CheckGitRevise>
+      <CheckGithubCli {...props}>
+        <CheckGithubCliAuth {...props}>
+          <CheckGitRevise {...props}>
             {/* force line break */}
             {props.children}
           </CheckGitRevise>
@@ -69,6 +72,10 @@ function CheckGit(props: Props) {
 function CheckGithubCli(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGithubCli) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={
@@ -112,6 +119,10 @@ function CheckGithubCli(props: Props) {
 function CheckGithubCliAuth(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGithubCliAuth) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={
@@ -164,6 +175,10 @@ function CheckGithubCliAuth(props: Props) {
 function CheckGitRevise(props: Props) {
   const actions = Store.useActions();
 
+  if (props.disableGitRevise) {
+    return <>{props.children}</>;
+  }
+
   return (
     <Await
       fallback={

package/src/app/SyncGithub.tsx

@@ -35,13 +35,6 @@ async function run() {
   const commit_range = sync_github.commit_range;
   const rebase_group_index = sync_github.rebase_group_index;
 
-  // immediately register abort_handler in case of ctrl+c exit
-  actions.register_abort_handler(async function abort_sync_github() {
-    actions.output(<Ink.Text color={colors.red}>🚨 Abort</Ink.Text>);
-    handle_exit();
-    return 17;
-  });
-
   let DEFAULT_PR_BODY = "";
   if (state.pr_template_body) {
     DEFAULT_PR_BODY = state.pr_template_body;
@@ -52,13 +45,10 @@ async function run() {
   // for all push targets in push_group_list
   // things that can be done in parallel are grouped by numbers
   //
-  // -----------------------------------
-  // 1 (before_push) temp mark draft
   // --------------------------------------
-  // 2 push simultaneously to github
+  // 1 push simultaneously to github
   // --------------------------------------
   // 2 create PR / edit PR
-  // 2 (after_push) undo temp mark draft
   // --------------------------------------
 
   try {
@@ -170,25 +160,10 @@ async function run() {
 
     invariant(group.base, "group.base must exist");
 
-    // we may temporarily mark PR as a draft before editing it
-    // if it is not already a draft PR, to avoid notification spam
-    let is_temp_draft = !group.pr?.isDraft;
-
     // before pushing reset base to master temporarily
     // avoid accidentally pointing to orphaned parent commit
     // should hopefully fix issues where a PR includes a bunch of commits after pushing
     if (group.pr) {
-      if (!group.pr.isDraft) {
-        is_temp_draft = true;
-      }
-
-      if (is_temp_draft) {
-        await github.pr_draft({
-          branch: group.id,
-          draft: true,
-        });
-      }
-
       await github.pr_edit({
         branch: group.id,
         base: master_branch,
@@ -214,18 +189,6 @@ async function run() {
           selected_url,
         }),
       });
-
-      // we may temporarily mark PR as a draft before editing it
-      // if it is not already a draft PR, to avoid notification spam
-      let is_temp_draft = !group.pr?.isDraft;
-
-      if (is_temp_draft) {
-        // mark pr as ready for review again
-        await github.pr_draft({
-          branch: group.id,
-          draft: false,
-        });
-      }
     } else {
       // create pr in github
       const pr_url = await github.pr_create({
@@ -279,28 +242,6 @@ async function run() {
       });
     }
   }
-
-  function handle_exit() {
-    actions.output(<Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>);
-
-    for (const group of push_group_list) {
-      // we may temporarily mark PR as a draft before editing it
-      // if it is not already a draft PR, to avoid notification spam
-      let is_temp_draft = !group.pr?.isDraft;
-
-      // restore PR to non-draft state
-      if (is_temp_draft) {
-        github
-          .pr_draft({
-            branch: group.id,
-            draft: false,
-          })
-          .catch(actions.error);
-      }
-    }
-
-    actions.output(<Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>);
-  }
 }
 
 type CommitMetadataGroup = CommitMetadata.CommitRange["group_list"][number];

package/src/command.ts

@@ -79,7 +79,11 @@ const DefaultOptions = {
   "verify": {
     type: "boolean",
     default: true,
-    description: "Run git hooks such as pre-commit and pre-push, disable with --no-verify",
+    description: [
+      // force line break
+      "Run git hooks such as pre-commit and pre-push",
+      "Disable with --no-verify",
+    ].join("\n"),
   },
 
   "update": {
@@ -92,8 +96,11 @@ const DefaultOptions = {
   "branch": {
     type: "string",
     alias: ["b"],
-    description:
-      'Set the master branch name, defaults to "origin/master" (or "origin/main" if "origin/master" is not found)',
+    description: [
+      // force line break
+      "Set the master branch name, defaults to 'origin/master'",
+      "(or 'origin/main' if 'origin/master' is not found)",
+    ].join("\n"),
   },
 
   "draft": {
@@ -109,11 +116,20 @@ const DefaultOptions = {
     description: "Prefix for generated branch names, e.g. dev/magus/",
   },
 
+  "revise-sign": {
+    type: "boolean",
+    default: true,
+    description: "Disable GPG signing for git revise with --no-revise-sign",
+  },
+
   "template": {
     type: "boolean",
     default: true,
-    description:
-      "Use automatic Github PR template, e.g. .github/pull_request_template.md, disable with --no-template",
+    description: [
+      // force line break
+      "Use automatic Github PR template, e.g. .github/pull_request_template.md",
+      "Disable with --no-template",
+    ].join("\n"),
   },
 
   "write-state-json": {

package/src/core/GitReviseTodo.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 
+import { Store } from "~/app/Store";
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
 import { get_tmp_dir } from "~/core/get_tmp_dir";
@@ -106,6 +107,9 @@ GitReviseTodo.todo = function todo(args: CommitListArgs) {
 };
 
 GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
+  const argv = Store.getState().argv;
+  const actions = Store.getState().actions;
+
   // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
   const GIT_SEQUENCE_EDITOR_SCRIPT = process.env.GIT_SEQUENCE_EDITOR_SCRIPT;
   invariant(GIT_SEQUENCE_EDITOR_SCRIPT, "GIT_SEQUENCE_EDITOR_SCRIPT must exist");
@@ -126,13 +130,31 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
     `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
     `GIT_REVISE_TODO="${tmp_path_git_revise_todo}"`,
     `git`,
-    `revise --edit -i ${args.rebase_merge_base}`,
   ];
 
-  // `ignore` hdies output which helps prevent scrollback clear
-  // `pipe` helps see failures when git revise fails
-  // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
-  await cli(command, { stdio: ["pipe", "pipe", "pipe"] });
+  if (!argv["revise-sign"]) {
+    command.push(...["-c", "commit.gpgsign=false"]);
+  }
+
+  command.push(`revise --edit -i ${args.rebase_merge_base}`);
+
+  try {
+    // `ignore` hides output which helps prevent scrollback clear
+    // `pipe` helps see failures when git revise fails
+    // https://github.com/magus/git-stack-cli/commit/f9f10e3ac3cd9a35ee75d3e0851a48391967a23f
+    await cli(command, { stdio: ["pipe", "pipe", "pipe"] });
+  } catch (err) {
+    if (err instanceof Error) {
+      actions.error(err.message);
+      if (err.message.includes("gpg failed to sign commit")) {
+        actions.error("\n\n");
+        actions.error("🚨 git revise failed to sign commit");
+        actions.error("💡 Try again with `--no-revise-sign`?");
+        actions.error("\n\n");
+        actions.exit(21);
+      }
+    }
+  }
 
   // cleanup tmp_git_sequence_editor_path
   await safe_rm(tmp_git_sequence_editor_path);