Skip to content

also delete bookmark on untrack #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jonathanlab wants to merge 1 commit into from
Closed

also delete bookmark on untrack #426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions packages/core/src/stacks/merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import type { Engine } from "../engine";
import { mergePR, updatePR, waitForMergeable } from "../github/pr-actions";
import { getPRForBranch } from "../github/pr-status";
import { getTrunk, list, push, rebase, runJJ, status } from "../jj";
import {
deleteBookmark,
getTrunk,
list,
push,
rebase,
runJJ,
status,
} from "../jj";
import { createError, err, ok, type Result } from "../result";
import type { MergeOptions, MergeResult, PRToMerge } from "../types";

Expand Down Expand Up @@ -172,11 +180,17 @@ export async function mergeStack(

merged.push(prItem);

// Abandon this commit immediately after merge, before rebasing next
// Must do this before rebase because rebase -r changes descendant changeIds
// Clean up the merged commit (same as arr sync does):
// 1. Abandon the commit (must do before rebase because rebase -r changes changeIds)
// 2. Delete the local bookmark
// 3. Untrack from engine
if (prItem.changeId) {
await runJJ(["abandon", prItem.changeId]);
}
await deleteBookmark(prItem.bookmarkName);
if (engine.isTracked(prItem.bookmarkName)) {
engine.untrack(prItem.bookmarkName);
}

if (nextPR) {
// Fetch to get the merged commit into local main
Expand Down
Loading