git-stack-cli 2.2.6 → 2.2.7

package/README.md

@@ -1,4 +1,8 @@
-# git-stack-cli
+<p align="center">
+  <img src="https://github.com/user-attachments/assets/3fba8b2d-2cb2-446b-8bf4-523643636565" alt="Logo" height=240>
+</p>
+
+# `git stack`
 
 - ✨ **[Stacked diffs](https://graphite.dev/guides/stacked-diffs) for `git`**
 - 🚀 **Simple one-branch workflow**

package/dist/js/index.js

@@ -37974,16 +37974,6 @@ function CheckGitRevise(props) {
 var React25 = __toESM(require_react(), 1);
 var import_cloneDeep = __toESM(require_cloneDeep(), 1);
 
-// src/core/safe_quote.ts
-function safe_quote(value) {
-  let result = value;
-  result = result.replace(RE2.all_double_quote, "\\\"");
-  return result;
-}
-var RE2 = {
-  all_double_quote: /"/g
-};
-
 // src/core/Metadata.ts
 function write(message, values) {
   let result = message;
@@ -37994,17 +37984,16 @@ function write(message, values) {
   }
   let new_message = line_list.join(`
 `);
-  new_message = safe_quote(new_message);
   return new_message;
 }
 function read(message) {
   const values = { id: null, title: null };
-  const match_id = message.match(RE3.stack_id);
+  const match_id = message.match(RE2.stack_id);
   if (match_id?.groups) {
     values.id = match_id.groups["id"];
     invariant(values.id, "id must exist");
   }
-  const match_title = message.match(RE3.group_title);
+  const match_title = message.match(RE2.group_title);
   if (match_title?.groups) {
     values.title = match_title.groups["title"];
   }
@@ -38012,8 +38001,8 @@ function read(message) {
 }
 function remove(message) {
   let result = message;
-  result = result.replace(new RegExp(RE3.stack_id, "gmi"), "");
-  result = result.replace(new RegExp(RE3.group_title, "gmi"), "");
+  result = result.replace(new RegExp(RE2.stack_id, "gmi"), "");
+  result = result.replace(new RegExp(RE2.group_title, "gmi"), "");
   result = result.trimEnd();
   return result;
 }
@@ -38025,7 +38014,7 @@ var TEMPLATE = {
     return `git-stack-title: ${title}`;
   }
 };
-var RE3 = {
+var RE2 = {
   stack_id: new RegExp(`${TEMPLATE.stack_id("(?<id>[^\\s]+)")}`, "i"),
   group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i")
 };
@@ -38046,6 +38035,20 @@ async function get_tmp_dir() {
   return dir;
 }
 
+// src/core/safe_quote.ts
+function safe_quote(value) {
+  let result = value;
+  result = result.replace(RE3.all_backslash, "\\\\");
+  result = result.replace(RE3.all_double_quote, "\\\"");
+  result = result.replace(RE3.all_backtick, "\\`");
+  return result;
+}
+var RE3 = {
+  all_double_quote: /"/g,
+  all_backtick: /`/g,
+  all_backslash: /\\/g
+};
+
 // src/core/github.tsx
 async function pr_list() {
   const state = Store.getState();
@@ -38391,7 +38394,6 @@ GitReviseTodo.todo = function todo(args) {
     const metadata = { id, title };
     const unsafe_message_with_id = write(commit2.full_message, metadata);
     let message_with_id = unsafe_message_with_id;
-    message_with_id = message_with_id.replace(/[^\\]"/g, "\\\"");
     const sha = commit2.sha.slice(0, 12);
     const entry_lines = [`++ pick ${sha}`, message_with_id];
     const entry = entry_lines.join(`
@@ -38404,7 +38406,6 @@ GitReviseTodo.todo = function todo(args) {
   return todo2;
 };
 GitReviseTodo.execute = async function grt_execute(args) {
-  const tmp_git_sequence_editor_path = path7.join(await get_tmp_dir(), "git-sequence-editor.sh");
   const GIT_SEQUENCE_EDITOR_SCRIPT = `#!/bin/sh
 
 # Example
@@ -38424,30 +38425,44 @@ echo "CLI=$0 $*"
 echo "PWD=$(pwd)"
 
 # ensure \\\`GIT_REVISE_TODO\\\` is not empty
-if [ -z "$GIT_REVISE_TODO" ]; then
-  echo "\uD83D\uDEA8 GIT_REVISE_TODO environment variable is empty" >&2
+if [ ! -f "$GIT_REVISE_TODO" ]; then
+  echo "\uD83D\uDEA8 GIT_REVISE_TODO file must exist" >&2
   exit 1
 fi
 
 # first argument into git sequence editor is git-revise-todo file
 git_revise_todo_path="$1"
 
-# debug print git-revise-todo file passed into command
-echo "$git_revise_todo_path"
+# print content of git-revise-todo file passed into command
+echo
+echo "BEFORE git_revise_todo_path=$git_revise_todo_path"
 echo "----- START -----"
 cat "$git_revise_todo_path"
+echo
 echo "------ END ------"
+echo
+
+# copy content of file at \\\`GIT_REVISE_TODO\\\` env variable to \\\`git_revise_todo_path\\\`
+cp "$GIT_REVISE_TODO" "$git_revise_todo_path"
 
-# write content of \\\`GIT_REVISE_TODO\\\` env variable to \\\`git_revise_todo_path\\\`
-echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
+# print content of git-revise-todo file after copy above
+echo
+echo "AFTER git_revise_todo_path=$git_revise_todo_path"
+echo "----- START -----"
+cat "$git_revise_todo_path"
+echo
+echo "------ END ------"
+echo
 `;
   invariant(GIT_SEQUENCE_EDITOR_SCRIPT, "GIT_SEQUENCE_EDITOR_SCRIPT must exist");
+  const tmp_git_sequence_editor_path = path7.join(await get_tmp_dir(), "git-sequence-editor.sh");
   await fs10.writeFile(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
   await fs10.chmod(tmp_git_sequence_editor_path, "755");
-  const git_revise_todo = GitReviseTodo(args);
+  const tmp_path_git_revise_todo = path7.join(await get_tmp_dir(), "git-revise-todo.txt");
+  await fs10.writeFile(tmp_path_git_revise_todo, GitReviseTodo(args));
   const command = [
     `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
-    `GIT_REVISE_TODO="${git_revise_todo}"`,
+    `GIT_REVISE_TODO="${tmp_path_git_revise_todo}"`,
     `git`,
     `revise --edit -i ${args.rebase_merge_base}`
   ];
@@ -40024,7 +40039,8 @@ function SelectCommitRangesInternal(props) {
     let branch_prefix = "";
     if (argv["branch-prefix"]) {
       branch_prefix = argv["branch-prefix"];
-    } else if ("") {
+    } else if (process.env.GIT_STACK_BRANCH_PREFIX) {
+      branch_prefix = process.env.GIT_STACK_BRANCH_PREFIX;
     }
     return `${branch_prefix}${gs_short_id()}`;
   }
@@ -45646,7 +45662,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.6").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.2.7").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

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

package/scripts/bun-build.ts

@@ -24,36 +24,43 @@ const parsed_args = util.parseArgs({
 const WATCH = parsed_args.values.watch;
 const VERBOSE = parsed_args.values.verbose;
 
-console.debug("📦 bundle", WATCH ? "watch" : "build");
+function log(...args: any[]) {
+  const timestamp = new Date().toISOString();
+  console.debug(`[${timestamp}]`, ...args);
+}
+
+log("📦 bundle", WATCH ? "watch" : "build");
 
 if (VERBOSE) {
-  console.debug(parsed_args);
+  log(parsed_args);
 }
 
 const REPO_ROOT = (await spawn.sync("git rev-parse --show-toplevel")).stdout;
 
-const PACKAGE_JSON = await file.read_json(path.join(REPO_ROOT, "package.json"));
-const GIT_SEQUENCE_EDITOR_SCRIPT_PATH = path.join(REPO_ROOT, "scripts", "git-sequence-editor.sh");
-const UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT = await file.read_text(GIT_SEQUENCE_EDITOR_SCRIPT_PATH);
-const GIT_SEQUENCE_EDITOR_SCRIPT = UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT.replace(/`/g, "\\`");
-
-let GITIGNORE = (await file.read_text(path.join(REPO_ROOT, ".gitignore"))).split("\n");
-GITIGNORE = GITIGNORE.filter((line) => line.trim() && !line.startsWith("#"));
-GITIGNORE.push(".git");
+async function get_define() {
+  const PACKAGE_JSON = await file.read_json(path.join(REPO_ROOT, "package.json"));
+  const GIT_SEQUENCE_EDITOR_SCRIPT_PATH = path.join(REPO_ROOT, "scripts", "git-sequence-editor.sh");
+  const UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT = await file.read_text(GIT_SEQUENCE_EDITOR_SCRIPT_PATH);
+  const GIT_SEQUENCE_EDITOR_SCRIPT = UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT.replace(/`/g, "\\`");
 
-const define = {
-  "process.env.NODE_ENV": JSON.stringify("production"),
-  "process.env.CLI_VERSION": JSON.stringify(String(PACKAGE_JSON.version)),
-  "process.env.GIT_SEQUENCE_EDITOR_SCRIPT": JSON.stringify(GIT_SEQUENCE_EDITOR_SCRIPT),
-};
+  const define = {
+    "process.env.NODE_ENV": JSON.stringify("production"),
+    "process.env.CLI_VERSION": JSON.stringify(String(PACKAGE_JSON.version)),
+    "process.env.GIT_SEQUENCE_EDITOR_SCRIPT": JSON.stringify(GIT_SEQUENCE_EDITOR_SCRIPT),
+  };
 
-if (VERBOSE) {
-  console.debug({ define });
+  return define;
 }
 
 async function run_build() {
   const start = Date.now();
 
+  const define = await get_define();
+
+  if (VERBOSE) {
+    log({ define });
+  }
+
   const result = await Bun.build({
     entrypoints: ["./src/index.tsx"],
     outdir: "./dist/js",
@@ -65,10 +72,10 @@ async function run_build() {
 
   const duration_ms = Date.now() - start;
 
-  console.debug(`✅ Build (${duration_ms}ms)`);
+  log(`✅ Build (${duration_ms}ms)`);
 
   if (VERBOSE) {
-    console.debug({ result });
+    log({ result });
   }
 }
 
@@ -77,11 +84,15 @@ if (!WATCH) {
 } else {
   await run_build();
 
-  console.debug("👀 Watching for changes…");
+  let GITIGNORE = (await file.read_text(path.join(REPO_ROOT, ".gitignore"))).split("\n");
+  GITIGNORE = GITIGNORE.filter((line) => line.trim() && !line.startsWith("#"));
+  GITIGNORE.push(".git");
 
-  const { signal } = new AbortController();
+  log("👀 Watching for changes…");
 
+  const { signal } = new AbortController();
   const watcher = fs.watch(REPO_ROOT, { recursive: true, signal });
+
   for await (const event of watcher) {
     const filename = event.filename;
 
@@ -100,10 +111,10 @@ if (!WATCH) {
       continue;
     }
 
-    console.debug(`⚠️ Change ${filename}`);
+    log(`⚠️ Change ${filename}`);
 
     if (VERBOSE) {
-      console.debug({ ignored, filename, event });
+      log({ ignored, filename, event });
     }
 
     await run_build();

package/scripts/git-sequence-editor.sh

@@ -17,19 +17,31 @@ echo "CLI=$0 $*"
 echo "PWD=$(pwd)"
 
 # ensure `GIT_REVISE_TODO` is not empty
-if [ -z "$GIT_REVISE_TODO" ]; then
-  echo "🚨 GIT_REVISE_TODO environment variable is empty" >&2
+if [ ! -f "$GIT_REVISE_TODO" ]; then
+  echo "🚨 GIT_REVISE_TODO file must exist" >&2
   exit 1
 fi
 
 # first argument into git sequence editor is git-revise-todo file
 git_revise_todo_path="$1"
 
-# debug print git-revise-todo file passed into command
-echo "$git_revise_todo_path"
+# print content of git-revise-todo file passed into command
+echo
+echo "BEFORE git_revise_todo_path=$git_revise_todo_path"
 echo "----- START -----"
 cat "$git_revise_todo_path"
+echo
 echo "------ END ------"
+echo
 
-# write content of `GIT_REVISE_TODO` env variable to `git_revise_todo_path`
-echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
+# copy content of file at `GIT_REVISE_TODO` env variable to `git_revise_todo_path`
+cp "$GIT_REVISE_TODO" "$git_revise_todo_path"
+
+# print content of git-revise-todo file after copy above
+echo
+echo "AFTER git_revise_todo_path=$git_revise_todo_path"
+echo "----- START -----"
+cat "$git_revise_todo_path"
+echo
+echo "------ END ------"
+echo

package/src/core/GitReviseTodo.ts

@@ -91,8 +91,6 @@ GitReviseTodo.todo = function todo(args: CommitListArgs) {
 
     let message_with_id = unsafe_message_with_id;
 
-    message_with_id = message_with_id.replace(/[^\\]"/g, '\\"');
-
     // get first 12 characters of commit sha
     const sha = commit.sha.slice(0, 12);
 
@@ -108,27 +106,25 @@ GitReviseTodo.todo = function todo(args: CommitListArgs) {
 };
 
 GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
-  // generate temporary directory and drop sequence editor script
-  const tmp_git_sequence_editor_path = path.join(await get_tmp_dir(), "git-sequence-editor.sh");
-
   // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
   const GIT_SEQUENCE_EDITOR_SCRIPT = process.env.GIT_SEQUENCE_EDITOR_SCRIPT;
-
   invariant(GIT_SEQUENCE_EDITOR_SCRIPT, "GIT_SEQUENCE_EDITOR_SCRIPT must exist");
 
-  // write script to temporary path
+  // generate temporary directory and drop sequence editor script
+  // write script to temporary path and ensure script is executable
+  const tmp_git_sequence_editor_path = path.join(await get_tmp_dir(), "git-sequence-editor.sh");
   await fs.writeFile(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
-
-  // ensure script is executable
   await fs.chmod(tmp_git_sequence_editor_path, "755");
 
-  const git_revise_todo = GitReviseTodo(args);
+  // write git revise todo to a temp path for use by sequence editor script
+  const tmp_path_git_revise_todo = path.join(await get_tmp_dir(), "git-revise-todo.txt");
+  await fs.writeFile(tmp_path_git_revise_todo, GitReviseTodo(args));
 
   // execute cli with temporary git sequence editor script
   // revise from merge base to pick correct commits
   const command = [
     `GIT_EDITOR="${tmp_git_sequence_editor_path}"`,
-    `GIT_REVISE_TODO="${git_revise_todo}"`,
+    `GIT_REVISE_TODO="${tmp_path_git_revise_todo}"`,
     `git`,
     `revise --edit -i ${args.rebase_merge_base}`,
   ];

package/src/core/Metadata.ts

@@ -1,5 +1,4 @@
 import { invariant } from "~/core/invariant";
-import { safe_quote } from "~/core/safe_quote";
 
 type InputMetadataValues = {
   id: string;
@@ -25,8 +24,6 @@ export function write(message: string, values: InputMetadataValues) {
 
   let new_message = line_list.join("\n");
 
-  new_message = safe_quote(new_message);
-
   return new_message;
 }
 

package/src/core/safe_quote.ts

@@ -1,10 +1,14 @@
 // escape double-quote for cli
 export function safe_quote(value: string) {
   let result = value;
+  result = result.replace(RE.all_backslash, "\\\\");
   result = result.replace(RE.all_double_quote, '\\"');
+  result = result.replace(RE.all_backtick, "\\`");
   return result;
 }
 
 const RE = {
   all_double_quote: /"/g,
+  all_backtick: /`/g,
+  all_backslash: /\\/g,
 };