git-stack-cli 2.7.8 → 2.8.1

package/src/core/git.ts

@@ -1,8 +1,11 @@
 import { Store } from "~/app/Store";
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
+import { invariant } from "~/core/invariant";
 
-export type Commit = Awaited<ReturnType<typeof get_commits>>[0];
+type CommitList = Awaited<ReturnType<typeof get_commits>>;
+
+export type Commit = CommitList[0];
 
 export async function get_commits(dot_range: string) {
   const log_result = await cli(`git log ${dot_range} --format=${FORMAT} --color=never`);
@@ -34,6 +37,7 @@ export async function get_commits(dot_range: string) {
     const branch_id = metadata.id;
     const subject_line = metadata.subject || "";
     const title = metadata.title;
+    const master_base = metadata.base === "master";
 
     const commit = {
       sha,
@@ -41,6 +45,7 @@ export async function get_commits(dot_range: string) {
       subject_line,
       branch_id,
       title,
+      master_base,
     };
 
     commit_list.push(commit);
@@ -51,6 +56,15 @@ export async function get_commits(dot_range: string) {
   return commit_list;
 }
 
+export async function get_diff(commit_list: CommitList) {
+  invariant(commit_list.length, "commit_list must exist");
+  const first_commit = commit_list[0];
+  const last_commit = commit_list[commit_list.length - 1];
+  const sha_range = `${first_commit.sha}~1..${last_commit.sha}`;
+  const diff_result = await cli(`git --no-pager diff --color=never ${sha_range}`);
+  return diff_result.stdout;
+}
+
 // Why these separators?
 // - Rare in human written text
 // - Supported in git %xNN to write bytes

package/src/core/github.tsx

@@ -167,6 +167,10 @@ type EditPullRequestArgs = {
 };
 
 export async function pr_edit(args: EditPullRequestArgs) {
+  // const state = Store.getState();
+  // const actions = state.actions;
+  // actions.debug(`github.pr_edit ${JSON.stringify(args)}`);
+
   const command_parts = [`gh pr edit ${args.branch}`];
 
   if (args.base) {
@@ -237,6 +241,20 @@ export async function pr_draft(args: DraftPullRequestArgs) {
   }
 }
 
+export async function pr_diff(number: number) {
+  // https://cli.github.com/manual/gh_pr_diff
+
+  const cli_result = await cli(`gh pr diff --color=never ${number}`);
+
+  if (cli_result.code !== 0) {
+    handle_error(cli_result.output);
+  }
+
+  return cli_result.stdout;
+}
+
+// pull request JSON fields
+// https://cli.github.com/manual/gh_pr_list
 // prettier-ignore
 const JSON_FIELDS = "--json id,number,state,baseRefName,headRefName,commits,title,body,url,isDraft";
 
@@ -281,11 +299,10 @@ async function write_body_file(args: EditPullRequestArgs) {
   invariant(args.body, "args.body must exist");
 
   // ensure unique filename is safe for filesystem
-  // base (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
+  // args.branch_id (group id) might contain slashes, e.g. dev/magus/gs-3cmrMBSUj
   // the flashes would mess up the filesystem path to this file
-  let base = args.base || "master";
-  base = base.replace(/^origin\//, "");
-  let tmp_filename = safe_filename(`git-stack-body-${base}`);
+  const branch = args.branch;
+  let tmp_filename = safe_filename(`git-stack-body-${branch}`);
 
   const temp_path = path.join(await get_tmp_dir(), tmp_filename);