bstack 1.2.0 → 1.3.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.0";
+var version = "1.3.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([
@@ -457,6 +458,13 @@ var GitHubCliPlatform = class {
 			String(stackNumber)
 		]);
 	}
+	closePullRequest(pr) {
+		this.gh([
+			"pr",
+			"close",
+			String(pr.number)
+		]);
+	}
 	editPullRequestBase(pr, base) {
 		this.gh([
 			"pr",
@@ -719,11 +727,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;
@@ -737,6 +747,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];
@@ -770,6 +781,12 @@ function syncStack(dependencies, options) {
 		}), remote, options.draft);
 	} else if (transition.kind === "partial") reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
 	else reporter.progress("The native GitHub stack already has the correct members");
+	const currentIds = new Set(changes.map((change) => change.id));
+	const omittedPullRequests = transition.kind === "partial" ? [] : (previous?.changes ?? []).filter((change) => !currentIds.has(change.id)).map((change) => github.pullRequest(change.pullRequest)).filter((pullRequest) => pullRequest.state === "OPEN");
+	if (omittedPullRequests.length > 0) {
+		reporter.progress(`Closing ${omittedPullRequests.length} omitted pull request${omittedPullRequests.length === 1 ? "" : "s"}`);
+		for (const pullRequest of omittedPullRequests) github.closePullRequest(pullRequest);
+	}
 	reporter.progress("Synchronizing pull request titles and descriptions");
 	for (const [index, pr] of pullRequests.entries()) {
 		github.editPullRequest(pr, changes[index]);
@@ -796,10 +813,19 @@ function syncStack(dependencies, options) {
 		rewritten,
 		changes: changes.map((change, index) => ({
 			...change,
-			pullRequest: pullRequests[index]
+			pullRequest: pullRequests[index],
+			outcome: changeOutcome(change, index, pullRequests[index], previous, changes, base, createdBranches, pushedBranches)
 		}))
 	};
 }
+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");
@@ -913,10 +939,12 @@ 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}:`);
+	const changeCount = `${result.changes.length} change${result.changes.length === 1 ? "" : "s"}`;
+	console.log(values["dry-run"] ? `Would sync ${changeCount} against ${result.base}:` : `Synced stack against ${result.base} (${changeCount}):`);
 	for (const change of result.changes) {
+		const outcome = change.outcome ? `${change.outcome.padEnd(9)} ` : "";
 		const destination = change.pullRequest ? ` ${change.pullRequest.url}` : "";
-		console.log(`  ${change.oid.slice(0, 8)}  ${change.subject}${destination}`);
+		console.log(`  ${outcome}${change.oid.slice(0, 8)}  ${change.subject}${destination}`);
 	}
 }
 try {

package/package.json

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