@biffo/cli 0.198.1 → 0.198.3

package/dist/index.js

@@ -1070,6 +1070,15 @@ var GitAdapter = class {
   async createBranch(cwd, branch) {
     await execa2("git", ["switch", "-c", branch], { cwd });
   }
+  /**
+   * Switch to an existing branch. Fails if it does not exist, and — deliberately
+   * — if the switch would discard uncommitted work: this is the undo half of
+   * `createBranch` (#984), so it must never be able to destroy the tree it is
+   * putting back.
+   */
+  async switchBranch(cwd, branch) {
+    await execa2("git", ["switch", branch], { cwd });
+  }
   /**
    * Push the current HEAD to `branch` on the remote. When `token` is given and
    * the remote is HTTPS, it's embedded in the push URL for auth (SSH/file
@@ -2937,8 +2946,44 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
     throw new Error(`${options.cwd} is not a git repository.`);
   }
   const branch = upgradeBranchName(fromVersion, toVersion);
+  const callerBranch = await git.currentBranch(options.cwd);
   log.step(1, 4, `Creating branch ${branch}`);
   await git.createBranch(options.cwd, branch);
+  try {
+    await buildCommitAndOpenPr(
+      options,
+      deps,
+      plan,
+      migrations,
+      fromVersion,
+      toVersion,
+      breaking,
+      theirsDir,
+      coreVersionCleanup,
+      branch,
+      token
+    );
+  } finally {
+    await restoreCallerBranch(git, options.cwd, callerBranch, branch);
+  }
+}
+async function restoreCallerBranch(git, cwd, callerBranch, upgradeBranch) {
+  if (callerBranch === "HEAD" || callerBranch === "") {
+    log.warn(
+      `Left ${cwd} on ${upgradeBranch}: HEAD was detached on entry, so there is no branch to restore (#984).`
+    );
+    return;
+  }
+  try {
+    await git.switchBranch(cwd, callerBranch);
+  } catch {
+    log.warn(
+      `Could not switch ${cwd} back to ${callerBranch} \u2014 it is still on ${upgradeBranch}. Restore it with \`git switch ${callerBranch}\` (#984).`
+    );
+  }
+}
+async function buildCommitAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir, coreVersionCleanup, branch, token) {
+  const { git } = deps;
   const applied = applyUpgradePlan(options.cwd, plan, theirsDir);
   const carried = applyMigrationCarry(options.cwd, migrations);
   writeInstanceCoreVersion(options.cwd, toVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.198.1",
+  "version": "0.198.3",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",