git-stack-cli 2.8.1 → 2.9.0

package/package.json

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

package/src/app/GatherMetadata.test.tsx

@@ -0,0 +1,33 @@
+import { test, expect } from "bun:test";
+
+import * as GatherMetadata from "~/app/GatherMetadata";
+
+test("invalid origin", () => {
+  const origin_url = "";
+  const repo_path = GatherMetadata.get_repo_path(origin_url);
+  expect(repo_path).toBe(null);
+});
+
+test("https .git", () => {
+  const origin_url = "https://github.com/magus/git-multi-diff-playground.git";
+  const repo_path = GatherMetadata.get_repo_path(origin_url);
+  expect(repo_path).toBe("magus/git-multi-diff-playground");
+});
+
+test("https without .git", () => {
+  const origin_url = "https://github.com/magus/git-multi-diff-playground";
+  const repo_path = GatherMetadata.get_repo_path(origin_url);
+  expect(repo_path).toBe("magus/git-multi-diff-playground");
+});
+
+test("git@ .git", () => {
+  const origin_url = "git@github.com:magus/git-multi-diff-playground.git";
+  const repo_path = GatherMetadata.get_repo_path(origin_url);
+  expect(repo_path).toBe("magus/git-multi-diff-playground");
+});
+
+test("git@ without .git", () => {
+  const origin_url = "git@github.com:magus/git-multi-diff-playground";
+  const repo_path = GatherMetadata.get_repo_path(origin_url);
+  expect(repo_path).toBe("magus/git-multi-diff-playground");
+});

package/src/app/GatherMetadata.tsx

@@ -97,10 +97,21 @@ async function run() {
   }
 }
 
+export function get_repo_path(origin_url: string): null | string {
+  try {
+    return match_group(origin_url, RE.repo_path, "repo_path");
+  } catch {
+    // pass
+  }
+  return null;
+}
+
 const RE = {
   // git@github.com:magus/git-multi-diff-playground.git
   // https://github.com/magus/git-multi-diff-playground.git
-  repo_path: /(?<repo_path>[^:^/]+\/[^/]+)\.git/,
+  // the .git suffix is optional for remote urls, and may not always be provided
+  // https://regex101.com/r/pICG7G/1
+  repo_path: /(?<repo_path>[^:^/]+\/[^/]+?)(\.git)?$/,
 };
 
 const BRANCH = {

package/src/app/MultiSelect.tsx

@@ -15,10 +15,11 @@ type Props<T> = {
   disableSelect?: boolean;
   maxWidth?: number;
   startIndex?: number;
+  withSelectPreview?: boolean;
 };
 
 type Item<T> = {
-  label: string;
+  label: React.ReactNode;
   value: T;
   selected?: ItemRowProps["selected"];
   disabled?: ItemRowProps["disabled"];
@@ -181,9 +182,13 @@ export function MultiSelect<T>(props: Props<T>) {
   return (
     <Ink.Box flexDirection="column">
       {props.items.map((item, i) => {
-        const active = i === index;
-        const selected = selected_set.has(i);
-        const disabled = item.disabled || false;
+        let active = i === index;
+        let selected = selected_set.has(i);
+        let disabled = item.disabled || false;
+
+        if (props.withSelectPreview) {
+          selected = active;
+        }
 
         return (
           <ItemRow
@@ -201,7 +206,7 @@ export function MultiSelect<T>(props: Props<T>) {
 }
 
 type ItemRowProps = {
-  label: string;
+  label: React.ReactNode;
   active: boolean;
   selected: boolean;
   disabled: boolean;

package/src/app/PreManualRebase.tsx

@@ -39,10 +39,11 @@ async function run() {
   // ./pull_request_template.md
   // ./docs/pull_request_template.md
   for (const key of PR_TEMPLATE_KEY_LIST) {
-    const pr_template_fn = PR_TEMPLATE[key as keyof typeof PR_TEMPLATE];
+    const pr_template_fn = PR_TEMPLATE[key];
+    const pr_template_file = pr_template_fn(repo_root);
 
-    if (await safe_exists(pr_template_fn(repo_root))) {
-      pr_template_body = await fs.readFile(pr_template_fn(repo_root), "utf-8");
+    if (await safe_exists(pr_template_file)) {
+      pr_template_body = await fs.readFile(pr_template_file, "utf-8");
 
       actions.output(
         <FormatText
@@ -58,10 +59,23 @@ async function run() {
     }
   }
 
-  // ./.github/PULL_REQUEST_TEMPLATE/*.md
   let pr_templates: Array<string> = [];
-  if (await safe_exists(PR_TEMPLATE.TemplateDir(repo_root))) {
-    pr_templates = await fs.readdir(PR_TEMPLATE.TemplateDir(repo_root));
+  let pr_dir: string = "";
+
+  // ./.github/PULL_REQUEST_TEMPLATE/*.md
+  pr_dir = PR_TEMPLATE.DirGithub(repo_root);
+  if (await safe_exists(pr_dir)) {
+    for (const filename of await fs.readdir(pr_dir)) {
+      pr_templates.push(path.join(pr_dir, filename));
+    }
+  }
+
+  // ./docs/PULL_REQUEST_TEMPLATE/*.md
+  pr_dir = PR_TEMPLATE.DirDocs(repo_root);
+  if (await safe_exists(pr_dir)) {
+    for (const filename of await fs.readdir(pr_dir)) {
+      pr_templates.push(path.join(pr_dir, filename));
+    }
   }
 
   // check if repo has multiple pr templates
@@ -71,14 +85,20 @@ async function run() {
 
     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>{PR_TEMPLATE.TemplateDir("")}</Brackets>,
-          }}
-        />,
+        <Ink.Box flexDirection="column">
+          {pr_templates.map((filepath) => {
+            const relpath = path.relative(repo_root, filepath);
+            return <Ink.Text key={filepath}>- {relpath}</Ink.Text>;
+          })}
+
+          <FormatText
+            wrapper={<Ink.Text color={colors.yellow} />}
+            message="{count} queryable templates found, but not supported."
+            values={{
+              count: <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>,
+            }}
+          />
+        </Ink.Box>,
       );
     }
 
@@ -91,8 +111,11 @@ const PR_TEMPLATE = Object.freeze({
   Github: (root: string) => path.join(root, ".github", "pull_request_template.md"),
   Root: (root: string) => path.join(root, "pull_request_template.md"),
   Docs: (root: string) => path.join(root, "docs", "pull_request_template.md"),
-  TemplateDir: (root: string) => path.join(root, ".github", "PULL_REQUEST_TEMPLATE"),
+
+  DirDocs: (root: string) => path.join(root, "docs", "PULL_REQUEST_TEMPLATE/"),
+  DirGithub: (root: string) => path.join(root, ".github", "PULL_REQUEST_TEMPLATE/"),
 });
 
 // prettier-ignore
-const PR_TEMPLATE_KEY_LIST = Object.keys(PR_TEMPLATE) as Array<keyof typeof PR_TEMPLATE>;
+//
+const PR_TEMPLATE_KEY_LIST = ["Github", "Root", "Docs"] satisfies Array<keyof typeof PR_TEMPLATE>;

package/src/app/SelectCommitRanges.tsx

@@ -14,49 +14,36 @@ import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 import { wrap_index } from "~/core/wrap_index";
 
-import type { State } from "~/app/Store";
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
 type CommitRangeGroup = NonNullable<Parameters<typeof CommitMetadata.range>[0]>[string];
+type SimpleGroup = { id: string; title: string };
 
 export function SelectCommitRanges() {
-  const commit_range = Store.useState((state) => state.commit_range);
+  const actions = Store.useActions();
 
+  const commit_range = Store.useState((state) => state.commit_range);
   invariant(commit_range, "commit_range must exist");
 
-  return <SelectCommitRangesInternal commit_range={commit_range} />;
-}
-
-type Props = {
-  commit_range: CommitRange;
-};
-
-type CommitRange = NonNullable<State["commit_range"]>;
-type SimpleGroup = { id: string; title: string };
-
-function SelectCommitRangesInternal(props: Props) {
-  const actions = Store.useActions();
-
   const argv = Store.useState((state) => state.argv);
   const branch_name = Store.useState((state) => state.branch_name);
   invariant(branch_name, "branch_name must exist");
 
   const [focused, set_focused] = React.useState("");
+  const [group_input, set_group_input] = React.useState(false);
+  const [pr_select, set_pr_select] = React.useState(false);
+  const is_input_mode = group_input || pr_select;
 
   const [selected_group_id, set_selected_group_id] = React.useState(() => {
-    const first_group = props.commit_range.group_list.find(
-      (g) => g.id !== props.commit_range.UNASSIGNED,
-    );
+    const first_group = commit_range.group_list.find((g) => g.id !== commit_range.UNASSIGNED);
 
     if (first_group) {
       return first_group.id;
     }
 
-    return props.commit_range.UNASSIGNED;
+    return commit_range.UNASSIGNED;
   });
 
-  const [group_input, set_group_input] = React.useState(false);
-
   const [new_group_list, create_group] = React.useReducer(
     (group_list: Array<SimpleGroup>, group: SimpleGroup) => {
       const next_group_list = group_list.concat(group);
@@ -65,6 +52,22 @@ function SelectCommitRangesInternal(props: Props) {
     [],
   );
 
+  const existing_pr_list = Store.useState((state) => {
+    // collect set of groups already represented as prs
+    const existing_group_set = new Set<string>();
+    for (const group of commit_range.group_list) {
+      if (group.pr) {
+        existing_group_set.add(group.pr.headRefName);
+      }
+    }
+    for (const group of new_group_list) {
+      existing_group_set.add(group.id);
+    }
+
+    // exclude existing_group_set from existing state.pr values
+    return Object.values(state.pr).filter((pr) => !existing_group_set.has(pr.headRefName));
+  });
+
   const [group_master_base, set_group_master_base] = React.useReducer(
     (set: Set<string>, group_id: string) => {
       set.has(group_id) ? set.delete(group_id) : set.add(group_id);
@@ -72,7 +75,7 @@ function SelectCommitRangesInternal(props: Props) {
     },
     new Set<string>(),
     (set) => {
-      for (const group of props.commit_range.group_list) {
+      for (const group of commit_range.group_list) {
         if (group.master_base) {
           set.add(group.id);
         }
@@ -91,7 +94,7 @@ function SelectCommitRangesInternal(props: Props) {
     },
     new Map(),
     (map) => {
-      for (const commit of props.commit_range.commit_list) {
+      for (const commit of commit_range.commit_list) {
         map.set(commit.sha, commit.branch_id);
       }
 
@@ -104,8 +107,19 @@ function SelectCommitRangesInternal(props: Props) {
   Ink.useInput((input, key) => {
     const input_lower = input.toLowerCase();
 
-    // do not allow input when inputting group title
-    if (group_input) {
+    // only allow pr select when on unassigned group
+    if (has_unassigned_commits && input_lower === SYMBOL.p) {
+      set_pr_select((v) => !v);
+      return;
+    }
+    // allow cancelling pr select with esc
+    if (pr_select && key.escape) {
+      set_pr_select(false);
+      return;
+    }
+
+    // do not allow input when inputting
+    if (is_input_mode) {
       return;
     }
 
@@ -122,7 +136,7 @@ function SelectCommitRangesInternal(props: Props) {
 
           // handle allow_unassigned case
           if (!id) {
-            id = props.commit_range.UNASSIGNED;
+            id = commit_range.UNASSIGNED;
             const title = "allow_unassigned";
             state_commit_map[sha] = { id, title, master_base: false };
             continue;
@@ -149,7 +163,7 @@ function SelectCommitRangesInternal(props: Props) {
     }
 
     // only allow setting base branch when on a created group
-    if (group.id !== props.commit_range.UNASSIGNED && input_lower === SYMBOL.m) {
+    if (group.id !== commit_range.UNASSIGNED && input_lower === SYMBOL.m) {
       const group = group_list[current_index];
       set_group_master_base(group.id);
       return;
@@ -180,19 +194,19 @@ function SelectCommitRangesInternal(props: Props) {
     }
   }
 
-  if (!props.commit_range.group_list.length) {
+  if (!commit_range.group_list.length) {
     return null;
   }
 
-  const total_group_count = new_group_list.length + props.commit_range.group_list.length;
+  const total_group_count = new_group_list.length + commit_range.group_list.length;
 
-  for (let i = 0; i < props.commit_range.group_list.length; i++) {
-    const index = props.commit_range.group_list.length - i - 1;
-    const group = props.commit_range.group_list[index];
+  for (let i = 0; i < commit_range.group_list.length; i++) {
+    const index = commit_range.group_list.length - i - 1;
+    const group = commit_range.group_list[index];
 
     if (group.pr?.state === "MERGED") continue;
 
-    if (group.id === props.commit_range.UNASSIGNED) {
+    if (group.id === commit_range.UNASSIGNED) {
       // only include unassigned group when there are no other groups
       if (total_group_count === 1) {
         group_list.push({
@@ -226,20 +240,20 @@ function SelectCommitRangesInternal(props: Props) {
   const group = group_list[current_index];
   const is_master_base = group_master_base.has(group.id);
 
-  const multiselect_disabled = group_input;
-  const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
+  const multiselect_disabled = is_input_mode;
+  const multiselect_disableSelect = group.id === commit_range.UNASSIGNED;
 
   const max_width = 80;
-  const has_groups = group.id !== props.commit_range.UNASSIGNED;
+  const has_groups = group.id !== commit_range.UNASSIGNED;
 
-  const items = props.commit_range.commit_list.map((commit) => {
+  const items = commit_range.commit_list.map((commit) => {
     const commit_metadata_id = commit_map.get(commit.sha);
 
     const selected = commit_metadata_id !== null;
 
     let disabled;
 
-    if (group_input) {
+    if (is_input_mode) {
       disabled = true;
     } else if (!has_groups) {
       disabled = true;
@@ -261,7 +275,7 @@ function SelectCommitRangesInternal(props: Props) {
     <Ink.Box flexDirection="column">
       <Ink.Box height={1} />
 
-      {has_groups || group_input ? null : (
+      {has_groups || is_input_mode ? null : (
         <Ink.Box flexDirection="column">
           <Ink.Text bold color={colors.blue}>
             👋 Welcome to <Command>git stack</Command>!
@@ -283,10 +297,28 @@ function SelectCommitRangesInternal(props: Props) {
               }}
             />
           </Ink.Text>
+
+          <Ink.Text color={colors.blue}>
+            <FormatText
+              message="Press {p} to {pick} an existing PR"
+              values={{
+                p: (
+                  <Ink.Text bold color={colors.green}>
+                    p
+                  </Ink.Text>
+                ),
+                pick: (
+                  <Ink.Text bold color={colors.green}>
+                    <Parens>p</Parens>pick
+                  </Ink.Text>
+                ),
+              }}
+            />
+          </Ink.Text>
         </Ink.Box>
       )}
 
-      {!has_groups || group_input ? null : (
+      {!has_groups || is_input_mode ? null : (
         <React.Fragment>
           <Ink.Box width={max_width} flexDirection="row">
             <Ink.Box flexDirection="row">
@@ -320,8 +352,6 @@ function SelectCommitRangesInternal(props: Props) {
 
       {!group_input ? null : (
         <React.Fragment>
-          <Ink.Box height={1} />
-
           <FormatText
             wrapper={<Ink.Text color={colors.gray} />}
             message="Enter a title for the PR {note}"
@@ -329,13 +359,18 @@ function SelectCommitRangesInternal(props: Props) {
               note: (
                 <Parens>
                   <FormatText
-                    message="press {enter} to submit"
+                    message="press {enter} to submit, {esc} to clear"
                     values={{
                       enter: (
                         <Ink.Text bold color={colors.green}>
                           {SYMBOL.enter}
                         </Ink.Text>
                       ),
+                      esc: (
+                        <Ink.Text bold color={colors.green}>
+                          {SYMBOL.esc}
+                        </Ink.Text>
+                      ),
                     }}
                   />
                 </Parens>
@@ -351,6 +386,80 @@ function SelectCommitRangesInternal(props: Props) {
         </React.Fragment>
       )}
 
+      {!pr_select ? null : (
+        <React.Fragment>
+          <FormatText
+            wrapper={<Ink.Text color={colors.gray} />}
+            message="Pick an existing PR {note}"
+            values={{
+              note: (
+                <Parens>
+                  <FormatText
+                    message="press {enter} to select, {esc} to cancel"
+                    values={{
+                      enter: (
+                        <Ink.Text bold color={colors.green}>
+                          {SYMBOL.enter}
+                        </Ink.Text>
+                      ),
+                      esc: (
+                        <Ink.Text bold color={colors.green}>
+                          {SYMBOL.esc}
+                        </Ink.Text>
+                      ),
+                    }}
+                  />
+                </Parens>
+              ),
+            }}
+          />
+
+          <MultiSelect
+            withSelectPreview
+            maxWidth={max_width}
+            startIndex={existing_pr_list.length - 1}
+            onSelect={(args) => {
+              if (args.selected) {
+                const title = args.item.title;
+                const id = args.item.headRefName;
+
+                actions.output(
+                  <FormatText
+                    wrapper={<Ink.Text dimColor />}
+                    message="Selected existing PR {title} {id}"
+                    values={{
+                      title: <Brackets>{title}</Brackets>,
+                      id: <Parens>{id}</Parens>,
+                    }}
+                  />,
+                );
+
+                // console.debug("submit_group_input", { title, id });
+                create_group({ id, title });
+                set_selected_group_id(id);
+                set_pr_select(false);
+              }
+            }}
+            items={existing_pr_list.map((pr) => {
+              return {
+                value: pr,
+                selected: false,
+                disabled: false,
+                label: (
+                  <FormatText
+                    message="{title} {ref}"
+                    values={{
+                      title: <Ink.Text>{pr.title}</Ink.Text>,
+                      ref: <Ink.Text color={colors.gray}>{pr.headRefName}</Ink.Text>,
+                    }}
+                  />
+                ),
+              };
+            })}
+          />
+        </React.Fragment>
+      )}
+
       <Ink.Box height={1} />
 
       <MultiSelect
@@ -396,7 +505,7 @@ function SelectCommitRangesInternal(props: Props) {
             }}
           />
 
-          {group_input ? null : (
+          {is_input_mode ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
               message="Press {c} to {create} a new PR"
@@ -415,6 +524,25 @@ function SelectCommitRangesInternal(props: Props) {
             />
           )}
 
+          {is_input_mode ? null : (
+            <FormatText
+              wrapper={<Ink.Text color={colors.gray} />}
+              message="Press {p} to {pick} an existing PR"
+              values={{
+                p: (
+                  <Ink.Text bold color={colors.green}>
+                    p
+                  </Ink.Text>
+                ),
+                pick: (
+                  <Ink.Text bold color={colors.green}>
+                    <Parens>p</Parens>pick
+                  </Ink.Text>
+                ),
+              }}
+            />
+          )}
+
           {sync_status !== "allow_unassigned" ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
@@ -479,7 +607,7 @@ function SelectCommitRangesInternal(props: Props) {
         />
       </Ink.Box>
 
-      {group.id === props.commit_range.UNASSIGNED ? null : (
+      {group.id === commit_range.UNASSIGNED ? null : (
         <Ink.Box>
           <FormatText
             wrapper={<Ink.Text color={colors.gray} />}
@@ -527,6 +655,8 @@ function SelectCommitRangesInternal(props: Props) {
   }
 
   function detect_sync_status() {
+    invariant(commit_range, "commit_range must exist");
+
     if (!has_unassigned_commits) {
       return "allow";
     }
@@ -537,8 +667,8 @@ function SelectCommitRangesInternal(props: Props) {
 
     let allow_unassigned_sync = null;
 
-    for (let i = 0; i < props.commit_range.commit_list.length; i++) {
-      const commit = props.commit_range.commit_list[i];
+    for (let i = 0; i < commit_range.commit_list.length; i++) {
+      const commit = commit_range.commit_list[i];
       const group_id = commit_map.get(commit.sha);
       // console.debug(commit.sha, group_id);
 
@@ -570,9 +700,11 @@ const SYMBOL = {
   left: "←",
   right: "→",
   enter: "Enter",
+  esc: "Esc",
   c: "c",
   s: "s",
   m: "m",
+  p: "p",
 };
 
 const S_TO_SYNC_VALUES = {

package/src/app/SyncGithub.tsx

@@ -240,8 +240,6 @@ async function run() {
       if (!is_master_base(group)) {
         // ensure base matches pr in github
         await github.pr_edit({ branch: group.id, base: group.base });
-      } else {
-        await github.pr_edit({ branch: group.id });
       }
     } else {
       // create pr in github

package/src/core/github.tsx

@@ -171,6 +171,10 @@ export async function pr_edit(args: EditPullRequestArgs) {
   // const actions = state.actions;
   // actions.debug(`github.pr_edit ${JSON.stringify(args)}`);
 
+  if (!args.base && !args.body) {
+    return;
+  }
+
   const command_parts = [`gh pr edit ${args.branch}`];
 
   if (args.base) {