bstack 1.2.1 → 1.4.0

package/dist/bstack.mjs

@@ -6,7 +6,7 @@ import * as v from "valibot";
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region package.json
-var version = "1.2.1";
+var version = "1.4.0";
 //#endregion
 //#region src/command.ts
 var CommandError = class extends Error {
@@ -279,6 +279,7 @@ var GitCliRepository = class {
 			remote,
 			...refspecs
 		]);
+		return branches.filter((branch) => existing.get(branch.name) !== branch.oid).map((branch) => branch.name);
 	}
 	statePath() {
 		return this.git([
@@ -509,6 +510,25 @@ var GitHubCliPlatform = class {
 	}
 };
 //#endregion
+//#region src/output.ts
+function formatSyncResult(result, dryRun) {
+	const changeCount = `${result.changes.length} change${result.changes.length === 1 ? "" : "s"}`;
+	const lines = [dryRun ? `Would sync ${changeCount} against ${result.base}:` : `Synced stack against ${result.base} (${changeCount}):`];
+	if (dryRun) {
+		for (const change of result.changes) lines.push(`  ${change.oid.slice(0, 8)}  ${change.subject}`);
+		return lines.join("\n");
+	}
+	for (const outcome of result.outcomes) {
+		if (outcome.outcome === "closed") {
+			const { pullRequest } = outcome;
+			lines.push(`  ${outcome.outcome.padEnd(9)} #${pullRequest.number}  ${pullRequest.title} ${pullRequest.url}`);
+			continue;
+		}
+		lines.push(`  ${outcome.outcome.padEnd(9)} #${outcome.pullRequest.number}  ${outcome.change.subject} ${outcome.pullRequest.url}`);
+	}
+	return lines.join("\n");
+}
+//#endregion
 //#region src/reporter.ts
 var ConsoleReporter = class {
 	progress(message) {
@@ -702,7 +722,8 @@ function syncStack(dependencies, options) {
 			base,
 			remote,
 			rewritten,
-			changes: [...changes]
+			changes: [...changes],
+			outcomes: []
 		};
 	}
 	reporter.progress("Reading the previous stack state");
@@ -726,11 +747,13 @@ function syncStack(dependencies, options) {
 		}
 	}
 	reporter.progress(`Pushing ${changes.length} remote branch${changes.length === 1 ? "" : "es"}`);
+	let pushedBranches = /* @__PURE__ */ new Set();
 	try {
-		repository.pushBranches(remote, changes.map((change) => ({
+		const updatedBranches = repository.pushBranches(remote, changes.map((change) => ({
 			name: change.remoteBranch,
 			oid: change.oid
 		})));
+		pushedBranches = new Set(updatedBranches);
 	} catch (error) {
 		if (isReorder) restorePreviousStack(github, previous, base, remote, reporter, error);
 		throw error;
@@ -744,6 +767,7 @@ function syncStack(dependencies, options) {
 		reporter.progress(`Creating pull request: ${change.subject}`);
 		return github.createPullRequest(change, pullRequestBase, options.draft);
 	});
+	const createdBranches = new Set(changes.filter((_change, index) => existing[index] === void 0).map((change) => change.remoteBranch));
 	if (changes.length === 1) {
 		if (transition.kind === "partial") reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
 		const pullRequest = pullRequests[0];
@@ -803,16 +827,35 @@ function syncStack(dependencies, options) {
 	if (stackNumber !== void 0) updatedStack.stackNumber = stackNumber;
 	writeUpdatedState(stateStore, state, previous, updatedStack);
 	reporter.progress("Saved the local stack state");
+	const synchronized = changes.map((change, index) => ({
+		...change,
+		pullRequest: pullRequests[index]
+	}));
+	const outcomes = synchronized.map((change, index) => ({
+		outcome: changeOutcome(change, index, change.pullRequest, previous, changes, base, createdBranches, pushedBranches),
+		change,
+		pullRequest: change.pullRequest
+	}));
+	outcomes.push(...omittedPullRequests.map((pullRequest) => ({
+		outcome: "closed",
+		pullRequest
+	})));
 	return {
 		base,
 		remote,
 		rewritten,
-		changes: changes.map((change, index) => ({
-			...change,
-			pullRequest: pullRequests[index]
-		}))
+		changes: synchronized,
+		outcomes
 	};
 }
+function changeOutcome(change, index, pullRequest, previous, changes, base, createdBranches, pushedBranches) {
+	if (createdBranches.has(change.remoteBranch)) return "created";
+	const previousIndex = previous?.changes.findIndex((candidate) => candidate.id === change.id);
+	const previousBase = previousIndex === void 0 || previousIndex < 0 ? void 0 : previousIndex === 0 ? previous.base : previous.changes[previousIndex - 1].remoteBranch;
+	const currentBase = index === 0 ? base : changes[index - 1].remoteBranch;
+	const metadataChanged = pullRequest.title !== change.subject || pullRequest.body !== change.body;
+	return pushedBranches.has(change.remoteBranch) || previousBase !== currentBase || metadataChanged ? "updated" : "unchanged";
+}
 function restorePreviousStack(github, previous, base, remote, reporter, rebuildError) {
 	const rebuildMessage = rebuildError instanceof Error ? rebuildError.message : String(rebuildError);
 	reporter.progress("Rebuild failed; restoring the previous native GitHub stack");
@@ -926,11 +969,7 @@ function main() {
 		draft: values.draft,
 		dryRun: values["dry-run"]
 	});
-	console.log(`${values["dry-run"] ? "Would sync" : "Synced"} ${result.changes.length} change${result.changes.length === 1 ? "" : "s"} against ${result.base}:`);
-	for (const change of result.changes) {
-		const destination = change.pullRequest ? ` ${change.pullRequest.url}` : "";
-		console.log(`  ${change.oid.slice(0, 8)}  ${change.subject}${destination}`);
-	}
+	console.log(formatSyncResult(result, values["dry-run"]));
 }
 try {
 	main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bstack",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "license": "MIT",
   "repository": {