git-stack-cli 1.1.0 → 1.2.0

package/dist/cjs/index.cjs

@@ -26960,8 +26960,8 @@ function CheckGithubCliAuth(props) {
 function CheckGitRevise(props) {
     const actions = Store.useActions();
     const argv = Store.useState((state) => state.argv);
-    // skip git revise check when `--git-revise` flag is not present
-    if (!argv?.["git-revise"]) {
+    // skip git revise check when `rebase` is not git-revise
+    if (argv?.["rebase"] !== "git-revise") {
         return props.children;
     }
     return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow },
@@ -27872,7 +27872,7 @@ async function run$2(props) {
         // must perform rebase from repo root for applying git patch
         process.chdir(repo_root);
         await cli(`pwd`);
-        if (argv["git-revise"]) {
+        if (argv["rebase"] === "git-revise") {
             await rebase_git_revise();
         }
         else {
@@ -34291,10 +34291,11 @@ async function command() {
         default: true,
         description: "Skip git hooks such as pre-commit and pre-push",
     })
-        .option("git-revise", {
-        type: "boolean",
-        default: false,
-        description: `Use git-revise to perform in-memory rebase, (macOS + Linux only)`,
+        .option("rebase", {
+        type: "string",
+        choices: [Rebase["git-revise"], Rebase["cherry-pick"]],
+        default: Rebase["git-revise"],
+        description: `Rebase implementation, "${Rebase["git-revise"]}" by default to perform in-memory rebase. "${Rebase["cherry-pick"]}" can be used to use disk and incrementally rebase each commit`,
     })
         .option("verbose", {
         type: "boolean",
@@ -34326,14 +34327,19 @@ async function command() {
         description: "Mock local store metadata for testing",
     })
         // do not wrap to 80 columns (yargs default)
-        // .wrap(yargs().terminalWidth()) will fill terminal (maximuize)
-        .wrap(null)
+        // 140 seems to look decent so lets do that instead
+        // passing null will wrap to terminal width
+        .wrap(140)
         // disallow unknown options
         .strict()
-        .version("1.1.0" )
+        .version("1.2.0" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }
+const Rebase = Object.freeze({
+    "git-revise": "git-revise",
+    "cherry-pick": "cherry-pick",
+});
 
 command()
     .then((argv) => {

package/package.json

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

package/src/app/DependencyCheck.tsx

@@ -160,8 +160,8 @@ function CheckGitRevise(props: Props) {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
 
-  // skip git revise check when `--git-revise` flag is not present
-  if (!argv?.["git-revise"]) {
+  // skip git revise check when `rebase` is not git-revise
+  if (argv?.["rebase"] !== "git-revise") {
     return props.children;
   }
 

package/src/app/ManualRebase.tsx

@@ -89,7 +89,7 @@ async function run(props: Props) {
     process.chdir(repo_root);
     await cli(`pwd`);
 
-    if (argv["git-revise"]) {
+    if (argv["rebase"] === "git-revise") {
       await rebase_git_revise();
     } else {
       await rebase_cherry_pick();

package/src/command.ts

@@ -1,7 +1,9 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-export type Argv = Awaited<ReturnType<typeof command>>;
+export type Argv = Awaited<ReturnType<typeof command>> & {
+  ["rebase"]: keyof typeof Rebase;
+};
 
 export async function command() {
   // https://yargs.js.org/docs/#api-reference-optionkey-opt
@@ -29,10 +31,11 @@ export async function command() {
         description: "Skip git hooks such as pre-commit and pre-push",
       })
 
-      .option("git-revise", {
-        type: "boolean",
-        default: false,
-        description: `Use git-revise to perform in-memory rebase, (macOS + Linux only)`,
+      .option("rebase", {
+        type: "string",
+        choices: [Rebase["git-revise"], Rebase["cherry-pick"]],
+        default: Rebase["git-revise"],
+        description: `Rebase implementation, "${Rebase["git-revise"]}" by default to perform in-memory rebase. "${Rebase["cherry-pick"]}" can be used to use disk and incrementally rebase each commit`,
       })
 
       .option("verbose", {
@@ -70,8 +73,10 @@ export async function command() {
       })
 
       // do not wrap to 80 columns (yargs default)
-      // .wrap(yargs().terminalWidth()) will fill terminal (maximuize)
-      .wrap(null)
+      // 140 seems to look decent so lets do that instead
+      // passing null will wrap to terminal width
+      .wrap(140)
+
       // disallow unknown options
       .strict()
       .version(process.env.CLI_VERSION || "unknown")
@@ -82,3 +87,8 @@ export async function command() {
       .help("help", "Show usage via `git stack help`").argv
   );
 }
+
+const Rebase = Object.freeze({
+  "git-revise": "git-revise",
+  "cherry-pick": "cherry-pick",
+});