Show push target in Git action progress stages

- Include branch-based remote target in push progress text - Update logic and tests for commit+push and force-push flows

Julius Marminge committed 9 months ago

Commit cc378651 parent a6b9ece3 files · +14 −4Browse files

Unified · Split

3 files

       hasCustomCommitMessage: false,
       hasWorkingTreeChanges: true,
       forcePushOnly: true,
+      pushTarget: "origin/feature/test",
     });
-    assert.deepEqual(stages, ["Pushing..."]);
+    assert.deepEqual(stages, ["Pushing to origin/feature/test..."]);
   });
   it("includes commit stages for commit+push when working tree is dirty", () => {
       action: "commit_push",
       hasCustomCommitMessage: false,
       hasWorkingTreeChanges: true,
+      pushTarget: "origin/feature/test",
     });
-    assert.deepEqual(stages, ["Generating commit message...", "Committing...", "Pushing..."]);
+    assert.deepEqual(stages, [
+      "Generating commit message...",
+      "Committing...",
+      "Pushing to origin/feature/test...",
+    ]);
   });
 });

   hasCustomCommitMessage: boolean;
   hasWorkingTreeChanges: boolean;
   forcePushOnly?: boolean;
+  pushTarget?: string;
 }): string[] {
   const shouldIncludeCommitStages =
     !input.forcePushOnly && (input.action === "commit" || input.hasWorkingTreeChanges);
     : input.hasCustomCommitMessage
       ? ["Committing..."]
       : ["Generating commit message...", "Committing..."];
+  const pushStage = input.pushTarget ? `Pushing to ${input.pushTarget}...` : "Pushing...";
   if (input.action === "commit") {
     return commitStages;
   }
   if (input.action === "commit_push") {
-    return [...commitStages, "Pushing..."];
+    return [...commitStages, pushStage];
   }
-  return [...commitStages, "Pushing...", "Creating PR..."];
+  return [...commitStages, pushStage, "Creating PR..."];
 }
 export function summarizeGitResult(result: GitRunStackedActionResult): {

       if (!confirmed) return;
       onConfirmed?.();
+      const pushTarget = gitStatus?.branch ? `origin/${gitStatus.branch}` : undefined;
       const progressStages = buildGitActionProgressStages({
         action,
         hasCustomCommitMessage: !!commitMessage?.trim(),
         hasWorkingTreeChanges: !!gitStatus?.hasWorkingTreeChanges,
         forcePushOnly: forcePushOnlyProgress,
+        pushTarget,
       });
       const progressToastId = toastManager.add({
         type: "loading",