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
Unknown Object (File)
Sat, Feb 1, 11:08 PM
Unknown Object (File)
Sun, Jan 26, 3:15 AM
Unknown Object (File)
Tue, Jan 21, 12:37 PM
Unknown Object (File)
Jan 18 2025, 7:36 AM
Unknown Object (File)
Jan 15 2025, 3:32 PM
Unknown Object (File)
Dec 27 2024, 6:44 PM
Unknown Object (File)
Dec 27 2024, 6:41 PM
Unknown Object (File)
Dec 27 2024, 5:38 PM
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