git-stack-cli 1.11.6 → 1.12.0

package/dist/cjs/index.cjs

@@ -29784,8 +29784,39 @@ async function pr_edit(args) {
         handle_error(cli_result.output);
     }
 }
+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();
+    // lookup id from pr cache using args.branch
+    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);
+    }
+}
 // prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
+const JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 // consistent handle gh cli commands returning json
 // redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
 async function gh_json(command) {
@@ -30914,10 +30945,22 @@ async function run$6() {
         actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
                 group: (reactExports.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
             } }));
+        // 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 = false;
         // 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 pr_draft({
+                    branch: group.id,
+                    draft: true,
+                });
+            }
             await pr_edit({
                 branch: group.id,
                 base: master_branch,
@@ -30941,6 +30984,13 @@ async function run$6() {
                     selected_url,
                 }),
             });
+            if (is_temp_draft) {
+                // mark pr as ready for review again
+                await pr_draft({
+                    branch: group.id,
+                    draft: false,
+                });
+            }
         }
         else {
             if (!args.skip_checkout) {
@@ -31917,11 +31967,11 @@ function VerboseDebugInfo(props) {
 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`);
+        await cli(`git config --list --show-origin`);
     }
     catch (err) {
         actions.error("Unable to log verbose debug information.");
@@ -31976,6 +32026,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;
@@ -31987,21 +32041,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"));
+        }
     }
 }
 
@@ -37420,7 +37479,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.6" )
+        .version("1.12.0" )
         .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.6",
+  "version": "1.12.0",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/ManualRebase.tsx

@@ -290,10 +290,25 @@ async function run() {
       />
     );
 
+    // 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 = false;
+
     // 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,
@@ -322,6 +337,14 @@ async function run() {
           selected_url,
         }),
       });
+
+      if (is_temp_draft) {
+        // mark pr as ready for review again
+        await github.pr_draft({
+          branch: group.id,
+          draft: false,
+        });
+      }
     } else {
       if (!args.skip_checkout) {
         // delete local group branch if leftover

package/src/app/VerboseDebugInfo.tsx

@@ -29,11 +29,11 @@ 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`);
+    await cli(`git config --list --show-origin`);
   } catch (err) {
     actions.error("Unable to log verbose debug information.");
 

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>
+      );
+    }
   }
 }

package/src/core/GitReviseTodo.test.ts

@@ -82,6 +82,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       id: "AAWsYx1UU",
       title: "banana",
       pr: {
+        id: "PR_kwDOKjvFM85ghvAH",
+        isDraft: false,
         baseRefName: "master",
         body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
         commits: [
@@ -123,6 +125,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       id: "E63ytp5dj",
       title: "lemon color",
       pr: {
+        id: "PR_kwDOKjvFM85gwTkx",
+        isDraft: false,
         baseRefName: "AAWsYx1UU",
         body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
         commits: [
@@ -251,6 +255,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
   ],
   pr_lookup: {
     AAWsYx1UU: {
+      id: "PR_kwDOKjvFM85ghvAH",
+      isDraft: false,
       baseRefName: "master",
       body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
       commits: [
@@ -277,6 +283,8 @@ const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
       url: "https://github.com/magus/git-multi-diff-playground/pull/43",
     },
     E63ytp5dj: {
+      id: "PR_kwDOKjvFM85gwTkx",
+      isDraft: false,
       baseRefName: "AAWsYx1UU",
       body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
       commits: [
@@ -343,6 +351,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       id: "AAWsYx1UU",
       title: "banana",
       pr: {
+        id: "PR_kwDOKjvFM85ghvAH",
+        isDraft: false,
         baseRefName: "master",
         body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
         commits: [
@@ -384,6 +394,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       id: "E63ytp5dj",
       title: "lemon color",
       pr: {
+        id: "PR_kwDOKjvFM85gwTkx",
+        isDraft: false,
         baseRefName: "AAWsYx1UU",
         body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
         commits: [
@@ -521,6 +533,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
   ],
   pr_lookup: {
     AAWsYx1UU: {
+      id: "PR_kwDOKjvFM85ghvAH",
+      isDraft: false,
       baseRefName: "master",
       body: "adsf\r\n\r\n#### git stack\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47\n- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
       commits: [
@@ -547,6 +561,8 @@ const SINGLE_COMMIT_NEW_GROUP: CommitMetadata.CommitRange = {
       url: "https://github.com/magus/git-multi-diff-playground/pull/43",
     },
     E63ytp5dj: {
+      id: "PR_kwDOKjvFM85gwTkx",
+      isDraft: false,
       baseRefName: "AAWsYx1UU",
       body: "\r\n\r\n#### git stack\n- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47\n- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/43\n- ✅ `1`\n  https://github.com/magus/git-multi-diff-playground/pull/42",
       commits: [

package/src/core/github.tsx

@@ -160,8 +160,52 @@ export async function pr_edit(args: EditPullRequestArgs) {
   }
 }
 
+type DraftPullRequestArgs = {
+  branch: string;
+  draft: boolean;
+};
+
+export async function pr_draft(args: DraftPullRequestArgs) {
+  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();
+
+  // lookup id from pr cache using args.branch
+  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);
+  }
+}
+
 // prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
+const JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 
 // consistent handle gh cli commands returning json
 // redirect to tmp file to avoid scrollback overflow causing scrollback to be cleared
@@ -220,6 +264,7 @@ type Commit = {
 };
 
 export type PullRequest = {
+  id: string;
   number: number;
   state: "OPEN" | "MERGED" | "CLOSED";
   baseRefName: string;
@@ -228,4 +273,5 @@ export type PullRequest = {
   title: string;
   body: string;
   url: string;
+  isDraft: boolean;
 };