Page MenuHomePhabricator

Preserve bookmarks across "hg rebase --keep --collapse", and destroy them before "hg strip/prune"
ClosedPublic

Authored by epriestley on Jul 8 2020, 11:21 PM.
Tags
None
Referenced Files
F19824880: D21397.id50934.diff
Sun, Mar 8, 4:34 AM
F19820384: D21397.diff
Fri, Mar 6, 1:28 PM
F19816146: D21397.id50933.diff
Thu, Mar 5, 4:16 AM
F19661096: D21397.id50933.diff
Feb 7 2026, 5:46 AM
F19617573: D21397.id50933.diff
Feb 4 2026, 6:36 AM
F19609701: D21397.id.diff
Feb 3 2026, 1:57 PM
F19525240: D21397.id50933.diff
Jan 18 2026, 7:26 AM
F19385270: D21397.id50933.diff
Dec 27 2025, 2:06 AM
Subscribers
None

Details

Summary

See PHI1808. Currently, "arc land <some bookmark>" does not destroy the bookmark in Mercurial. There are three issues here:

  • "hg rebase --keep --collapse" moves bookmarks to the rewritten commits;
  • "hg strip" moves bookmarks backwards;
  • "hg prune" moves bookmarks backwards.

To get around "hg rebase", save and restore bookmark state.

To get around "hg strip" and "hg prune", explicitly destroy bookmarks pointing at commits before we strip/prune those commits.

Test Plan
  • Ran "arc land <some bookmark> --trace". Saw arc reset the bookmark position after rebasing, and destroy the bookmark explicitly before stripping.
  • When the workflow exited, saw no more bookmark (previously: bookmark existed and pointed at a possibly-intermediate state).

Diff Detail

Repository
rARC Arcanist
Branch
hg8
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 24752
Build 34135: Run Core Tests
Build 34134: arc lint + arc unit