git-stack-cli 2.9.5 → 2.9.7

package/package.json

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

package/src/app/ManualRebase.tsx

@@ -147,6 +147,7 @@ async function run() {
     // always hard reset and clean to allow subsequent checkout
     // if there are files checkout will fail and cascade fail subsequent commands
     cli.sync(`git reset --hard`, spawn_options);
+    cli.sync(`git cherry-pick --abort`, spawn_options);
     cli.sync(`git clean -fd`, spawn_options);
 
     // always put self back in original branch

package/src/app/MultiSelect.tsx

@@ -92,6 +92,7 @@ export function MultiSelect<T>(props: Props<T>) {
   React.useEffect(ensure_selectable_focus, [props.items]);
   function ensure_selectable_focus() {
     const current = props.items[index];
+
     if (current && !current.disabled) {
       return;
     }
@@ -115,6 +116,11 @@ export function MultiSelect<T>(props: Props<T>) {
       return;
     }
 
+    // prevent accessing `.value` of undefined item
+    if (!props.items[index]) {
+      return;
+    }
+
     const item = props.items[index].value;
     const selected_list = Array.from(selected_set);
     const selected = selected_set.has(index);
@@ -125,6 +131,11 @@ export function MultiSelect<T>(props: Props<T>) {
   }, [selected_set]);
 
   React.useEffect(() => {
+    // prevent accessing `.value` of undefined item
+    if (!props.items[index]) {
+      return;
+    }
+
     const item = props.items[index].value;
     const selected_list = Array.from(selected_set);
     const selected = selected_set.has(index);

package/src/app/SelectCommitRanges.tsx

@@ -107,18 +107,24 @@ export function SelectCommitRanges() {
   Ink.useInput((input, key) => {
     const input_lower = input.toLowerCase();
 
-    // 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
+    // only allow pr select when…
+    // 1. we have unassigned commits
+    // 2. not inputting group
+    // 3. at least one existing prs exists
+    if (has_unassigned_commits && !group_input && existing_pr_list.length > 0) {
+      if (input_lower === SYMBOL.p) {
+        set_pr_select((v) => !v);
+        return;
+      }
+    }
+
+    // disable key handlers below when inputting
     if (is_input_mode) {
       return;
     }
@@ -298,23 +304,25 @@ export function SelectCommitRanges() {
             />
           </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>
+          {existing_pr_list.length === 0 ? null : (
+            <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>
       )}
 
@@ -386,7 +394,7 @@ export function SelectCommitRanges() {
         </React.Fragment>
       )}
 
-      {!pr_select ? null : (
+      {!pr_select || !existing_pr_list.length ? null : (
         <React.Fragment>
           <FormatText
             wrapper={<Ink.Text color={colors.gray} />}
@@ -460,6 +468,8 @@ export function SelectCommitRanges() {
         </React.Fragment>
       )}
 
+      {is_input_mode ? null : <React.Fragment></React.Fragment>}
+
       <Ink.Box height={1} />
 
       <MultiSelect
@@ -489,143 +499,139 @@ export function SelectCommitRanges() {
         }}
       />
 
-      <Ink.Box height={1} />
-
-      {has_unassigned_commits ? (
+      {is_input_mode ? null : (
         <React.Fragment>
+          <Ink.Box height={1} />
+
+          {has_unassigned_commits ? (
+            <React.Fragment>
+              <FormatText
+                wrapper={<Ink.Text color={colors.gray} />}
+                message="{count} unassigned commits"
+                values={{
+                  count: (
+                    <Ink.Text color={colors.yellow} bold>
+                      {unassigned_count}
+                    </Ink.Text>
+                  ),
+                }}
+              />
+
+              <FormatText
+                wrapper={<Ink.Text color={colors.gray} />}
+                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>
+                  ),
+                }}
+              />
+
+              {existing_pr_list.length === 0 ? 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} />}
+                  message={
+                    argv.sync
+                      ? "Press {s} to {sync} the {count} assigned commits to Github"
+                      : "Press {s} to {sync} the {count} assigned commits locally"
+                  }
+                  values={{
+                    ...S_TO_SYNC_VALUES,
+                    count: (
+                      <Ink.Text color={colors.yellow} bold>
+                        {assigned_count}
+                      </Ink.Text>
+                    ),
+                  }}
+                />
+              )}
+            </React.Fragment>
+          ) : (
+            <FormatText
+              wrapper={<Ink.Text color={colors.blue} />}
+              message={
+                argv.sync
+                  ? "🎉 Done! Press {s} to {sync} the PRs to Github"
+                  : "🎉 Done! Press {s} to {sync} the PRs locally"
+              }
+              values={S_TO_SYNC_VALUES}
+            />
+          )}
+
           <FormatText
             wrapper={<Ink.Text color={colors.gray} />}
-            message="{count} unassigned commits"
+            message="Press {left} and {right} to view PRs"
             values={{
-              count: (
-                <Ink.Text color={colors.yellow} bold>
-                  {unassigned_count}
+              left: (
+                <Ink.Text bold color={colors.green}>
+                  {SYMBOL.left}
+                </Ink.Text>
+              ),
+              right: (
+                <Ink.Text bold color={colors.green}>
+                  {SYMBOL.right}
                 </Ink.Text>
               ),
             }}
           />
 
-          {is_input_mode ? null : (
-            <FormatText
-              wrapper={<Ink.Text color={colors.gray} />}
-              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>
-                ),
-              }}
-            />
-          )}
-
-          {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>
-                ),
-              }}
-            />
-          )}
+          <FormatText
+            wrapper={<Ink.Text color={colors.gray} />}
+            message="Press {enter} to toggle commit selection"
+            values={{
+              enter: (
+                <Ink.Text bold color={colors.green}>
+                  {SYMBOL.enter}
+                </Ink.Text>
+              ),
+            }}
+          />
 
-          {sync_status !== "allow_unassigned" ? null : (
+          {group.id === commit_range.UNASSIGNED ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
               message={
-                argv.sync
-                  ? "Press {s} to {sync} the {count} assigned commits to Github"
-                  : "Press {s} to {sync} the {count} assigned commits locally"
+                is_master_base
+                  ? "Press {m} to {reset} current PR base to stack position"
+                  : "Press {m} to set current PR base to master"
               }
               values={{
-                ...S_TO_SYNC_VALUES,
-                count: (
-                  <Ink.Text color={colors.yellow} bold>
-                    {assigned_count}
+                m: (
+                  <Ink.Text bold color={colors.green}>
+                    {SYMBOL.m}
                   </Ink.Text>
                 ),
+                reset: <Ink.Text color={colors.yellow}>reset</Ink.Text>,
               }}
             />
           )}
         </React.Fragment>
-      ) : (
-        <FormatText
-          wrapper={<Ink.Text />}
-          message={
-            argv.sync
-              ? "🎉 Done! Press {s} to {sync} the PRs to Github"
-              : "🎉 Done! Press {s} to {sync} the PRs locally"
-          }
-          values={S_TO_SYNC_VALUES}
-        />
-      )}
-
-      <Ink.Box>
-        <FormatText
-          wrapper={<Ink.Text color={colors.gray} />}
-          message="Press {left} and {right} to view PRs"
-          values={{
-            left: (
-              <Ink.Text bold color={colors.green}>
-                {SYMBOL.left}
-              </Ink.Text>
-            ),
-            right: (
-              <Ink.Text bold color={colors.green}>
-                {SYMBOL.right}
-              </Ink.Text>
-            ),
-          }}
-        />
-      </Ink.Box>
-
-      <Ink.Box>
-        <FormatText
-          wrapper={<Ink.Text color={colors.gray} />}
-          message="Press {enter} to toggle commit selection"
-          values={{
-            enter: (
-              <Ink.Text bold color={colors.green}>
-                {SYMBOL.enter}
-              </Ink.Text>
-            ),
-          }}
-        />
-      </Ink.Box>
-
-      {group.id === commit_range.UNASSIGNED ? null : (
-        <Ink.Box>
-          <FormatText
-            wrapper={<Ink.Text color={colors.gray} />}
-            message={
-              is_master_base
-                ? "Press {m} to {reset} current PR base to stack position"
-                : "Press {m} to set current PR base to master"
-            }
-            values={{
-              m: (
-                <Ink.Text bold color={colors.green}>
-                  {SYMBOL.m}
-                </Ink.Text>
-              ),
-              reset: <Ink.Text color={colors.yellow}>reset</Ink.Text>,
-            }}
-          />
-        </Ink.Box>
       )}
     </Ink.Box>
   );

package/src/commands/Rebase.tsx

@@ -184,6 +184,7 @@ Rebase.run = async function run(props: Props) {
     // always hard reset and clean to allow subsequent checkout
     // if there are files checkout will fail and cascade fail subsequent commands
     cli.sync(`git reset --hard`, spawn_options);
+    cli.sync(`git cherry-pick --abort`, spawn_options);
     cli.sync(`git clean -fd`, spawn_options);
 
     // always put self back in original branch

package/src/core/CommitMetadata.ts

@@ -260,14 +260,21 @@ export async function range(commit_group_map?: CommitGroupMap) {
         const all_commits: Array<git.Commit> = [];
         const previous_groups = group_value_list.slice(0, i);
         for (const g of previous_groups) {
+          actions.debug(`  BOUNDARY_COMMIT group=${g.title}`);
+
           for (const c of g.commits) {
+            actions.debug(`  BOUNDARY_COMMIT   commit=${c.subject_line}`);
             all_commits.push(c);
           }
         }
         for (const c of group.commits) {
+          actions.debug(`  BOUNDARY_COMMIT commit=${c.subject_line}`);
           all_commits.push(c);
         }
 
+        actions.debug(`  BOUNDARY_COMMIT group.pr.commits.length=${group.pr.commits.length}`);
+        actions.debug(`  BOUNDARY_COMMIT all_commits=${all_commits.length}`);
+
         // compare all commits against pr commits
         if (group.pr.commits.length !== all_commits.length) {
           actions.debug("  BOUNDARY_COMMIT_LENGTH_MISMATCH");