git-stack-cli 0.8.7 → 1.0.2

package/dist/app/Main copy.js

@@ -1,200 +0,0 @@
-import * as React from "react";
-import * as Ink from "ink";
-import { v4 as uuid_v4 } from "uuid";
-import * as CommitMetadata from "../core/CommitMetadata.js";
-import * as Metadata from "../core/Metadata.js";
-import { cli } from "../core/cli.js";
-import * as github from "../core/github.js";
-import { invariant } from "../core/invariant.js";
-import { match_group } from "../core/match_group.js";
-import { Await } from "./Await.js";
-import { Exit } from "./Exit.js";
-import { Store } from "./Store.js";
-export function GatherMetadata(props) {
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
-    return (React.createElement(Await, { fallback: null, function: () => gather_metadata({ argv }) }, props.children));
-}
-async function gather_metadata(args) {
-    const actions = Store.getState().actions;
-    const head = (await cli("git rev-parse HEAD")).stdout;
-    const merge_base = (await cli("git merge-base HEAD master")).stdout;
-    // handle when there are no detected changes
-    if (head === merge_base) {
-        actions.newline();
-        actions.output(React.createElement(Ink.Text, { color: "gray" }, "No changes detected."));
-        actions.output(React.createElement(Exit, { clear: true, code: 0 }));
-        return;
-    }
-    const branch_name = (await cli("git rev-parse --abbrev-ref HEAD")).stdout;
-    // 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");
-    const commit_metadata_list = await CommitMetadata.all();
-    Store.setState((state) => {
-        state.head = head;
-        state.merge_base = merge_base;
-        state.branch_name = branch_name;
-        state.repo_path = repo_path;
-        state.commit_metadata_list = commit_metadata_list;
-    });
-    // print_table(repo_path, commit_metadata_list);
-    const needs_update = commit_metadata_list.some((meta) => !meta.pr_exists || meta.pr_dirty);
-    if (args.argv.check) {
-        actions.output(React.createElement(Exit, { clear: true, code: 0 }));
-        return;
-    }
-    if (!args.argv.force && !needs_update) {
-        actions.newline();
-        actions.output(React.createElement(Ink.Text, null, "\u2705 Everything up to date."));
-        actions.output(React.createElement(Ink.Text, { color: "gray" },
-            React.createElement(Ink.Text, null, "Run with"),
-            React.createElement(Ink.Text, { bold: true, color: "yellow" }, ` --force `),
-            React.createElement(Ink.Text, null, "to force update all pull requests.")));
-        actions.output(React.createElement(Exit, { clear: true, code: 0 }));
-    }
-    Store.setState((state) => {
-        state.step = "select-commit-ranges";
-    });
-}
-async function manual_rebase(args) {
-    const temp_branch_name = `${args.branch_name}_${uuid_v4()}`;
-    try {
-        // create temporary branch based on merge base
-        await cli(`git checkout -b ${temp_branch_name} ${args.merge_base}`);
-        const picked_commit_metadata_list = [];
-        // cherry-pick and amend commits one by one
-        for (let i = 0; i < args.commit_metadata_list.length; i++) {
-            const sha = args.commit_metadata_list[i].sha;
-            let base;
-            if (i === 0) {
-                base = "master";
-            }
-            else {
-                base = picked_commit_metadata_list[i - 1].metadata.id;
-                invariant(base, `metadata must be set on previous commit [${i}]`);
-            }
-            await cli(`git cherry-pick ${sha}`);
-            const commit = await CommitMetadata.commit(sha, base);
-            if (!commit.metadata.id) {
-                commit.metadata.id = uuid_v4();
-                await Metadata.write(commit);
-            }
-            picked_commit_metadata_list.push(commit);
-            // always push to origin since github requires commit shas to line up perfectly
-            console.debug();
-            console.debug(`Syncing [${commit.metadata.id}] ...`);
-            await cli(`git push -f origin HEAD:${commit.metadata.id}`);
-            if (commit.pr_exists) {
-                // ensure base matches pr in github
-                await github.pr_base(commit.metadata.id, base);
-            }
-            else {
-                try {
-                    // delete metadata id branch if leftover
-                    await cli(`git branch -D ${commit.metadata.id}`, {
-                        ignoreExitCode: true,
-                    });
-                    // move to temporary branch for creating pr
-                    await cli(`git checkout -b ${commit.metadata.id}`);
-                    // create pr in github
-                    await github.pr_create(commit.metadata.id, base);
-                }
-                catch (err) {
-                    console.error("Moving back to temp branch...");
-                    console.error(err);
-                }
-                finally {
-                    // move back to temp branch
-                    await cli(`git checkout ${temp_branch_name}`);
-                    // delete metadata id branch if leftover
-                    await cli(`git branch -D ${commit.metadata.id}`, {
-                        ignoreExitCode: true,
-                    });
-                }
-            }
-        }
-        // after all commits have been cherry-picked and amended
-        // move the branch pointer to the temporary branch (with the metadata)
-        await cli(`git branch -f ${args.branch_name} ${temp_branch_name}`);
-    }
-    catch (err) {
-        console.error("Restoring original branch...");
-        console.error(err);
-    }
-    finally {
-        // always put self back in original branch
-        await cli(`git checkout ${args.branch_name}`);
-        // ...and cleanup temporary branch
-        await cli(`git branch -D ${temp_branch_name}`, { ignoreExitCode: true });
-    }
-    // print_table(repo_path, await CommitMetadata.all());
-}
-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/,
-};
-// function print_table(
-//   repo_path: string,
-//   commit_metadata_list: Array<Awaited<ReturnType<typeof CommitMetadata.commit>>>
-// ) {
-//   console.debug();
-//   for (const args of commit_metadata_list) {
-//     print_table_row(repo_path, args);
-//   }
-// }
-// function print_table_row(
-//   repo_path: string,
-//   args: Awaited<ReturnType<typeof CommitMetadata.commit>>
-// ) {
-//   let icon;
-//   let status;
-//   if (!args.pr_exists) {
-//     icon = "🌱";
-//     status = "NEW";
-//   } else if (args.pr_dirty) {
-//     icon = "⚠️";
-//     status = "OUTDATED";
-//   } else {
-//     icon = "✅";
-//     status = "SYNCED";
-//   }
-//   // print clean metadata about this commit / branch
-//   const parts = [
-//     icon,
-//     " ",
-//     col(status, 10, "left"),
-//     col(args.message, 80, "left"),
-//   ];
-//   if (args.pr?.number) {
-//     parts.push(` https://github.com/${repo_path}/pull/${args.pr.number}`);
-//   }
-//   console.debug(...parts);
-// }
-// const RE = {
-//   all_newline: /\n/g,
-//   // git@github.com:magus/git-multi-diff-playground.git
-//   // https://github.com/magus/git-multi-diff-playground.git
-//   repo_path: /(?<repo_path>[^:^/]+\/[^/]+)\.git/,
-// };
-// function trunc(value: string, length: number) {
-//   return value.substring(0, length);
-// }
-// function pad(value: string, length: number, align: "left" | "right") {
-//   const space_count = Math.max(0, length - value.length);
-//   const padding = " ".repeat(space_count);
-//   if (align === "left") {
-//     return `${value}${padding}`;
-//   } else {
-//     return `${padding}${value}`;
-//   }
-// }
-// function col(value: string, length: number, align: "left" | "right") {
-//   let column = value;
-//   column = column.replace(RE.all_newline, " ");
-//   column = trunc(column, length);
-//   column = pad(column, length, align);
-//   return column;
-// }

package/dist/app/ManualRebase copy.js

@@ -1,127 +0,0 @@
-import * as React from "react";
-import * as Ink from "ink";
-import * as CommitMetadata from "../core/CommitMetadata.js";
-import * as Metadata from "../core/Metadata.js";
-import { cli } from "../core/cli.js";
-import * as github from "../core/github.js";
-import { invariant } from "../core/invariant.js";
-import { short_id } from "../core/short_id.js";
-import { Await } from "./Await.js";
-import { Brackets } from "./Brackets.js";
-import { Store } from "./Store.js";
-export function ManualRebase(props) {
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" }, "Rebasing commits..."), function: () => run(props) }));
-}
-async function run(props) {
-    const state = Store.getState();
-    const actions = state.actions;
-    const branch_name = state.branch_name;
-    const merge_base = state.merge_base;
-    const commit_map = state.commit_map;
-    invariant(branch_name, "branch_name must exist");
-    invariant(merge_base, "merge_base must exist");
-    invariant(commit_map, "commit_map must exist");
-    // always listen for SIGINT event and restore git state
-    process.once("SIGINT", handle_exit);
-    const temp_branch_name = `${branch_name}_${short_id()}`;
-    const commit_range = await CommitMetadata.range(commit_map);
-    // reverse commit list so that we can cherry-pick in order
-    commit_range.group_list.reverse();
-    let rebase_merge_base = merge_base;
-    let rebase_group_index = 0;
-    for (let i = 0; i < commit_range.group_list.length; i++) {
-        const group = commit_range.group_list[i];
-        if (!group.dirty) {
-            continue;
-        }
-        if (i > 0) {
-            const last_group = commit_range.group_list[i - 1];
-            const last_commit = last_group.commits[last_group.commits.length - 1];
-            rebase_merge_base = last_commit.sha;
-            rebase_group_index = i;
-        }
-        break;
-    }
-    try {
-        // create temporary branch based on merge base
-        await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
-        for (let i = rebase_group_index; i < commit_range.group_list.length; i++) {
-            const group = commit_range.group_list[i];
-            invariant(group.base, "group.base must exist");
-            // cherry-pick and amend commits one by one
-            for (const commit of group.commits) {
-                await cli(`git cherry-pick ${commit.sha}`);
-                if (commit.branch_id !== group.id) {
-                    const new_message = await Metadata.write(commit.message, group.id);
-                    await cli(`git commit --amend -m "${new_message}"`);
-                }
-            }
-            actions.output(React.createElement(Ink.Text, { color: "yellow", wrap: "truncate-end" },
-                "Syncing ",
-                React.createElement(Brackets, null, group.pr?.title || group.id),
-                "..."));
-            if (!props.skipSync) {
-                // push to origin since github requires commit shas to line up perfectly
-                await cli(`git push -f origin HEAD:${group.id}`);
-                if (group.pr) {
-                    // ensure base matches pr in github
-                    await github.pr_base(group.id, group.base);
-                }
-                else {
-                    // delete local group branch if leftover
-                    await cli(`git branch -D ${group.id}`, { ignoreExitCode: true });
-                    // move to temporary branch for creating pr
-                    await cli(`git checkout -b ${group.id}`);
-                    // create pr in github
-                    await github.pr_create(group.id, group.base);
-                    // move back to temp branch
-                    await cli(`git checkout ${temp_branch_name}`);
-                }
-            }
-        }
-        // after all commits have been cherry-picked and amended
-        // move the branch pointer to the newly created temporary branch
-        // now we are in locally in sync with github and on the original branch
-        await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
-        restore_git();
-        actions.set((state) => {
-            state.step = "post-rebase-status";
-        });
-    }
-    catch (err) {
-        actions.output(React.createElement(Ink.Text, { color: "#ef4444" }, "Error during rebase."));
-        if (err instanceof Error) {
-            actions.debug(React.createElement(Ink.Text, { color: "#ef4444" }, err.message));
-        }
-        handle_exit();
-    }
-    // cleanup git operations if cancelled during manual rebase
-    function restore_git() {
-        // signint handler MUST run synchronously
-        // trying to use `await cli(...)` here will silently fail since
-        // all children processes receive the SIGINT signal
-        const spawn_options = { ignoreExitCode: true };
-        // always put self back in original branch
-        cli.sync(`git checkout ${branch_name}`, spawn_options);
-        // ...and cleanup temporary branch
-        cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
-        if (commit_range) {
-            // ...and cleanup pr group branches
-            for (const group of commit_range.group_list) {
-                cli.sync(`git branch -D ${group.id}`, spawn_options);
-            }
-        }
-    }
-    function handle_exit() {
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
-            "Restoring ",
-            React.createElement(Brackets, null, branch_name),
-            "..."));
-        restore_git();
-        actions.output(React.createElement(Ink.Text, { color: "yellow" },
-            "Restored ",
-            React.createElement(Brackets, null, branch_name),
-            "."));
-        actions.exit(5);
-    }
-}

package/dist/app/ManualRebase.js

@@ -1,220 +0,0 @@
-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";
-import * as StackSummaryTable from "../core/StackSummaryTable.js";
-import { cli } from "../core/cli.js";
-import { colors } from "../core/colors.js";
-import * as github from "../core/github.js";
-import { invariant } from "../core/invariant.js";
-import { short_id } from "../core/short_id.js";
-import { Await } from "./Await.js";
-import { Brackets } from "./Brackets.js";
-import { FormatText } from "./FormatText.js";
-import { Store } from "./Store.js";
-export function ManualRebase(props) {
-    return (React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: colors.yellow }, "Rebasing commits..."), function: () => run(props) }));
-}
-async function run(props) {
-    const state = Store.getState();
-    const actions = state.actions;
-    const argv = state.argv;
-    const branch_name = state.branch_name;
-    const merge_base = state.merge_base;
-    const commit_map = state.commit_map;
-    const cwd = state.cwd;
-    const repo_root = state.repo_root;
-    invariant(argv, "argv must exist");
-    invariant(branch_name, "branch_name must exist");
-    invariant(merge_base, "merge_base must exist");
-    invariant(commit_map, "commit_map 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()}`;
-    const commit_range = await CommitMetadata.range(commit_map);
-    // reverse commit list so that we can cherry-pick in order
-    commit_range.group_list.reverse();
-    let rebase_merge_base = merge_base;
-    let rebase_group_index = 0;
-    for (let i = 0; i < commit_range.group_list.length; i++) {
-        const group = commit_range.group_list[i];
-        if (!group.dirty) {
-            continue;
-        }
-        if (i > 0) {
-            const last_group = commit_range.group_list[i - 1];
-            const last_commit = last_group.commits[last_group.commits.length - 1];
-            rebase_merge_base = last_commit.sha;
-            rebase_group_index = i;
-        }
-        break;
-    }
-    try {
-        // must perform rebase from repo root for applying git patch
-        process.chdir(repo_root);
-        await cli(`pwd`);
-        // create temporary branch based on merge base
-        await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
-        const pr_url_list = commit_range.group_list.map(get_group_url);
-        for (let i = rebase_group_index; i < commit_range.group_list.length; i++) {
-            const group = commit_range.group_list[i];
-            invariant(group.base, "group.base must exist");
-            actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Rebasing {group}\u2026", values: {
-                    group: (React.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
-                } }));
-            const selected_url = get_group_url(group);
-            // cherry-pick and amend commits one by one
-            for (const commit of group.commits) {
-                // 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`);
-                const new_message = await Metadata.write(commit.full_message, group.id);
-                const git_commit_comand = [`git commit -m "${new_message}"`];
-                if (argv.verify === false) {
-                    git_commit_comand.push("--no-verify");
-                }
-                await cli(git_commit_comand);
-            }
-            actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
-                    group: (React.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
-                } }));
-            if (!props.skipSync) {
-                // push to origin since github requires commit shas to line up perfectly
-                const git_push_command = [`git push -f origin HEAD:${group.id}`];
-                if (argv.verify === false) {
-                    git_push_command.push("--no-verify");
-                }
-                await cli(git_push_command);
-                if (group.pr) {
-                    // ensure base matches pr in github
-                    await github.pr_edit({
-                        branch: group.id,
-                        base: group.base,
-                        body: StackSummaryTable.write({
-                            body: group.pr.body,
-                            pr_url_list,
-                            selected_url,
-                        }),
-                    });
-                }
-                else {
-                    // delete local group branch if leftover
-                    await cli(`git branch -D ${group.id}`, { ignoreExitCode: true });
-                    // move to temporary branch for creating pr
-                    await cli(`git checkout -b ${group.id}`);
-                    // create pr in github
-                    const pr_url = await github.pr_create({
-                        branch: group.id,
-                        base: group.base,
-                        title: group.title,
-                        body: "",
-                    });
-                    if (!pr_url) {
-                        throw new Error("unable to create pr");
-                    }
-                    // update pr_url_list with created pr_url
-                    for (let i = 0; i < pr_url_list.length; i++) {
-                        const url = pr_url_list[i];
-                        if (url === selected_url) {
-                            pr_url_list[i] = pr_url;
-                        }
-                    }
-                    // move back to temp branch
-                    await cli(`git checkout ${temp_branch_name}`);
-                }
-            }
-        }
-        // finally, ensure all prs have the updated stack table from updated pr_url_list
-        for (let i = 0; i < commit_range.group_list.length; i++) {
-            const group = commit_range.group_list[i];
-            // use the updated pr_url_list to get the actual selected_url
-            const selected_url = pr_url_list[i];
-            invariant(group.base, "group.base must exist");
-            const body = group.pr?.body || "";
-            const update_body = StackSummaryTable.write({
-                body,
-                pr_url_list,
-                selected_url,
-            });
-            if (update_body === body) {
-                actions.debug(`Skipping body update for ${selected_url}`);
-            }
-            else {
-                actions.debug(`Update body for ${selected_url}`);
-                await github.pr_edit({
-                    branch: group.id,
-                    base: group.base,
-                    body: update_body,
-                });
-            }
-        }
-        // after all commits have been cherry-picked and amended
-        // move the branch pointer to the newly created temporary branch
-        // now we are in locally in sync with github and on the original branch
-        await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
-        restore_git();
-        actions.set((state) => {
-            state.step = "post-rebase-status";
-        });
-    }
-    catch (err) {
-        actions.error("Unable to rebase.");
-        if (err instanceof Error) {
-            if (actions.isDebug()) {
-                actions.error(err.message);
-            }
-        }
-        handle_exit();
-    }
-    // cleanup git operations if cancelled during manual rebase
-    function restore_git() {
-        // signint handler MUST run synchronously
-        // trying to use `await cli(...)` here will silently fail since
-        // all children processes receive the SIGINT signal
-        const spawn_options = { ignoreExitCode: true };
-        // always clean up any patch files
-        cli.sync(`rm ${PATCH_FILE}`, spawn_options);
-        // 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 clean -df`, spawn_options);
-        // always put self back in original branch
-        cli.sync(`git checkout ${branch_name}`, spawn_options);
-        // ...and cleanup temporary branch
-        cli.sync(`git branch -D ${temp_branch_name}`, spawn_options);
-        if (commit_range) {
-            // ...and cleanup pr group branches
-            for (const group of commit_range.group_list) {
-                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 },
-            "Restoring ",
-            React.createElement(Brackets, null, branch_name),
-            "..."));
-        restore_git();
-        actions.output(React.createElement(Ink.Text, { color: colors.yellow },
-            "Restored ",
-            React.createElement(Brackets, null, branch_name),
-            "."));
-        actions.exit(5);
-    }
-}
-const get_group_url = (group) => group.pr?.url || group.id;
-const PATCH_FILE = "git-stack-cli-patch.patch";

package/dist/app/MultiSelect copy.js

@@ -1,76 +0,0 @@
-import * as React from "react";
-import * as Ink from "ink";
-import { clamp } from "../core/clamp.js";
-export function MultiSelect(props) {
-    const [selected, select] = React.useReducer((state, value) => {
-        const next = new Set(state);
-        if (next.has(value)) {
-            next.delete(value);
-        }
-        else {
-            next.add(value);
-        }
-        return next;
-    }, new Set());
-    // clamp index to keep in item range
-    const [index, set_index] = React.useReducer((_, value) => {
-        return clamp(value, 0, props.items.length - 1);
-    }, 0);
-    React.useEffect(() => {
-        const item = props.items[index];
-        const selected_list = Array.from(selected);
-        const list = selected_list.map((index) => props.items[index]);
-        props.onSelect(item, list);
-    }, [selected]);
-    Ink.useInput((_input, key) => {
-        if (key.return) {
-            return select(index);
-        }
-        if (key.upArrow) {
-            return set_index(index - 1);
-        }
-        if (key.downArrow) {
-            return set_index(index + 1);
-        }
-    });
-    return (React.createElement(Ink.Box, { flexDirection: "column" }, props.items.map((item, i) => {
-        const active = i === index;
-        return (React.createElement(ItemRow, { key: item.label, label: item.label, active: active, selected: selected.has(i) }));
-    })));
-}
-function Radio(props) {
-    let display;
-    let color;
-    if (props.selected) {
-        // display = "✓";
-        display = "◉";
-        color = "green";
-    }
-    else {
-        // display = " ";
-        display = "◯";
-        color = "";
-    }
-    return (React.createElement(Ink.Text, { bold: props.selected, color: color }, display));
-}
-function ItemRow(props) {
-    let color;
-    let underline;
-    let dimColor;
-    if (props.active) {
-        color = "#38bdf8";
-        underline = true;
-    }
-    else if (props.selected) {
-        // color = "";
-        dimColor = false;
-    }
-    else {
-        // color = "gray";
-        dimColor = true;
-    }
-    return (React.createElement(Ink.Box, { flexDirection: "row", gap: 1 },
-        React.createElement(Radio, { selected: props.selected }),
-        React.createElement(Ink.Box, null,
-            React.createElement(Ink.Text, { bold: props.selected, underline: underline, color: color, dimColor: dimColor, wrap: "truncate-end" }, props.label))));
-}