git-stack-cli 2.8.0 → 2.8.1

package/package.json

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

package/scripts/release-npm.ts

@@ -6,6 +6,9 @@ import { spawn } from "~/core/spawn";
 
 process.env.NODE_ENV = "production";
 
+// ensure npm is authenticated
+await spawn(`npm whoami`);
+
 // get paths relative to this script
 const REPO_ROOT = (await spawn.sync("git rev-parse --show-toplevel")).stdout;
 const DIST_DIR = path.join(REPO_ROOT, "dist");
@@ -54,9 +57,6 @@ for (const filepath of package_json.files) {
   }
 }
 
-// ensure npm is authenticated
-await spawn(`npm whoami`);
-
 process.chdir(REPO_ROOT);
 
 await spawn.sync(`git commit -a -m ${version}`);

package/src/app/SyncGithub.tsx

@@ -75,12 +75,15 @@ async function run() {
 
     const git_push_target_list: Array<string> = [];
 
-    for (const group of push_group_list) {
+    for (let i = 0; i < push_group_list.length; i++) {
+      const group = push_group_list[i];
       const last_commit = last(group.commits);
       invariant(last_commit, "last_commit must exist");
 
       // push group in isolation if master_base is set
-      if (group.master_base) {
+      // for the first group (i > 0) we can skip this
+      // since it'll be based off master anyway
+      if (group.master_base && i > 0) {
         await push_master_group(group);
         continue;
       }

package/src/core/CommitMetadata.ts

@@ -121,6 +121,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
   for (let i = 0; i < group_value_list.length; i++) {
     const group = group_value_list[i];
+    const previous_group: undefined | CommitGroup = group_value_list[i - 1];
 
     if (group.id !== UNASSIGNED) {
       let pr_result = pr_lookup[group.id];
@@ -164,29 +165,61 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
     if (!group.pr) {
       group.dirty = true;
-    } else if (group.pr.commits.length !== group.commits.length) {
-      group.dirty = true;
-    } else if (group.pr.baseRefName !== group.base) {
-      group.dirty = true;
-    } else if (group.master_base) {
-      group.pr.number;
-      // master_base groups cannot be compared by commit sha
-      // instead compare the literal diff local against origin
-      // gh pr diff --color=never 110
-      // git --no-pager diff --color=never 00c8fe0~1..00c8fe0 | pbcopy
-      const diff_github = await github.pr_diff(group.pr.number);
-      const diff_local = await git.get_diff(group.commits);
-      if (diff_github !== diff_local) {
-        group.dirty = true;
-      }
     } else {
-      // comapre literal commit shas in group
-      for (let i = 0; i < group.pr.commits.length; i++) {
-        const pr_commit = group.pr.commits[i];
-        const local_commit = group.commits[i];
+      if (group.pr.baseRefName !== group.base) {
+        group.dirty = true;
+      } else if (group.master_base && i > 0) {
+        // special case
+        // master_base groups cannot be compared by commit sha
+        // instead compare the literal diff local against origin
+        // gh pr diff --color=never 110
+        // git --no-pager diff --color=never 00c8fe0~1..00c8fe0
+        const diff_github = await github.pr_diff(group.pr.number);
+        const diff_local = await git.get_diff(group.commits);
+        if (diff_github !== diff_local) {
+          group.dirty = true;
+        }
+      } else if (!group.master_base && previous_group && previous_group.master_base) {
+        // special case
+        // boundary between normal commits and master commits
+
+        // collect all previous groups for sha comparison
+        const all_commits: Array<git.Commit> = [];
+        const previous_groups = group_value_list.slice(0, i);
+        for (const g of previous_groups) {
+          for (const c of g.commits) {
+            all_commits.push(c);
+          }
+        }
+        for (const c of group.commits) {
+          all_commits.push(c);
+        }
 
-        if (pr_commit.oid !== local_commit.sha) {
+        // compare all commits against pr commits
+        if (group.pr.commits.length !== all_commits.length) {
           group.dirty = true;
+        } else {
+          for (let i = 0; i < group.pr.commits.length; i++) {
+            const pr_commit = group.pr.commits[i];
+            const local_commit = all_commits[i];
+
+            if (pr_commit.oid !== local_commit.sha) {
+              group.dirty = true;
+            }
+          }
+        }
+      } else if (group.pr.commits.length !== group.commits.length) {
+        group.dirty = true;
+      } else {
+        // if we still haven't marked this dirty, check each commit
+        // comapre literal commit shas in group
+        for (let i = 0; i < group.pr.commits.length; i++) {
+          const pr_commit = group.pr.commits[i];
+          const local_commit = group.commits[i];
+
+          if (pr_commit.oid !== local_commit.sha) {
+            group.dirty = true;
+          }
         }
       }
     }