git-stack-cli 2.5.3 → 2.6.1

package/src/app/SelectCommitRanges.tsx

@@ -3,6 +3,7 @@ import * as React from "react";
 import * as Ink from "ink-cjs";
 
 import { Brackets } from "~/app/Brackets";
+import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
 import { MultiSelect } from "~/app/MultiSelect";
 import { Parens } from "~/app/Parens";
@@ -78,10 +79,13 @@ function SelectCommitRangesInternal(props: Props) {
 
   // detect if there are unassigned commits
   let unassigned_count = 0;
+  let assigned_count = 0;
   for (const [, group_id] of commit_map.entries()) {
     if (group_id === null) {
       // console.debug("unassigned commit detected", sha);
       unassigned_count++;
+    } else {
+      assigned_count++;
     }
   }
 
@@ -118,36 +122,54 @@ function SelectCommitRangesInternal(props: Props) {
     current_index = 0;
   }
 
+  const has_unassigned_commits = unassigned_count > 0;
+  const has_assigned_commits = assigned_count > 0;
+
+  const sync_status = detect_sync_status();
+  // console.debug({ sync_status });
+
   Ink.useInput((input, key) => {
-    const inputLower = input.toLowerCase();
+    const input_lower = input.toLowerCase();
 
-    const hasUnassignedCommits = unassigned_count > 0;
+    if (input_lower === SYMBOL.s) {
+      // do not allow sync when inputting group title
+      if (group_input) {
+        return;
+      }
+
+      if (sync_status === "disabled") {
+        return;
+      }
 
-    if (!hasUnassignedCommits && inputLower === "s") {
       actions.set((state) => {
-        state.commit_map = {};
-
-        for (const [sha, id] of commit_map.entries()) {
-          if (id) {
-            const group = group_list.find((g) => g.id === id);
-            // console.debug({ sha, id, group });
-            if (group) {
-              state.commit_map[sha] = group;
-            }
+        const state_commit_map: Record<string, SimpleGroup> = {};
+
+        for (let [sha, id] of commit_map.entries()) {
+          // console.debug({ sha, id });
+
+          // handle allow_unassigned case
+          if (!id) {
+            id = props.commit_range.UNASSIGNED;
+            const title = "allow_unassigned";
+            state_commit_map[sha] = { id, title };
+            continue;
           }
-        }
 
-        switch (inputLower) {
-          case "s":
-            state.step = "pre-manual-rebase";
-            break;
+          const group = group_list.find((g) => g.id === id);
+          invariant(group, "group must exist");
+          // console.debug({ group });
+          state_commit_map[sha] = group;
         }
+
+        state.commit_map = state_commit_map;
+        state.step = "pre-manual-rebase";
       });
+
       return;
     }
 
     // only allow create when on unassigned group
-    if (hasUnassignedCommits && inputLower === "c") {
+    if (has_unassigned_commits && input_lower === SYMBOL.c) {
       set_group_input(true);
       return;
     }
@@ -170,6 +192,10 @@ function SelectCommitRangesInternal(props: Props) {
   const multiselect_disabled = group_input;
   const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
 
+  const max_width = 80;
+  const [focused, set_focused] = React.useState("");
+  const has_groups = group.id !== props.commit_range.UNASSIGNED;
+
   const items = props.commit_range.commit_list.map((commit) => {
     const commit_metadata_id = commit_map.get(commit.sha);
 
@@ -179,6 +205,8 @@ function SelectCommitRangesInternal(props: Props) {
 
     if (group_input) {
       disabled = true;
+    } else if (!has_groups) {
+      disabled = true;
     } else {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
@@ -193,30 +221,102 @@ function SelectCommitRangesInternal(props: Props) {
 
   items.reverse();
 
-  // <-  (2/4) #742 Title A ->
+  return (
+    <Ink.Box flexDirection="column">
+      <Ink.Box height={1} />
+
+      {has_groups || group_input ? null : (
+        <Ink.Box flexDirection="column">
+          <Ink.Text bold color={colors.blue}>
+            👋 Welcome to <Command>git stack</Command>!
+          </Ink.Text>
+          <Ink.Text color={colors.blue}>
+            <FormatText
+              message="Press {c} to {create} a new PR"
+              values={{
+                c: (
+                  <Ink.Text bold color={colors.green}>
+                    c
+                  </Ink.Text>
+                ),
+                create: (
+                  <Ink.Text bold color={colors.green}>
+                    <Parens>c</Parens>reate
+                  </Ink.Text>
+                ),
+              }}
+            />
+          </Ink.Text>
+        </Ink.Box>
+      )}
 
-  const left_arrow = `${SYMBOL.left} `;
-  const right_arrow = ` ${SYMBOL.right}`;
-  const group_position = `(${current_index + 1}/${group_list.length}) `;
+      {!has_groups || group_input ? null : (
+        <React.Fragment>
+          <Ink.Box width={max_width} flexDirection="row">
+            <Ink.Box flexDirection="row">
+              <Ink.Text bold color={colors.green}>
+                {SYMBOL.left}
+              </Ink.Text>
+              <Ink.Box width={1} />
+              <Ink.Text color={colors.gray}>Pull request</Ink.Text>
+              <Ink.Box width={1} />
+              <Ink.Text color={colors.gray}>
+                {`(${current_index + 1}/${group_list.length})`}
+              </Ink.Text>
+              <Ink.Box width={1} />
+              <Ink.Text bold color={colors.green}>
+                {SYMBOL.right}
+              </Ink.Text>
+            </Ink.Box>
+          </Ink.Box>
+
+          <Ink.Box width={max_width}>
+            <Ink.Text wrap="truncate-end" bold color={colors.white}>
+              {group.title}
+            </Ink.Text>
+          </Ink.Box>
+        </React.Fragment>
+      )}
 
-  const max_group_label_width = 80;
-  let group_title_width = max_group_label_width;
-  group_title_width -= group_position.length;
-  group_title_width -= left_arrow.length + right_arrow.length;
-  group_title_width = Math.min(group.title.length, group_title_width);
+      {!group_input ? null : (
+        <React.Fragment>
+          <Ink.Box height={1} />
 
-  let max_item_width = max_group_label_width;
-  max_item_width -= left_arrow.length + right_arrow.length;
+          <FormatText
+            wrapper={<Ink.Text color={colors.gray} />}
+            message="Enter a title for the PR {note}"
+            values={{
+              note: (
+                <Parens>
+                  <FormatText
+                    message="press {enter} to submit"
+                    values={{
+                      enter: (
+                        <Ink.Text bold color={colors.green}>
+                          {SYMBOL.enter}
+                        </Ink.Text>
+                      ),
+                    }}
+                  />
+                </Parens>
+              ),
+            }}
+          />
 
-  const [focused, set_focused] = React.useState("");
+          <TextInput
+            defaultValue={focused}
+            onSubmit={submit_group_input}
+            onCancel={() => set_group_input(false)}
+          />
+        </React.Fragment>
+      )}
 
-  return (
-    <Ink.Box flexDirection="column">
       <Ink.Box height={1} />
 
       <MultiSelect
+        startIndex={items.length - 1}
         items={items}
-        maxWidth={max_item_width}
+        maxWidth={max_width}
         disabled={multiselect_disabled}
         disableSelect={multiselect_disableSelect}
         onFocus={(args) => {
@@ -242,116 +342,76 @@ function SelectCommitRangesInternal(props: Props) {
 
       <Ink.Box height={1} />
 
-      <Ink.Box width={max_group_label_width} flexDirection="row">
-        <Ink.Text>{left_arrow}</Ink.Text>
-        <Ink.Text>{group_position}</Ink.Text>
-
-        <Ink.Box width={group_title_width} justifyContent="center">
-          <Ink.Text wrap="truncate-end">{group.title}</Ink.Text>
-        </Ink.Box>
-
-        <Ink.Text>{right_arrow}</Ink.Text>
-      </Ink.Box>
-
-      <Ink.Box height={1} />
-
-      {unassigned_count > 0 ? (
-        <FormatText
-          wrapper={<Ink.Text color={colors.gray} />}
-          message="{count} unassigned commits, press {c} to {create} a new group"
-          values={{
-            count: (
-              <Ink.Text color={colors.yellow} bold>
-                {unassigned_count}
-              </Ink.Text>
-            ),
-            c: (
-              <Ink.Text bold color={colors.green}>
-                c
-              </Ink.Text>
-            ),
-            create: (
-              <Ink.Text bold color={colors.green}>
-                <Parens>c</Parens>reate
-              </Ink.Text>
-            ),
-          }}
-        />
-      ) : (
+      {has_unassigned_commits ? (
         <React.Fragment>
-          {argv.sync ? (
+          <FormatText
+            wrapper={<Ink.Text color={colors.gray} />}
+            message="{count} unassigned commits"
+            values={{
+              count: (
+                <Ink.Text color={colors.yellow} bold>
+                  {unassigned_count}
+                </Ink.Text>
+              ),
+            }}
+          />
+
+          {group_input ? null : (
             <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {sync} the commits to Github"
+              wrapper={<Ink.Text color={colors.gray} />}
+              message="Press {c} to {create} a new PR"
               values={{
-                s: (
+                c: (
                   <Ink.Text bold color={colors.green}>
-                    s
+                    c
                   </Ink.Text>
                 ),
-                sync: (
+                create: (
                   <Ink.Text bold color={colors.green}>
-                    <Parens>s</Parens>ync
+                    <Parens>c</Parens>reate
                   </Ink.Text>
                 ),
               }}
             />
-          ) : (
+          )}
+
+          {sync_status !== "allow_unassigned" ? null : (
             <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {save} the commits locally"
+              wrapper={<Ink.Text color={colors.gray} />}
+              message="Press {s} to {sync} the {count} assigned commits to Github"
               values={{
-                s: (
-                  <Ink.Text bold color={colors.green}>
-                    s
-                  </Ink.Text>
-                ),
-                save: (
-                  <Ink.Text bold color={colors.green}>
-                    <Parens>s</Parens>save
+                ...S_TO_SYNC_VALUES,
+                count: (
+                  <Ink.Text color={colors.yellow} bold>
+                    {assigned_count}
                   </Ink.Text>
                 ),
               }}
             />
           )}
         </React.Fragment>
-      )}
-
-      {!group_input ? null : (
+      ) : (
         <React.Fragment>
-          <Ink.Box height={1} />
-
-          <FormatText
-            wrapper={<Ink.Text color={colors.gray} />}
-            message="Enter a title for the PR {note}"
-            values={{
-              note: (
-                <Parens>
-                  <FormatText
-                    message="press {enter} to submit"
-                    values={{
-                      enter: (
-                        <Ink.Text bold color={colors.green}>
-                          {SYMBOL.enter}
-                        </Ink.Text>
-                      ),
-                    }}
-                  />
-                </Parens>
-              ),
-            }}
-          />
-
-          <TextInput defaultValue={focused} onSubmit={submit_group_input} />
-
-          <Ink.Box height={1} />
+          {argv.sync ? (
+            <FormatText
+              wrapper={<Ink.Text />}
+              message="🎉 Done! Press {s} to {sync} the commits to Github"
+              values={S_TO_SYNC_VALUES}
+            />
+          ) : (
+            <FormatText
+              wrapper={<Ink.Text />}
+              message="🎉 Done! Press {s} to {save} the commits locally"
+              values={S_TO_SYNC_VALUES}
+            />
+          )}
         </React.Fragment>
       )}
 
       <Ink.Box>
         <FormatText
           wrapper={<Ink.Text color={colors.gray} />}
-          message="Press {left} and {right} to view PR groups"
+          message="Press {left} and {right} to view PRs"
           values={{
             left: (
               <Ink.Text bold color={colors.green}>
@@ -396,13 +456,14 @@ function SelectCommitRangesInternal(props: Props) {
 
     return `${branch_prefix}${gs_short_id()}`;
   }
+
   function submit_group_input(title: string) {
     const id = get_group_id();
 
     actions.output(
       <FormatText
         wrapper={<Ink.Text dimColor />}
-        message="Created new group {group} {note}"
+        message="Created new PR {group} {note}"
         values={{
           group: <Brackets>{title}</Brackets>,
           note: <Parens>{id}</Parens>,
@@ -415,10 +476,64 @@ function SelectCommitRangesInternal(props: Props) {
     set_selected_group_id(id);
     set_group_input(false);
   }
+
+  function detect_sync_status() {
+    if (!has_unassigned_commits) {
+      return "allow";
+    }
+
+    if (!has_assigned_commits) {
+      return "disabled";
+    }
+
+    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];
+      const group_id = commit_map.get(commit.sha);
+      // console.debug(commit.sha, group_id);
+
+      // before detecting unassigned we are null
+      if (allow_unassigned_sync === null) {
+        if (group_id === null) {
+          // console.debug("allow_unassigned_sync TRUE", { i });
+          allow_unassigned_sync = true;
+        }
+      } else {
+        // after detecting unassigned we assume we can unassigned sync
+        // unless we detect an invariant violation, i.e. commit assigned to group
+        if (group_id) {
+          // console.debug("allow_unassigned_sync FALSE", { i });
+          allow_unassigned_sync = false;
+        }
+      }
+    }
+
+    if (allow_unassigned_sync) {
+      return "allow_unassigned";
+    }
+
+    return "disabled";
+  }
 }
 
 const SYMBOL = {
   left: "←",
   right: "→",
   enter: "Enter",
+  c: "c",
+  s: "s",
+};
+
+const S_TO_SYNC_VALUES = {
+  s: (
+    <Ink.Text bold color={colors.green}>
+      s
+    </Ink.Text>
+  ),
+  sync: (
+    <Ink.Text bold color={colors.green}>
+      <Parens>s</Parens>ync
+    </Ink.Text>
+  ),
 };

package/src/app/Status.tsx

@@ -42,11 +42,7 @@ async function run() {
     Store.setState((state) => {
       state.step = "pre-local-merge-rebase";
     });
-  } else if (needs_update) {
-    Store.setState((state) => {
-      state.step = "pre-select-commit-ranges";
-    });
-  } else if (argv.force) {
+  } else if (needs_update || argv.force) {
     Store.setState((state) => {
       state.step = "select-commit-ranges";
     });

package/src/app/Store.tsx

@@ -51,6 +51,7 @@ export type State = {
   master_branch: string;
   head: null | string;
   branch_name: null | string;
+  merge_base: null | string;
   commit_range: null | CommitMetadata.CommitRange;
   commit_map: null | CommitMap;
   pr_templates: Array<string>;
@@ -66,7 +67,6 @@ export type State = {
     | "status"
     | "pre-local-merge-rebase"
     | "local-merge-rebase"
-    | "pre-select-commit-ranges"
     | "select-commit-ranges"
     | "pre-manual-rebase"
     | "manual-rebase"
@@ -122,6 +122,7 @@ const BaseStore = createStore<State>()(
     master_branch: "origin/master",
     head: null,
     branch_name: null,
+    merge_base: null,
     commit_range: null,
     commit_map: null,
     pr_templates: [],

package/src/app/SyncGithub.tsx

@@ -42,6 +42,9 @@ async function run() {
 
   const push_group_list = get_push_group_list();
 
+  // console.debug({ push_group_list });
+  // throw new Error("STOP");
+
   // for all push targets in push_group_list
   // things that can be done in parallel are grouped by numbers
   //
@@ -92,7 +95,7 @@ async function run() {
 
     await cli(git_push_command);
 
-    const pr_url_list = commit_range.group_list.map(get_group_url);
+    const pr_url_list = push_group_list.map(get_group_url);
 
     const after_push_tasks = [];
     for (const group of push_group_list) {
@@ -105,8 +108,8 @@ async function run() {
     // this step must come after the after_push since that step may create new PRs
     // we need the urls for all prs at this step so we run it after the after_push
     const update_pr_body_tasks = [];
-    for (let i = 0; i < commit_range.group_list.length; i++) {
-      const group = commit_range.group_list[i];
+    for (let i = 0; i < push_group_list.length; i++) {
+      const group = push_group_list[i];
 
       // use the updated pr_url_list to get the actual selected_url
       const selected_url = pr_url_list[i];
@@ -149,7 +152,9 @@ async function run() {
 
       const group = commit_range.group_list[index];
 
-      push_group_list.unshift(group);
+      if (group.id !== commit_range.UNASSIGNED) {
+        push_group_list.unshift(group);
+      }
     }
 
     return push_group_list;

package/src/app/TextInput.tsx

@@ -10,6 +10,7 @@ type Props = {
   value?: string;
   onChange?: (value: string) => void;
   onSubmit?: (value: string) => void;
+  onCancel?: () => void;
 };
 
 export function TextInput(props: Props) {
@@ -44,7 +45,13 @@ export function TextInput(props: Props) {
 
     // console.debug("[useInput]", { input, key });
 
-    if (key.backspace || key.delete) {
+    if (key.escape) {
+      if (value === "") {
+        props.onCancel?.();
+      } else {
+        next_value = "";
+      }
+    } else if (key.backspace || key.delete) {
       next_value = value.slice(0, -1);
     } else if (key.return) {
       props.onSubmit?.(next_value);

package/src/commands/Rebase.tsx

@@ -22,7 +22,7 @@ type Props = {
 export function Rebase(props: Props) {
   return (
     <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
+      fallback={<Ink.Text color={colors.yellow}>Rebasing…</Ink.Text>}
       function={() => Rebase.run(props)}
     />
   );
@@ -48,6 +48,7 @@ Rebase.run = async function run(props: Props) {
     return 19;
   });
 
+  const master_branch_name = master_branch.replace(/^origin\//, "");
   const temp_branch_name = `${branch_name}_${short_id()}`;
 
   try {
@@ -58,9 +59,56 @@ Rebase.run = async function run(props: Props) {
     await cli(`pwd`);
 
     // fetch origin master branch for latest sha
-    const master_branch_name = master_branch.replace(/^origin\//, "");
     await cli(`git fetch --no-tags -v origin ${master_branch_name}`);
 
+    if (branch_name === master_branch_name) {
+      await rebase_master();
+    } else {
+      await rebase_branch();
+    }
+
+    actions.unregister_abort_handler();
+  } catch (err) {
+    actions.error("Unable to rebase.");
+
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+
+    actions.exit(20);
+  }
+
+  const next_commit_range = await CommitMetadata.range();
+
+  actions.output(
+    <FormatText
+      wrapper={<Ink.Text color={colors.green} />}
+      message="✅ {branch_name} in sync with {origin_branch}"
+      values={{
+        branch_name: <Brackets>{branch_name}</Brackets>,
+        origin_branch: <Brackets>{master_branch}</Brackets>,
+      }}
+    />,
+  );
+
+  actions.set((state) => {
+    state.commit_range = next_commit_range;
+  });
+
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(<Status />);
+    actions.exit(0);
+  }
+
+  async function rebase_master() {
+    await cli(`git switch -C "${master_branch_name}" "${master_branch}"`);
+  }
+
+  async function rebase_branch() {
+    invariant(commit_range, "commit_range must exist");
+
     const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
     const rebase_merge_base = master_sha;
 
@@ -120,40 +168,6 @@ Rebase.run = async function run(props: Props) {
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
 
     restore_git();
-
-    actions.unregister_abort_handler();
-  } catch (err) {
-    actions.error("Unable to rebase.");
-
-    if (err instanceof Error) {
-      actions.error(err.message);
-    }
-
-    actions.exit(20);
-  }
-
-  const next_commit_range = await CommitMetadata.range();
-
-  actions.output(
-    <FormatText
-      wrapper={<Ink.Text color={colors.green} />}
-      message="✅ {branch_name} in sync with {origin_branch}"
-      values={{
-        branch_name: <Brackets>{branch_name}</Brackets>,
-        origin_branch: <Brackets>{master_branch}</Brackets>,
-      }}
-    />,
-  );
-
-  actions.set((state) => {
-    state.commit_range = next_commit_range;
-  });
-
-  if (props.onComplete) {
-    props.onComplete();
-  } else {
-    actions.output(<Status />);
-    actions.exit(0);
   }
 
   // cleanup git operations if cancelled during manual rebase