git-stack-cli 2.5.3 → 2.6.1

package/src/components/ColorTest.tsx

@@ -0,0 +1,49 @@
+import * as React from "react";
+
+import { colors } from "~/core/colors";
+
+type RenderOptions = {
+  color: string;
+  name: string;
+};
+
+type Props = {
+  children: (render_options: RenderOptions) => React.ReactNode;
+};
+
+export function ColorTest(props: Props) {
+  return (
+    <React.Fragment>
+      {Object.entries(colors).map(([key, color]) => {
+        const name = `colors:${key}`;
+        return props.children({ color, name });
+      })}
+
+      {INK_COLORS.map((color) => {
+        const name = `ink:${color}`;
+        return props.children({ color, name });
+      })}
+    </React.Fragment>
+  );
+}
+
+// ForegroundColor
+// https://github.com/magus/git-stack-cli/blob/master/node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.d.ts#L75
+const INK_COLORS = [
+  "black",
+  "red",
+  "green",
+  "yellow",
+  "blue",
+  "cyan",
+  "magenta",
+  "white",
+  "blackBright",
+  "redBright",
+  "greenBright",
+  "yellowBright",
+  "blueBright",
+  "cyanBright",
+  "magentaBright",
+  "whiteBright",
+];

package/src/core/CommitMetadata.ts

@@ -39,6 +39,8 @@ export async function range(commit_group_map?: CommitGroupMap) {
     let id = commit.branch_id;
     let title = commit.title || id;
 
+    // console.debug({ commit, id });
+
     // use commit map if provided (via select commit ranges)
     if (commit_group_map) {
       const group = commit_group_map[commit.sha];
@@ -50,7 +52,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
     }
 
     if (!id) {
-      // console.debug("INVALID", "MISSING ID", commit.message);
+      // console.debug("INVALID", "MISSING ID");
       invalid = true;
     }
 
@@ -61,13 +63,12 @@ export async function range(commit_group_map?: CommitGroupMap) {
       if (group_map.has(id) && last_key !== id) {
         // if we've seen this id before and it's not
         // the last added key then we are out of order
-        // console.debug("INVALID", "OUT OF ORDER", commit.message, id);
+        // console.debug("INVALID", "OUT OF ORDER");
         invalid = true;
       }
     } else {
-      // console.debug("INVALID", "NEW COMMIT", { commit });
+      // console.debug("INVALID", "NEW COMMIT");
       invalid = true;
-
       id = UNASSIGNED;
     }
 
@@ -231,4 +232,4 @@ function lines(value: string) {
   return value.split("\n");
 }
 
-const UNASSIGNED = "unassigned";
+export const UNASSIGNED = "unassigned";

package/src/core/GitReviseTodo.test.ts

@@ -75,6 +75,59 @@ test("git-revise-todo handles double quotes in commit message", () => {
   );
 });
 
+test("git-revise-todo from commit range with single new commit", () => {
+  const rebase_group_index = 0;
+  const commit_range = SYNC_WITH_UNASSIGNED;
+
+  const git_revise_todo = GitReviseTodo({ rebase_group_index, commit_range });
+
+  const expected = [
+    "++ pick 55771391b49e",
+    "head~7",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick 391476bbfc6b",
+    "head~6",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick 5a98cf8f0406",
+    "head~5",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick e820018cb370",
+    "head~4",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick e6d1dfc7ec00",
+    "head~3",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick a26f21025a55",
+    "head~2",
+    "",
+    "git-stack-id: gs---4gvxa-5v-2mx26",
+    "git-stack-title: pr-title",
+    "",
+    "++ pick 90667fe97e05",
+    "head~1",
+    "",
+    "++ pick b61c5b09a4b7",
+    "head",
+  ].join("\n");
+
+  expect(git_revise_todo).toBe(expected);
+});
+
 const SINGLE_COMMIT_EXISTING_GROUP: CommitMetadata.CommitRange = {
   invalid: false,
   group_list: [
@@ -654,3 +707,145 @@ const COMMIT_MESSAGE_WITH_QUOTES: CommitMetadata.CommitRange = {
   pr_lookup: {},
   UNASSIGNED: "unassigned",
 };
+
+// capture via `throw new Error` in `ManualRebase`
+// doc-link capture-git-revise-todo
+const SYNC_WITH_UNASSIGNED: CommitMetadata.CommitRange = {
+  invalid: false,
+  group_list: [
+    {
+      id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+      pr: null,
+      base: "master",
+      dirty: true,
+      commits: [
+        {
+          sha: "55771391b49e301f51b22cbc2b745e8d3e4a357a",
+          full_message: "head~7",
+          subject_line: "head~7",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+        {
+          sha: "391476bbfc6b77b60a3ef7fa97155496a9f8f27f",
+          full_message: "head~6",
+          subject_line: "head~6",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+        {
+          sha: "5a98cf8f0406712405d41af07c3a012f72ad36fa",
+          full_message: "head~5",
+          subject_line: "head~5",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+        {
+          sha: "e820018cb370bb6cda118dc649e841c75d797188",
+          full_message: "head~4",
+          subject_line: "head~4",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+        {
+          sha: "e6d1dfc7ec007468712bfc015884cc22bfa79e1d",
+          full_message: "head~3",
+          subject_line: "head~3",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+        {
+          sha: "a26f21025a558968554c439ab9b942d5fe84bccb",
+          full_message: "head~2",
+          subject_line: "head~2",
+          branch_id: "gs---4gvxa-5v-2mx26",
+          title: "pr-title",
+        },
+      ],
+    },
+    {
+      id: "unassigned",
+      title: "allow_unassigned",
+      pr: null,
+      base: null,
+      dirty: true,
+      commits: [
+        {
+          sha: "90667fe97e059e8285e070d6268f2b4035b2ebd4",
+          full_message: "head~1",
+          subject_line: "head~1",
+          branch_id: "unassigned",
+          title: "allow_unassigned",
+        },
+        {
+          sha: "b61c5b09a4b7c9dcff9a9071386b134997569a01",
+          full_message: "head",
+          subject_line: "head",
+          branch_id: "unassigned",
+          title: "allow_unassigned",
+        },
+      ],
+    },
+  ],
+  commit_list: [
+    {
+      sha: "55771391b49e301f51b22cbc2b745e8d3e4a357a",
+      full_message: "head~7",
+      subject_line: "head~7",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "391476bbfc6b77b60a3ef7fa97155496a9f8f27f",
+      full_message: "head~6",
+      subject_line: "head~6",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "5a98cf8f0406712405d41af07c3a012f72ad36fa",
+      full_message: "head~5",
+      subject_line: "head~5",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "e820018cb370bb6cda118dc649e841c75d797188",
+      full_message: "head~4",
+      subject_line: "head~4",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "e6d1dfc7ec007468712bfc015884cc22bfa79e1d",
+      full_message: "head~3",
+      subject_line: "head~3",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "a26f21025a558968554c439ab9b942d5fe84bccb",
+      full_message: "head~2",
+      subject_line: "head~2",
+      branch_id: "gs---4gvxa-5v-2mx26",
+      title: "pr-title",
+    },
+    {
+      sha: "90667fe97e059e8285e070d6268f2b4035b2ebd4",
+      full_message: "head~1",
+      subject_line: "head~1",
+      branch_id: "unassigned",
+      title: "allow_unassigned",
+    },
+    {
+      sha: "b61c5b09a4b7c9dcff9a9071386b134997569a01",
+      full_message: "head",
+      subject_line: "head",
+      branch_id: "unassigned",
+      title: "allow_unassigned",
+    },
+  ],
+  pr_lookup: {},
+  UNASSIGNED: "unassigned",
+};

package/src/core/GitReviseTodo.ts

@@ -2,14 +2,13 @@ import fs from "node:fs/promises";
 import path from "node:path";
 
 import { Store } from "~/app/Store";
+import * as CommitMetadata from "~/core/CommitMetadata";
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
 import { get_tmp_dir } from "~/core/get_tmp_dir";
 import { invariant } from "~/core/invariant";
 import { safe_rm } from "~/core/safe_rm";
 
-import type * as CommitMetadata from "~/core/CommitMetadata";
-
 // https://git-revise.readthedocs.io/en/latest/man.html#interactive-mode
 //
 // # Interactive Revise Todos(4 commands)
@@ -58,6 +57,7 @@ export function GitReviseTodo(args: Args): string {
   const commit_list = [];
 
   const group_list = args.commit_range.group_list;
+  // console.debug({ group_list });
 
   for (let i = args.rebase_group_index; i < group_list.length; i++) {
     const group = group_list[i];
@@ -67,6 +67,7 @@ export function GitReviseTodo(args: Args): string {
     }
   }
 
+  // console.debug({ commit_list });
   const todo = GitReviseTodo.todo({ commit_list });
   return todo;
 }
@@ -79,26 +80,28 @@ GitReviseTodo.todo = function todo(args: CommitListArgs) {
   const entry_list = [];
 
   for (const commit of args.commit_list) {
-    // update git commit message with stack id
-    const id = commit.branch_id;
-    const title = commit.title;
-
-    invariant(id, "commit.branch_id must exist");
-    invariant(title, "commit.title must exist");
-
-    const metadata = { id, title };
-
-    const unsafe_message_with_id = Metadata.write(commit.full_message, metadata);
-
-    let message_with_id = unsafe_message_with_id;
-
     // get first 12 characters of commit sha
     const sha = commit.sha.slice(0, 12);
 
     // generate git revise entry
-    const entry_lines = [`++ pick ${sha}`, message_with_id];
-    const entry = entry_lines.join("\n");
+    const entry_lines = [`++ pick ${sha}`];
 
+    // update git commit message with stack id
+    const id = commit.branch_id;
+    if (id == null || id === CommitMetadata.UNASSIGNED) {
+      entry_lines.push(commit.full_message);
+    } else {
+      // console.debug({ commit });
+      const title = commit.title;
+      invariant(title, "commit.title must exist");
+
+      const metadata = { id, title };
+      const unsafe_message_with_id = Metadata.write(commit.full_message, metadata);
+      const message_with_id = unsafe_message_with_id;
+      entry_lines.push(message_with_id);
+    }
+
+    const entry = entry_lines.join("\n");
     entry_list.push(entry);
   }
 

package/src/core/cli.ts

@@ -7,6 +7,7 @@ type SpawnOptions = Parameters<typeof child.spawn>[2];
 
 type Options = SpawnOptions & {
   ignoreExitCode?: boolean;
+  onOutput?: (data: string) => void;
 };
 
 type Return = {
@@ -51,6 +52,7 @@ export async function cli(
     function write_output(value: string) {
       output += value;
       state.actions.debug(value, id);
+      options.onOutput?.(value);
     }
 
     childProcess.stdout?.on("data", (data: Buffer) => {

package/src/core/colors.ts

@@ -1,7 +1,7 @@
 // ink uses chalk internally
 // https://github.com/vadimdemedes/ink#color
 
-export const colors = {
+export const colors = Object.freeze({
   red: "rgb(248, 81, 73)",
   // red-emphasis rgb(218, 54, 51)
 
@@ -20,4 +20,6 @@ export const colors = {
   gray: "rgb(110, 118, 129)",
 
   lightGray: "rgb(125, 133, 144)",
-};
+
+  white: "whiteBright",
+});

package/src/app/PreSelectCommitRanges.tsx

@@ -1,29 +0,0 @@
-import * as React from "react";
-
-import { Store } from "~/app/Store";
-import { YesNoPrompt } from "~/app/YesNoPrompt";
-
-export function PreSelectCommitRanges() {
-  const actions = Store.useActions();
-  const argv = Store.useState((state) => state.argv);
-
-  React.useEffect(() => {
-    if (argv.force) {
-      Store.setState((state) => {
-        state.step = "select-commit-ranges";
-      });
-    }
-  }, [argv]);
-
-  return (
-    <YesNoPrompt
-      message="Some commits are new or outdated, would you like to select new commit ranges?"
-      onYes={() => {
-        actions.set((state) => {
-          state.step = "select-commit-ranges";
-        });
-      }}
-      onNo={() => actions.exit(0)}
-    />
-  );
-}