git-stack-cli 2.9.2 → 2.9.3

package/package.json

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

package/src/app/App.tsx

@@ -5,6 +5,7 @@ import { CherryPickCheck } from "~/app/CherryPickCheck";
 import { DependencyCheck } from "~/app/DependencyCheck";
 import { DetectInitialPR } from "~/app/DetectInitialPR";
 import { DirtyCheck } from "~/app/DirtyCheck";
+import { FetchPullRequests } from "~/app/FetchPullRequests";
 import { GatherMetadata } from "~/app/GatherMetadata";
 import { GithubApiError } from "~/app/GithubApiError";
 import { HandleCtrlCSigint } from "~/app/HandleCtrlCSigint";
@@ -100,9 +101,11 @@ function MaybeMain() {
       <DependencyCheck>
         <DirtyCheck>
           <GatherMetadata>
-            <LocalCommitStatus>
-              <Rebase />
-            </LocalCommitStatus>
+            <FetchPullRequests>
+              <LocalCommitStatus>
+                <Rebase />
+              </LocalCommitStatus>
+            </FetchPullRequests>
           </GatherMetadata>
         </DirtyCheck>
       </DependencyCheck>
@@ -117,11 +120,13 @@ function MaybeMain() {
         <DirtyCheck>
           <GatherMetadata>
             <RequireBranch>
-              <LocalCommitStatus>
-                <DetectInitialPR>
-                  <Main />
-                </DetectInitialPR>
-              </LocalCommitStatus>
+              <FetchPullRequests>
+                <LocalCommitStatus>
+                  <DetectInitialPR>
+                    <Main />
+                  </DetectInitialPR>
+                </LocalCommitStatus>
+              </FetchPullRequests>
             </RequireBranch>
           </GatherMetadata>
         </DirtyCheck>

package/src/app/FetchPullRequests.tsx

@@ -0,0 +1,40 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Await } from "~/app/Await";
+import { Store } from "~/app/Store";
+import { colors } from "~/core/colors";
+import * as github from "~/core/github";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+export function FetchPullRequests(props: Props) {
+  const fallback = <Ink.Text color={colors.yellow}>Fetching pull requests…</Ink.Text>;
+
+  return (
+    <Await fallback={fallback} function={run}>
+      {props.children}
+    </Await>
+  );
+}
+
+async function run() {
+  const actions = Store.getState().actions;
+
+  try {
+    // gather all open prs in repo at once
+    // cheaper query to populate cache
+    await github.pr_list();
+  } catch (err) {
+    actions.error("Unable to fetch pull requests.");
+
+    if (err instanceof Error) {
+      actions.error(err.message);
+    }
+
+    actions.exit(24);
+  }
+}

package/src/app/Store.tsx

@@ -179,7 +179,7 @@ const BaseStore = createStore<State>()(
       json(value) {
         set((state) => {
           const node = pretty_json(value);
-          state.mutate.output(state, { node });
+          state.actions.debug(node);
         });
       },
 

package/src/app/SyncGithub.tsx

@@ -13,6 +13,7 @@ import { colors } from "~/core/colors";
 import * as github from "~/core/github";
 import { invariant } from "~/core/invariant";
 import { safe_exists } from "~/core/safe_exists";
+import { sleep } from "~/core/sleep";
 
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
@@ -159,16 +160,26 @@ async function run() {
 
     actions.unregister_abort_handler();
 
+    // invalidate cache for PRs we pushed
     actions.set((state) => {
-      // invalidate cache for PRs we pushed
       for (const group of push_group_list) {
         if (group.pr) {
           delete state.pr[group.pr.headRefName];
           delete state.cache_pr_diff[group.pr.number];
         }
       }
+    });
+
+    // wait a bit for github to settle after push / edits above
+    // we github.pr_list returns outdated information if called too quickly
+    await sleep(400);
 
-      // move to next step
+    // gather all open prs in repo at once
+    // cheaper query to populate cache
+    await github.pr_list();
+
+    // move to next step
+    actions.set((state) => {
       state.step = "post-rebase-status";
     });
   } catch (err) {

package/src/core/CommitMetadata.ts

@@ -30,11 +30,9 @@ type CommitGroupMap = { [sha: string]: CommitRangeGroup };
 export async function range(commit_group_map?: CommitGroupMap) {
   const DEBUG = process.env.DEV && false;
 
-  // gather all open prs in repo first
-  // cheaper query to populate cache
-  await github.pr_list();
-
-  const master_branch = Store.getState().master_branch;
+  const state = Store.getState();
+  const actions = state.actions;
+  const master_branch = state.master_branch;
   const master_branch_name = master_branch.replace(/^origin\//, "");
   const commit_list = await git.get_commits(`${master_branch}..HEAD`);
 
@@ -167,18 +165,16 @@ export async function range(commit_group_map?: CommitGroupMap) {
       // console.debug("  ", "group.base", group.base);
     }
 
-    if (DEBUG) {
-      console.debug({ group });
-    }
+    actions.json({ group });
 
     if (!group.pr) {
       group.dirty = true;
     } else {
       if (group.pr.baseRefName !== group.base) {
-        // console.debug("PR_BASEREF_MISMATCH");
+        actions.debug("PR_BASEREF_MISMATCH");
         group.dirty = true;
       } else if (group.master_base) {
-        // console.debug("MASTER_BASE_DIFF_COMPARE");
+        actions.debug("MASTER_BASE_DIFF_COMPARE");
 
         // special case
         // master_base groups cannot be compared by commit sha
@@ -191,9 +187,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
         let diff_local = await git.get_diff(group.commits);
         diff_local = normalize_diff(diff_local);
 
-        if (DEBUG) {
-          console.debug({ diff_local, diff_github });
-        }
+        actions.json({ diff_local, diff_github });
 
         // find the first differing character index
         let compare_length = Math.max(diff_github.length, diff_local.length);
@@ -220,11 +214,11 @@ export async function range(commit_group_map?: CommitGroupMap) {
             diff_local = JSON.stringify(diff_local).slice(1, -1);
 
             let pointer_indent = " ".repeat(diff_index - start_index + 1);
-            console.warn(`⚠️ git diff mismatch`);
-            console.warn(`              ${pointer_indent}⌄`);
-            console.warn(`diff_github  …${diff_github}…`);
-            console.warn(`diff_local   …${diff_local}…`);
-            console.warn(`              ${pointer_indent}⌃`);
+            actions.debug(`⚠️ git diff mismatch`);
+            actions.debug(`              ${pointer_indent}⌄`);
+            actions.debug(`diff_github  …${diff_github}…`);
+            actions.debug(`diff_local   …${diff_local}…`);
+            actions.debug(`              ${pointer_indent}⌃`);
           }
         }
       } else if (!group.master_base && previous_group && previous_group.master_base) {
@@ -245,10 +239,10 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
         // compare all commits against pr commits
         if (group.pr.commits.length !== all_commits.length) {
-          // console.debug("BOUNDARY_COMMIT_LENGTH_MISMATCH");
+          actions.debug("BOUNDARY_COMMIT_LENGTH_MISMATCH");
           group.dirty = true;
         } else {
-          // console.debug("BOUNDARY_COMMIT_SHA_COMPARISON");
+          actions.debug("BOUNDARY_COMMIT_SHA_COMPARISON");
           for (let i = 0; i < group.pr.commits.length; i++) {
             const pr_commit = group.pr.commits[i];
             const local_commit = all_commits[i];
@@ -259,10 +253,10 @@ export async function range(commit_group_map?: CommitGroupMap) {
           }
         }
       } else if (group.pr.commits.length !== group.commits.length) {
-        // console.debug("COMMIT_LENGTH_MISMATCH");
+        actions.debug("COMMIT_LENGTH_MISMATCH");
         group.dirty = true;
       } else {
-        // console.debug("COMMIT_SHA_COMPARISON");
+        actions.debug("COMMIT_SHA_COMPARISON");
         // 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++) {
@@ -270,6 +264,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
           const local_commit = group.commits[i];
 
           if (pr_commit.oid !== local_commit.sha) {
+            actions.json({ pr_commit, local_commit });
             group.dirty = true;
           }
         }