git-stack-cli 1.11.0 → 1.11.2

package/dist/cjs/index.cjs

@@ -30056,6 +30056,45 @@ GitReviseTodo.todo = function todo(args) {
 GitReviseTodo.execute = async function grt_execute(args) {
     // generate temporary directory and drop sequence editor script
     const tmp_git_sequence_editor_path = path.join(os.tmpdir(), "git-sequence-editor.sh");
+    // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
+    const GIT_SEQUENCE_EDITOR_SCRIPT = `#!/bin/sh
+
+# Example
+#
+#   GIT_REVISE_TODO="abc" GIT_EDITOR="$(pwd)/scripts/git-sequence-editor.sh" git revise --edit -i head~4
+#
+#   Note
+#   ----------------
+#   Use \`GIT_EDITOR\` above instead of \`GIT_SEQUENCE_EDITOR\` because \`git revise\` does not use
+#   \`GIT_SEQUENCE_EDITOR\` when passing the \`--edit\` flag, but does work without the \`--edit\` flag
+#
+#
+
+# debug print env variables
+echo "GIT_REVISE_TODO=$GIT_REVISE_TODO"
+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
+  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"
+echo "----- START -----"
+cat "$git_revise_todo_path"
+echo "------ END ------"
+
+# write content of \`GIT_REVISE_TODO\` env variable to \`git_revise_todo_path\`
+echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
+`;
+    // write script to temporary path
+    fs.writeFileSync(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
     // ensure script is executable
     fs.chmodSync(tmp_git_sequence_editor_path, "755");
     const git_revise_todo = GitReviseTodo(args);
@@ -30147,6 +30186,10 @@ function DetectInitialPR(props) {
         for (const group of commit_range.group_list) {
             group.id = branch_name;
             group.title = state.pr?.title || "-";
+            for (const commit of commit_range.commit_list) {
+                commit.branch_id = group.id;
+                commit.title = group.title;
+            }
         }
         // get latest merge_base relative to local master
         const rebase_group_index = 0;
@@ -30774,50 +30817,6 @@ async function run$5() {
     async function rebase_git_revise() {
         actions.debug(`rebase_git_revise`);
         actions.output(reactExports.createElement(Text, { color: colors.yellow, wrap: "truncate-end" }, "Rebasing\u2026"));
-        // generate temporary directory and drop sequence editor script
-        const tmp_git_sequence_editor_path = path.join(os.tmpdir(), "git-sequence-editor.sh");
-        actions.debug(`tmp_git_sequence_editor_path=${tmp_git_sequence_editor_path}`);
-        // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
-        const GIT_SEQUENCE_EDITOR_SCRIPT = `#!/bin/sh
-
-# Example
-#
-#   GIT_REVISE_TODO="abc" GIT_EDITOR="$(pwd)/scripts/git-sequence-editor.sh" git revise --edit -i head~4
-#
-#   Note
-#   ----------------
-#   Use \`GIT_EDITOR\` above instead of \`GIT_SEQUENCE_EDITOR\` because \`git revise\` does not use
-#   \`GIT_SEQUENCE_EDITOR\` when passing the \`--edit\` flag, but does work without the \`--edit\` flag
-#
-#
-
-# debug print env variables
-echo "GIT_REVISE_TODO=$GIT_REVISE_TODO"
-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
-  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"
-echo "----- START -----"
-cat "$git_revise_todo_path"
-echo "------ END ------"
-
-# write content of \`GIT_REVISE_TODO\` env variable to \`git_revise_todo_path\`
-echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
-`;
-        // write script to temporary path
-        fs.writeFileSync(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
-        // ensure script is executable
-        fs.chmodSync(tmp_git_sequence_editor_path, "755");
         // create temporary branch
         await cli(`git checkout -b ${temp_branch_name}`);
         await GitReviseTodo.execute({
@@ -37381,7 +37380,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.11.0" )
+        .version("1.11.2" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`")
         .argv;

package/package.json

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

package/src/app/DetectInitialPR.tsx

@@ -157,6 +157,10 @@ export function DetectInitialPR(props: Props) {
     for (const group of commit_range.group_list) {
       group.id = branch_name;
       group.title = state.pr?.title || "-";
+      for (const commit of commit_range.commit_list) {
+        commit.branch_id = group.id;
+        commit.title = group.title;
+      }
     }
 
     // get latest merge_base relative to local master

package/src/app/ManualRebase.tsx

@@ -1,8 +1,6 @@
 import * as React from "react";
 
 import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
 
 import * as Ink from "ink-cjs";
 import cloneDeep from "lodash/cloneDeep";
@@ -145,25 +143,6 @@ async function run() {
       </Ink.Text>
     );
 
-    // generate temporary directory and drop sequence editor script
-    const tmp_git_sequence_editor_path = path.join(
-      os.tmpdir(),
-      "git-sequence-editor.sh"
-    );
-
-    actions.debug(
-      `tmp_git_sequence_editor_path=${tmp_git_sequence_editor_path}`
-    );
-
-    // replaced at build time with literal contents of `scripts/git-sequence-editor.sh`
-    const GIT_SEQUENCE_EDITOR_SCRIPT = `process.env.GIT_SEQUENCE_EDITOR_SCRIPT`;
-
-    // write script to temporary path
-    fs.writeFileSync(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
-
-    // ensure script is executable
-    fs.chmodSync(tmp_git_sequence_editor_path, "755");
-
     // create temporary branch
     await cli(`git checkout -b ${temp_branch_name}`);
 

package/src/core/GitReviseTodo.ts

@@ -116,6 +116,12 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
     "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`;
+
+  // write script to temporary path
+  fs.writeFileSync(tmp_git_sequence_editor_path, GIT_SEQUENCE_EDITOR_SCRIPT);
+
   // ensure script is executable
   fs.chmodSync(tmp_git_sequence_editor_path, "755");