git-stack-cli 1.6.1 → 1.7.0

package/dist/cjs/index.cjs

@@ -17694,7 +17694,7 @@ function YesNoPrompt(props) {
                 n));
     }
     return (reactExports.createElement(Box, { flexDirection: "column" },
-        reactExports.createElement(Box, null,
+        reactExports.createElement(Box, { alignItems: "flex-end" },
             typeof props.message === "object" ? (props.message) : (reactExports.createElement(Text, { color: colors.yellow }, props.message)),
             reactExports.createElement(Text, null, " "),
             reactExports.createElement(Parens, null,
@@ -26209,6 +26209,8 @@ const BaseStore = createStore()(immer((set, get) => ({
     branch_name: null,
     commit_range: null,
     commit_map: null,
+    pr_templates: [],
+    pr_template_body: null,
     step: "loading",
     output: [],
     pending_output: {},
@@ -27040,10 +27042,15 @@ function DirtyCheck(props) {
         case "done":
             return props.children;
         case "prompt":
-            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{git} repo is dirty, changed may be lost during {git_stack}, are you sure you wannt to proceed?", values: {
-                        git: reactExports.createElement(Command, null, "git"),
-                        git_stack: reactExports.createElement(Command, null, "git stack"),
-                    } }), onYes: async () => {
+            return (reactExports.createElement(YesNoPrompt, { message: reactExports.createElement(Box, { flexDirection: "column" },
+                    reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{git} repo has uncommitted changes.", values: {
+                            git: reactExports.createElement(Command, null, "git"),
+                            git_stack: reactExports.createElement(Command, null, "git stack"),
+                        } }),
+                    reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "Changes may be lost during {git_stack}, are you sure you want to proceed?", values: {
+                            git: reactExports.createElement(Command, null, "git"),
+                            git_stack: reactExports.createElement(Command, null, "git stack"),
+                        } })), onYes: async () => {
                     patch({ status: "done" });
                 }, onNo: async () => {
                     actions.exit(0);
@@ -27171,9 +27178,9 @@ function format_time(date) {
 }
 
 function GithubApiError() {
-    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;
     const res = await cli(`gh api https://api.github.com/rate_limit`);
     const res_json = JSON.parse(res.stdout);
@@ -27630,9 +27637,9 @@ function encode(value) {
 }
 
 function LocalMergeRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$3 }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$4 }));
 }
-async function run$3() {
+async function run$4() {
     const state = Store.getState();
     const actions = state.actions;
     const branch_name = state.branch_name;
@@ -27922,9 +27929,9 @@ const RE = {
 };
 
 function ManualRebase() {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$2 }));
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits\u2026"), function: run$3 }));
 }
-async function run$2() {
+async function run$3() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -27938,6 +27945,10 @@ async function run$2() {
     invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
+    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);
     // reverse commit list so that we can cherry-pick in order
@@ -28163,7 +28174,7 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
                 branch: group.id,
                 base: group.base,
                 title: group.title,
-                body: "",
+                body: DEFAULT_PR_BODY,
             });
             if (!pr_url) {
                 throw new Error("unable to create pr");
@@ -28190,7 +28201,7 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
             // use the updated pr_url_list to get the actual selected_url
             const selected_url = pr_url_list[i];
             invariant(group.base, "group.base must exist");
-            const body = group.pr?.body || "";
+            const body = group.pr?.body || DEFAULT_PR_BODY;
             const update_body = write({
                 body,
                 pr_url_list,
@@ -28430,9 +28441,9 @@ function get_status_bold(row) {
 }
 
 function PostRebaseStatus() {
-    return reactExports.createElement(Await, { fallback: null, function: run$1 });
+    return reactExports.createElement(Await, { fallback: null, function: run$2 });
 }
-async function run$1() {
+async function run$2() {
     const actions = Store.getState().actions;
     // reset github pr cache before refreshing via commit range below
     actions.reset_pr();
@@ -28461,6 +28472,67 @@ function PreLocalMergeRebase() {
         }, onNo: () => actions.exit(0) }));
 }
 
+function PreManualRebase() {
+    return reactExports.createElement(Await, { fallback: null, function: run$1 });
+}
+async function run$1() {
+    const state = Store.getState();
+    const actions = state.actions;
+    const repo_root = state.repo_root;
+    const argv = state.argv;
+    invariant(repo_root, "repo_root must exist");
+    invariant(argv, "argv must exist");
+    if (!argv.template) {
+        return actions.set((state) => {
+            state.step = "manual-rebase";
+        });
+    }
+    // ./.github/PULL_REQUEST_TEMPLATE/*.md
+    let pr_templates = [];
+    if (fs.existsSync(template_pr_template(repo_root))) {
+        pr_templates = fs.readdirSync(template_pr_template(repo_root));
+    }
+    // look for pull request template
+    // https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/creating-a-pull-request-template-for-your-repository
+    // ./.github/pull_request_template.md
+    // ./pull_request_template.md
+    // ./docs/pull_request_template.md
+    let pr_template_body = null;
+    if (fs.existsSync(github_pr_template(repo_root))) {
+        pr_template_body = fs.readFileSync(github_pr_template(repo_root), "utf-8");
+    }
+    else if (fs.existsSync(root_pr_template(repo_root))) {
+        pr_template_body = fs.readFileSync(root_pr_template(repo_root), "utf-8");
+    }
+    else if (fs.existsSync(docs_pr_template(repo_root))) {
+        pr_template_body = fs.readFileSync(docs_pr_template(repo_root), "utf-8");
+    }
+    // check if repo has multiple pr templates
+    actions.set((state) => {
+        state.pr_template_body = pr_template_body;
+        state.pr_templates = pr_templates;
+        if (pr_templates.length > 0) {
+            actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow }), message: "{count} queryable templates found under {dir}, but not supported.", values: {
+                    count: (reactExports.createElement(Text, { color: colors.blue }, pr_templates.length)),
+                    dir: reactExports.createElement(Brackets, null, template_pr_template("")),
+                } }));
+        }
+        state.step = "manual-rebase";
+    });
+}
+function github_pr_template(repo_root) {
+    return path.join(repo_root, ".github", "pull_request_template.md");
+}
+function root_pr_template(repo_root) {
+    return path.join(repo_root, "pull_request_template.md");
+}
+function docs_pr_template(repo_root) {
+    return path.join(repo_root, "docs", "pull_request_template.md");
+}
+function template_pr_template(repo_root) {
+    return path.join(repo_root, ".github", "PULL_REQUEST_TEMPLATE");
+}
+
 function PreSelectCommitRanges() {
     const actions = Store.useActions();
     const argv = Store.useState((state) => state.argv);
@@ -28561,11 +28633,13 @@ function MultiSelect(props) {
             return;
         }
         const space = input === " ";
-        if (key.return || space) {
-            selectRef.current = true;
-            const item = props.items[index];
-            if (!item.disabled) {
-                return select(index);
+        if (!props.disableSelect) {
+            if (key.return || space) {
+                selectRef.current = true;
+                const item = props.items[index];
+                if (!item.disabled) {
+                    return select(index);
+                }
             }
         }
         if (key.upArrow) {
@@ -28774,7 +28848,7 @@ function SelectCommitRangesInternal(props) {
                 }
                 switch (inputLower) {
                     case "s":
-                        state.step = "manual-rebase";
+                        state.step = "pre-manual-rebase";
                         break;
                 }
             });
@@ -28797,6 +28871,8 @@ function SelectCommitRangesInternal(props) {
         }
     });
     const group = group_list[current_index];
+    const multiselect_disabled = group_input;
+    const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
     const items = props.commit_range.commit_list.map((commit) => {
         const commit_metadata_id = commit_map.get(commit.sha);
         const selected = commit_metadata_id !== null;
@@ -28804,9 +28880,6 @@ function SelectCommitRangesInternal(props) {
         if (group_input) {
             disabled = true;
         }
-        else if (group.id === props.commit_range.UNASSIGNED) {
-            disabled = true;
-        }
         else {
             disabled = Boolean(selected && commit_metadata_id !== group.id);
         }
@@ -28832,7 +28905,7 @@ function SelectCommitRangesInternal(props) {
     const [focused, set_focused] = reactExports.useState("");
     return (reactExports.createElement(Box, { flexDirection: "column" },
         reactExports.createElement(Box, { height: 1 }),
-        reactExports.createElement(MultiSelect, { key: group.id, items: items, maxWidth: max_item_width, disabled: group_input, onFocus: (args) => {
+        reactExports.createElement(MultiSelect, { items: items, maxWidth: max_item_width, disabled: multiselect_disabled, disableSelect: multiselect_disableSelect, onFocus: (args) => {
                 // console.debug("onFocus", args);
                 set_focused(args.item.subject_line);
             }, onSelect: (args) => {
@@ -28974,6 +29047,8 @@ function Main() {
             return reactExports.createElement(PreSelectCommitRanges, null);
         case "select-commit-ranges":
             return reactExports.createElement(SelectCommitRanges, null);
+        case "pre-manual-rebase":
+            return reactExports.createElement(PreManualRebase, null);
         case "manual-rebase":
             return reactExports.createElement(ManualRebase, null);
         case "post-rebase-status":
@@ -34448,6 +34523,11 @@ async function command() {
         type: "boolean",
         default: false,
         description: "Write state to local json file for debugging",
+    })
+        .option("template", {
+        type: "boolean",
+        default: true,
+        description: "Use automatic Github PR template, e.g. .github/pull_request_template.md, disable with --no-template",
     })
         .option("mock-metadata", {
         hidden: true,
@@ -34461,7 +34541,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.6.1" )
+        .version("1.7.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.6.1",
+  "version": "1.7.0",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/DirtyCheck.tsx

@@ -37,14 +37,24 @@ export function DirtyCheck(props: Props) {
       return (
         <YesNoPrompt
           message={
-            <FormatText
-              wrapper={<Ink.Text color={colors.yellow} />}
-              message="{git} repo is dirty, changed may be lost during {git_stack}, are you sure you wannt to proceed?"
-              values={{
-                git: <Command>git</Command>,
-                git_stack: <Command>git stack</Command>,
-              }}
-            />
+            <Ink.Box flexDirection="column">
+              <FormatText
+                wrapper={<Ink.Text color={colors.yellow} />}
+                message="{git} repo has uncommitted changes."
+                values={{
+                  git: <Command>git</Command>,
+                  git_stack: <Command>git stack</Command>,
+                }}
+              />
+              <FormatText
+                wrapper={<Ink.Text color={colors.yellow} />}
+                message="Changes may be lost during {git_stack}, are you sure you want to proceed?"
+                values={{
+                  git: <Command>git</Command>,
+                  git_stack: <Command>git stack</Command>,
+                }}
+              />
+            </Ink.Box>
           }
           onYes={async () => {
             patch({ status: "done" });

package/src/app/Main.tsx

@@ -5,6 +5,7 @@ import { LocalMergeRebase } from "~/app/LocalMergeRebase";
 import { ManualRebase } from "~/app/ManualRebase";
 import { PostRebaseStatus } from "~/app/PostRebaseStatus";
 import { PreLocalMergeRebase } from "~/app/PreLocalMergeRebase";
+import { PreManualRebase } from "~/app/PreManualRebase";
 import { PreSelectCommitRanges } from "~/app/PreSelectCommitRanges";
 import { SelectCommitRanges } from "~/app/SelectCommitRanges";
 import { Status } from "~/app/Status";
@@ -36,6 +37,9 @@ export function Main() {
     case "select-commit-ranges":
       return <SelectCommitRanges />;
 
+    case "pre-manual-rebase":
+      return <PreManualRebase />;
+
     case "manual-rebase":
       return <ManualRebase />;
 

package/src/app/ManualRebase.tsx

@@ -46,6 +46,11 @@ async function run() {
   // always listen for SIGINT event and restore git state
   process.once("SIGINT", handle_exit);
 
+  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 CommitMetadata.range(commit_map);
@@ -328,7 +333,7 @@ async function run() {
         branch: group.id,
         base: group.base,
         title: group.title,
-        body: "",
+        body: DEFAULT_PR_BODY,
       });
 
       if (!pr_url) {
@@ -363,7 +368,7 @@ async function run() {
 
       invariant(group.base, "group.base must exist");
 
-      const body = group.pr?.body || "";
+      const body = group.pr?.body || DEFAULT_PR_BODY;
 
       const update_body = StackSummaryTable.write({
         body,

package/src/app/MultiSelect.tsx

@@ -12,6 +12,7 @@ type Props<T> = {
   onSelect: (args: CallbackArgs<T>) => void;
   onFocus?: (args: CallbackArgs<T>) => void;
   disabled?: boolean;
+  disableSelect?: boolean;
   maxWidth?: number;
 };
 
@@ -118,11 +119,13 @@ export function MultiSelect<T>(props: Props<T>) {
 
     const space = input === " ";
 
-    if (key.return || space) {
-      selectRef.current = true;
-      const item = props.items[index];
-      if (!item.disabled) {
-        return select(index);
+    if (!props.disableSelect) {
+      if (key.return || space) {
+        selectRef.current = true;
+        const item = props.items[index];
+        if (!item.disabled) {
+          return select(index);
+        }
       }
     }
 

package/src/app/PreManualRebase.tsx

@@ -0,0 +1,92 @@
+import * as React from "react";
+
+import fs from "node:fs";
+import path from "node:path";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Brackets } from "~/app/Brackets";
+import { FormatText } from "~/app/FormatText";
+import { Store } from "~/app/Store";
+import { colors } from "~/core/colors";
+import { invariant } from "~/core/invariant";
+
+export function PreManualRebase() {
+  return <Await fallback={null} function={run} />;
+}
+
+async function run() {
+  const state = Store.getState();
+  const actions = state.actions;
+  const repo_root = state.repo_root;
+  const argv = state.argv;
+
+  invariant(repo_root, "repo_root must exist");
+  invariant(argv, "argv must exist");
+
+  if (!argv.template) {
+    return actions.set((state) => {
+      state.step = "manual-rebase";
+    });
+  }
+
+  // ./.github/PULL_REQUEST_TEMPLATE/*.md
+  let pr_templates: Array<string> = [];
+  if (fs.existsSync(template_pr_template(repo_root))) {
+    pr_templates = fs.readdirSync(template_pr_template(repo_root));
+  }
+
+  // look for pull request template
+  // https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/creating-a-pull-request-template-for-your-repository
+  // ./.github/pull_request_template.md
+  // ./pull_request_template.md
+  // ./docs/pull_request_template.md
+  let pr_template_body: null | string = null;
+  if (fs.existsSync(github_pr_template(repo_root))) {
+    pr_template_body = fs.readFileSync(github_pr_template(repo_root), "utf-8");
+  } else if (fs.existsSync(root_pr_template(repo_root))) {
+    pr_template_body = fs.readFileSync(root_pr_template(repo_root), "utf-8");
+  } else if (fs.existsSync(docs_pr_template(repo_root))) {
+    pr_template_body = fs.readFileSync(docs_pr_template(repo_root), "utf-8");
+  }
+
+  // check if repo has multiple pr templates
+  actions.set((state) => {
+    state.pr_template_body = pr_template_body;
+    state.pr_templates = pr_templates;
+
+    if (pr_templates.length > 0) {
+      actions.output(
+        <FormatText
+          wrapper={<Ink.Text color={colors.yellow} />}
+          message="{count} queryable templates found under {dir}, but not supported."
+          values={{
+            count: (
+              <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>
+            ),
+            dir: <Brackets>{template_pr_template("")}</Brackets>,
+          }}
+        />
+      );
+    }
+
+    state.step = "manual-rebase";
+  });
+}
+
+function github_pr_template(repo_root: string) {
+  return path.join(repo_root, ".github", "pull_request_template.md");
+}
+
+function root_pr_template(repo_root: string) {
+  return path.join(repo_root, "pull_request_template.md");
+}
+
+function docs_pr_template(repo_root: string) {
+  return path.join(repo_root, "docs", "pull_request_template.md");
+}
+
+function template_pr_template(repo_root: string) {
+  return path.join(repo_root, ".github", "PULL_REQUEST_TEMPLATE");
+}

package/src/app/SelectCommitRanges.tsx

@@ -143,7 +143,7 @@ function SelectCommitRangesInternal(props: Props) {
 
         switch (inputLower) {
           case "s":
-            state.step = "manual-rebase";
+            state.step = "pre-manual-rebase";
             break;
         }
       });
@@ -171,6 +171,9 @@ function SelectCommitRangesInternal(props: Props) {
 
   const group = group_list[current_index];
 
+  const multiselect_disabled = group_input;
+  const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
+
   const items = props.commit_range.commit_list.map((commit) => {
     const commit_metadata_id = commit_map.get(commit.sha);
 
@@ -180,8 +183,6 @@ function SelectCommitRangesInternal(props: Props) {
 
     if (group_input) {
       disabled = true;
-    } else if (group.id === props.commit_range.UNASSIGNED) {
-      disabled = true;
     } else {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
@@ -218,10 +219,10 @@ function SelectCommitRangesInternal(props: Props) {
       <Ink.Box height={1} />
 
       <MultiSelect
-        key={group.id}
         items={items}
         maxWidth={max_item_width}
-        disabled={group_input}
+        disabled={multiselect_disabled}
+        disableSelect={multiselect_disableSelect}
         onFocus={(args) => {
           // console.debug("onFocus", args);
 

package/src/app/Store.tsx

@@ -38,6 +38,8 @@ export type State = {
   branch_name: null | string;
   commit_range: null | CommitMetadata.CommitRange;
   commit_map: null | CommitMap;
+  pr_templates: Array<string>;
+  pr_template_body: null | string;
 
   step:
     | "github-api-error"
@@ -47,6 +49,7 @@ export type State = {
     | "local-merge-rebase"
     | "pre-select-commit-ranges"
     | "select-commit-ranges"
+    | "pre-manual-rebase"
     | "manual-rebase"
     | "post-rebase-status";
 
@@ -98,6 +101,8 @@ const BaseStore = createStore<State>()(
     branch_name: null,
     commit_range: null,
     commit_map: null,
+    pr_templates: [],
+    pr_template_body: null,
 
     step: "loading",
 

package/src/app/YesNoPrompt.tsx

@@ -55,7 +55,7 @@ export function YesNoPrompt(props: Props) {
 
   return (
     <Ink.Box flexDirection="column">
-      <Ink.Box>
+      <Ink.Box alignItems="flex-end">
         {typeof props.message === "object" ? (
           props.message
         ) : (

package/src/command.ts

@@ -78,6 +78,13 @@ export async function command() {
         description: "Write state to local json file for debugging",
       })
 
+      .option("template", {
+        type: "boolean",
+        default: true,
+        description:
+          "Use automatic Github PR template, e.g. .github/pull_request_template.md, disable with --no-template",
+      })
+
       .option("mock-metadata", {
         hidden: true,
         type: "boolean",