git-stack-cli 0.8.2 → 0.8.4

package/dist/__fixtures__/metadata.json

@@ -0,0 +1,186 @@
+{
+    "head": "cc09b96b823d9dde77188e675d3090be7c1d625a",
+    "merge_base": "9528176b12abf81c779bc5244afc7d760f6fa422",
+    "branch_name": "dev/noah/a-test",
+    "commit_range": {
+        "invalid": true,
+        "group_map": {},
+        "commit_list": [
+            {
+                "sha": "a28f1ef080b56b56699bc420b200968e793702a9",
+                "message": "more remove",
+                "raw_message": "more remove\n\ngit-multi-diff-id: 14e097a1-fa9b-45af-8f7d-b77df9d91fe6",
+                "pr": {
+                    "baseRefName": "master",
+                    "commits": [
+                        {
+                            "authoredDate": "2023-10-22T23:13:20Z",
+                            "authors": [
+                                {
+                                    "email": "noah@iamnoah.com",
+                                    "id": "MDQ6VXNlcjI5MDA4NA==",
+                                    "login": "magus",
+                                    "name": "magus"
+                                }
+                            ],
+                            "committedDate": "2023-10-28T19:16:29Z",
+                            "messageBody": "git-multi-diff-id: 14e097a1-fa9b-45af-8f7d-b77df9d91fe6",
+                            "messageHeadline": "more remove",
+                            "oid": "a28f1ef080b56b56699bc420b200968e793702a9"
+                        }
+                    ],
+                    "headRefName": "14e097a1-fa9b-45af-8f7d-b77df9d91fe6",
+                    "number": 28,
+                    "state": "OPEN",
+                    "title": "more remove",
+                    "url": "https://github.com/magus/git-multi-diff-playground/pull/28"
+                },
+                "metadata": {
+                    "id": "14e097a1-fa9b-45af-8f7d-b77df9d91fe6"
+                }
+            },
+            {
+                "sha": "7454ce81940f2a0964ff06c7a98c7fa1892f82bf",
+                "message": "remove num",
+                "raw_message": "remove num\n\ngit-multi-diff-id: 3d1d890d-11c9-4569-83c3-e3aff6426e37",
+                "pr": {
+                    "baseRefName": "14e097a1-fa9b-45af-8f7d-b77df9d91fe6",
+                    "commits": [
+                        {
+                            "authoredDate": "2023-10-22T23:13:14Z",
+                            "authors": [
+                                {
+                                    "email": "noah@iamnoah.com",
+                                    "id": "MDQ6VXNlcjI5MDA4NA==",
+                                    "login": "magus",
+                                    "name": "magus"
+                                }
+                            ],
+                            "committedDate": "2023-10-28T19:16:33Z",
+                            "messageBody": "git-multi-diff-id: 3d1d890d-11c9-4569-83c3-e3aff6426e37",
+                            "messageHeadline": "remove num",
+                            "oid": "7454ce81940f2a0964ff06c7a98c7fa1892f82bf"
+                        }
+                    ],
+                    "headRefName": "3d1d890d-11c9-4569-83c3-e3aff6426e37",
+                    "number": 27,
+                    "state": "OPEN",
+                    "title": "remove num",
+                    "url": "https://github.com/magus/git-multi-diff-playground/pull/27"
+                },
+                "metadata": {
+                    "id": "3d1d890d-11c9-4569-83c3-e3aff6426e37"
+                }
+            },
+            {
+                "sha": "a339f9cc4d8c10b691fef2c2425bf4a67c8c70f0",
+                "message": "strawberry",
+                "raw_message": "strawberry\n\ngit-multi-diff-id: 53d15f9a-2451-492c-a831-642d41ad3ef4",
+                "pr": {
+                    "baseRefName": "3d1d890d-11c9-4569-83c3-e3aff6426e37",
+                    "commits": [
+                        {
+                            "authoredDate": "2023-10-25T09:29:30Z",
+                            "authors": [
+                                {
+                                    "email": "noah@iamnoah.com",
+                                    "id": "MDQ6VXNlcjI5MDA4NA==",
+                                    "login": "magus",
+                                    "name": "magus"
+                                }
+                            ],
+                            "committedDate": "2023-10-28T19:16:37Z",
+                            "messageBody": "git-multi-diff-id: 53d15f9a-2451-492c-a831-642d41ad3ef4",
+                            "messageHeadline": "strawberry",
+                            "oid": "a339f9cc4d8c10b691fef2c2425bf4a67c8c70f0"
+                        }
+                    ],
+                    "headRefName": "53d15f9a-2451-492c-a831-642d41ad3ef4",
+                    "number": 30,
+                    "state": "OPEN",
+                    "title": "strawberry",
+                    "url": "https://github.com/magus/git-multi-diff-playground/pull/30"
+                },
+                "metadata": {
+                    "id": "53d15f9a-2451-492c-a831-642d41ad3ef4"
+                }
+            },
+            {
+                "sha": "24fa3301563d40b42f698bff92b8a805412a4a69",
+                "message": "orange color",
+                "raw_message": "orange color",
+                "pr": null,
+                "metadata": {
+                    "id": null
+                }
+            },
+            {
+                "sha": "dea1b85bdbcec0b27f1c5b2cc675e47fd9f51005",
+                "message": "cantaloupe",
+                "raw_message": "cantaloupe\nline2 changed\nline3 'abc'\nline4\nline5 \"hello world\"\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\ngit-multi-diff-id: 398c0ead-77ad-41a4-af6e-280f99998c28",
+                "pr": {
+                    "baseRefName": "53d15f9a-2451-492c-a831-642d41ad3ef4",
+                    "commits": [
+                        {
+                            "authoredDate": "2023-10-22T23:13:35Z",
+                            "authors": [
+                                {
+                                    "email": "noah@iamnoah.com",
+                                    "id": "MDQ6VXNlcjI5MDA4NA==",
+                                    "login": "magus",
+                                    "name": "magus"
+                                }
+                            ],
+                            "committedDate": "2023-10-28T19:16:40Z",
+                            "messageBody": "line2 changed\nline3 'abc'\nline4\nline5 \"hello world\"\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\ngit-multi-diff-id: 398c0ead-77ad-41a4-af6e-280f99998c28",
+                            "messageHeadline": "cantaloupe",
+                            "oid": "86d0b3cf5dcbd94963f2839818734c3b0e13d2fc"
+                        }
+                    ],
+                    "headRefName": "398c0ead-77ad-41a4-af6e-280f99998c28",
+                    "number": 29,
+                    "state": "OPEN",
+                    "title": "cantaloupe line2 line3 'abc' line4 line5 \"hello world\" Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+                    "url": "https://github.com/magus/git-multi-diff-playground/pull/29"
+                },
+                "metadata": {
+                    "id": "398c0ead-77ad-41a4-af6e-280f99998c28"
+                }
+            },
+            {
+                "sha": "cc09b96b823d9dde77188e675d3090be7c1d625a",
+                "message": "pineapple",
+                "raw_message": "pineapple\n\ngit-multi-diff-id: 53d15f9a-2451-492c-a831-642d41ad3ef4",
+                "pr": {
+                    "baseRefName": "3d1d890d-11c9-4569-83c3-e3aff6426e37",
+                    "commits": [
+                        {
+                            "authoredDate": "2023-10-25T09:29:30Z",
+                            "authors": [
+                                {
+                                    "email": "noah@iamnoah.com",
+                                    "id": "MDQ6VXNlcjI5MDA4NA==",
+                                    "login": "magus",
+                                    "name": "magus"
+                                }
+                            ],
+                            "committedDate": "2023-10-28T19:16:37Z",
+                            "messageBody": "git-multi-diff-id: 53d15f9a-2451-492c-a831-642d41ad3ef4",
+                            "messageHeadline": "strawberry",
+                            "oid": "a339f9cc4d8c10b691fef2c2425bf4a67c8c70f0"
+                        }
+                    ],
+                    "headRefName": "53d15f9a-2451-492c-a831-642d41ad3ef4",
+                    "number": 30,
+                    "state": "OPEN",
+                    "title": "strawberry",
+                    "url": "https://github.com/magus/git-multi-diff-playground/pull/30"
+                },
+                "metadata": {
+                    "id": "53d15f9a-2451-492c-a831-642d41ad3ef4"
+                }
+            }
+        ],
+        "UNASSIGNED": "unassigned"
+    }
+}

package/dist/app/App copy.js

@@ -0,0 +1,30 @@
+import * as React from "react";
+import { Debug } from "./Debug.js";
+import { DependencyCheck } from "./DependencyCheck.js";
+import { GatherMetadata } from "./GatherMetadata.js";
+import { GithubApiError } from "./GithubApiError.js";
+import { Main } from "./Main.js";
+import { Output } from "./Output.js";
+import { Store } from "./Store.js";
+export function App() {
+    const ink = Store.useState((state) => state.ink);
+    const argv = Store.useState((state) => state.argv);
+    if (!ink || !argv) {
+        return null;
+    }
+    // // debug component
+    // return (
+    //   <React.Fragment>
+    //     <Debug />
+    //     <Output />
+    //     <GithubApiError />
+    //   </React.Fragment>
+    // );
+    return (React.createElement(Providers, null,
+        React.createElement(Debug, null),
+        React.createElement(Output, null),
+        !argv.debug ? null : React.createElement(GithubApiError, null),
+        React.createElement(DependencyCheck, null,
+            React.createElement(GatherMetadata, null,
+                React.createElement(Main, null)))));
+}

package/dist/app/ArgCheck.js

@@ -0,0 +1,21 @@
+import * as React from "react";
+import { invariant } from "../core/invariant.js";
+import { GithubApiError } from "./GithubApiError.js";
+import { Store } from "./Store.js";
+export function ArgCheck(props) {
+    const argv = Store.useState((state) => state.argv);
+    invariant(argv, "argv must exist");
+    // if (argv.debug) {
+    //   return (
+    //     <Await
+    //       fallback={<Ink.Text>Checking Github API quota...</Ink.Text>}
+    //       function={github_quota}
+    //     >
+    //       {props.children}
+    //     </Await>
+    //   );
+    // }
+    return (React.createElement(React.Fragment, null,
+        React.createElement(GithubApiError, null),
+        props.children));
+}

package/dist/app/Brackets copy.js

@@ -0,0 +1,10 @@
+import * as React from "react";
+import * as Ink from "ink";
+export function Brackets(props) {
+    const color = "#f97316";
+    const text_color = "#06b6d4";
+    return (React.createElement(Ink.Text, { color: text_color },
+        React.createElement(Ink.Text, { color: color }, "["),
+        props.children,
+        React.createElement(Ink.Text, { color: color }, "]")));
+}

package/dist/app/Counter.js

@@ -0,0 +1,19 @@
+import * as React from "react";
+import * as Ink from "ink";
+export function Counter() {
+    const { isFocused } = Ink.useFocus();
+    const [counter, setCounter] = React.useState(0);
+    React.useEffect(() => {
+        const timer = setInterval(() => {
+            setCounter((prevCounter) => prevCounter + 1);
+        }, 100);
+        return () => {
+            clearInterval(timer);
+        };
+    }, []);
+    return (React.createElement(Ink.Text, { color: "green" },
+        counter,
+        " tests passed (focus:",
+        String(isFocused),
+        ")"));
+}

package/dist/app/GatherMetadata copy.js

@@ -0,0 +1,91 @@
+import * as React from "react";
+import * as Ink from "ink";
+import { cli } from "../core/cli.js";
+import { colors } from "../core/colors.js";
+import { invariant } from "../core/invariant.js";
+import { match_group } from "../core/match_group.js";
+import { Await } from "./Await.js";
+import { Brackets } from "./Brackets.js";
+import { FormatText } from "./FormatText.js";
+import { Store } from "./Store.js";
+export function GatherMetadata(props) {
+    const argv = Store.useState((state) => state.argv);
+    invariant(argv, "argv must exist");
+    const fallback = (React.createElement(Ink.Text, { color: colors.yellow }, "Gathering local git information..."));
+    return (React.createElement(Await, { fallback: fallback, function: gather_metadata }, props.children));
+}
+async function gather_metadata() {
+    const actions = Store.getState().actions;
+    const argv = Store.getState().argv;
+    invariant(argv, "argv must exist");
+    try {
+        // default to master branch, fallback to main
+        let master_branch;
+        if (argv.branch) {
+            actions.debug(React.createElement(FormatText, { message: "Setting master branch to {branch}", values: {
+                    branch: React.createElement(Brackets, null, argv.branch),
+                } }));
+            master_branch = argv.branch;
+        }
+        else {
+            const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
+            if (detect_master.stdout !== "") {
+                master_branch = BRANCH.master;
+            }
+            else {
+                actions.debug(React.createElement(FormatText, { message: "Could not find {master} branch, falling back to {main}", values: {
+                        master: React.createElement(Brackets, null, BRANCH.master),
+                        main: React.createElement(Brackets, null, BRANCH.main),
+                    } }));
+                master_branch = BRANCH.main;
+            }
+        }
+        const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
+        // handle when there are no detected changes
+        if (branch_name === master_branch) {
+            actions.newline();
+            actions.error("Must run within a branch.");
+            actions.exit(0);
+            return;
+        }
+        const head = (await cli("git rev-parse HEAD")).stdout;
+        const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
+            .stdout;
+        // handle when there are no detected changes
+        if (head === merge_base) {
+            actions.newline();
+            actions.output(React.createElement(Ink.Text, { color: colors.gray }, "No changes detected."));
+            actions.exit(0);
+            return;
+        }
+        // git@github.com:magus/git-multi-diff-playground.git
+        // https://github.com/magus/git-multi-diff-playground.git
+        const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
+        const repo_path = match_group(origin_url, RE.repo_path, "repo_path");
+        Store.setState((state) => {
+            state.repo_path = repo_path;
+            state.master_branch = master_branch;
+            state.head = head;
+            state.merge_base = merge_base;
+            state.branch_name = branch_name;
+        });
+    }
+    catch (err) {
+        actions.error("Unable to gather git metadata.");
+        if (err instanceof Error) {
+            if (actions.isDebug()) {
+                actions.error(err.message);
+            }
+        }
+        actions.exit(7);
+    }
+}
+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/,
+};
+const BRANCH = {
+    master: "master",
+    main: "main",
+};

package/dist/app/GatherMetadata.js

@@ -41,6 +41,13 @@ async function gather_metadata() {
             }
         }
         const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
+        // handle detahed head state
+        if (branch_name === "HEAD") {
+            actions.newline();
+            actions.error("Must run within a branch.");
+            actions.exit(0);
+            return;
+        }
         // handle when there are no detected changes
         if (branch_name === master_branch) {
             actions.newline();
@@ -62,8 +69,10 @@ async function gather_metadata() {
         // https://github.com/magus/git-multi-diff-playground.git
         const origin_url = (await cli(`git config --get remote.origin.url`)).stdout;
         const repo_path = match_group(origin_url, RE.repo_path, "repo_path");
+        const repo_root = (await cli(`git rev-parse --show-toplevel`)).stdout;
         Store.setState((state) => {
             state.repo_path = repo_path;
+            state.repo_root = repo_root;
             state.master_branch = master_branch;
             state.head = head;
             state.merge_base = merge_base;

package/dist/app/InitMetadata.js

@@ -0,0 +1,14 @@
+import * as React from "react";
+import { cli } from "../core/cli.js";
+import { Await } from "./Await.js";
+import { Store } from "./Store.js";
+export function InitMetadata() {
+    return (React.createElement(Await, { function: async () => {
+            const head = (await cli("git rev-parse HEAD")).stdout;
+            const merge_base = (await cli("git merge-base HEAD master")).stdout;
+            Store.setState((state) => {
+                state.head = head;
+                state.merge_base = merge_base;
+            });
+        } }));
+}

package/dist/app/Input.js

@@ -0,0 +1,15 @@
+import * as React from "react";
+import * as Ink from "ink";
+export function Input(props) {
+    const [value, set_value] = React.useState(props.value || "");
+    Ink.useInput((input, key) => {
+        if (key.backspace) {
+            set_value((value) => value.slice(0, -1));
+        }
+        else {
+            set_value((value) => `${value}${input}`);
+        }
+    });
+    return (React.createElement(Ink.Box, { borderStyle: "single" },
+        React.createElement(Ink.Text, null, value)));
+}

package/dist/app/KeepAlive.js

@@ -0,0 +1,11 @@
+import React from "react";
+export function KeepAlive() {
+    // Exit the app after 5 seconds
+    React.useEffect(() => {
+        const timer = setInterval(() => { }, 5 * 1000);
+        return function cleanup() {
+            clearInterval(timer);
+        };
+    }, []);
+    return null;
+}

package/dist/app/LocalMergeRebase.js

@@ -1,4 +1,5 @@
 import * as React from "react";
+import fs from "node:fs";
 import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
@@ -21,13 +22,20 @@ async function run() {
     const branch_name = state.branch_name;
     const commit_range = state.commit_range;
     const master_branch = state.master_branch;
+    const cwd = state.cwd;
+    const repo_root = state.repo_root;
     invariant(argv, "argv must exist");
     invariant(branch_name, "branch_name must exist");
     invariant(commit_range, "commit_range must exist");
+    invariant(cwd, "cwd must exist");
+    invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
     const temp_branch_name = `${branch_name}_${short_id()}`;
     try {
+        // must perform rebase from repo root for applying git patch
+        process.chdir(repo_root);
+        await cli(`pwd`);
         await cli(`git fetch --no-tags -v origin ${master_branch}:${master_branch}`);
         const master_sha = (await cli(`git rev-parse ${master_branch}`)).stdout;
         const rebase_merge_base = master_sha;
@@ -53,9 +61,13 @@ async function run() {
                         commit_message: React.createElement(Brackets, null, commit.message),
                     } }));
             }
+            // ensure clean base to avoid conflicts when applying patch
+            await cli(`git clean -fd`);
+            // create, apply and cleanup patch
             await cli(`git format-patch -1 ${commit.sha} --stdout > ${PATCH_FILE}`);
             await cli(`git apply ${PATCH_FILE}`);
             await cli(`rm ${PATCH_FILE}`);
+            // add all changes to stage
             await cli(`git add --all`);
             let new_message;
             if (commit.branch_id) {
@@ -122,6 +134,12 @@ async function run() {
                 cli.sync(`git branch -D ${group.id}`, spawn_options);
             }
         }
+        // restore back to original dir
+        invariant(cwd, "cwd must exist");
+        if (fs.existsSync(cwd)) {
+            process.chdir(cwd);
+        }
+        cli.sync(`pwd`, spawn_options);
     }
     function handle_exit() {
         actions.output(React.createElement(Ink.Text, { color: colors.yellow },
@@ -136,4 +154,4 @@ async function run() {
         actions.exit(6);
     }
 }
-const PATCH_FILE = "mypatch.patch";
+const PATCH_FILE = "git-stack-cli-patch.patch";