git-stack-cli 2.2.6 → 2.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "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/scripts/release-brew.ts

@@ -66,6 +66,8 @@ const re_token = (name: string) => new RegExp(`{{ ${name} }}`, "g");
 process.chdir(HOMEBREW_DIR);
 await spawn.sync(`git reset --hard`);
 await spawn.sync(`git checkout master`);
+await spawn.sync("git fetch --prune");
+await spawn.sync("git reset --hard origin/master");
 
 // homebrew tap formula (binaries)
 

package/src/command.ts

@@ -9,6 +9,7 @@ export async function command() {
   // https://yargs.js.org/docs/#api-reference-optionkey-opt
   return (
     yargs(hideBin(process.argv))
+      .scriptName("git stack")
       .usage("Usage: git stack [command] [options]")
 
       .command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions))

package/src/commands/Rebase.tsx

@@ -8,6 +8,7 @@ import { Await } from "~/app/Await";
 import { Brackets } from "~/app/Brackets";
 import { FormatText } from "~/app/FormatText";
 import { Parens } from "~/app/Parens";
+import { Status } from "~/app/Status";
 import { Store } from "~/app/Store";
 import * as CommitMetadata from "~/core/CommitMetadata";
 import { cli } from "~/core/cli";
@@ -128,7 +129,7 @@ Rebase.run = async function run() {
         message="✅ {branch_name} in sync with {origin_branch}"
         values={{
           branch_name: <Brackets>{branch_name}</Brackets>,
-          origin_branch: <Brackets>{`origin/${master_branch}`}</Brackets>,
+          origin_branch: <Brackets>{master_branch}</Brackets>,
         }}
       />,
     );
@@ -137,8 +138,11 @@ Rebase.run = async function run() {
 
     actions.set((state) => {
       state.commit_range = next_commit_range;
-      state.step = "status";
     });
+
+    actions.output(<Status />);
+
+    actions.exit(0);
   } catch (err) {
     actions.error("Unable to rebase.");
 

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,
 };