Differential D21397

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

Authored by epriestley on Jul 8 2020, 11:21 PM.

Tags

None

Referenced Files

	F13092225: D21397.id50934.diff
	Thu, Apr 25, 3:31 AM

	Unknown Object (File)
	Wed, Apr 24, 9:06 AM

	Unknown Object (File)
	Tue, Apr 23, 5:59 PM

	Unknown Object (File)
	Sat, Apr 20, 5:25 PM

	Unknown Object (File)
	Fri, Apr 19, 8:09 PM

	Unknown Object (File)
	Fri, Mar 29, 5:12 AM

	Unknown Object (File)
	Wed, Mar 27, 11:44 AM

	Unknown Object (File)
	Mar 16 2024, 1:53 AM

Subscribers

None

Details

Reviewers: None
Commits: rARC2565cc7b4d1d: (stable) Promote 2020 Week 27
rARC65cda1596f25: Preserve bookmarks across "hg rebase --keep --collapse", and destroy them…

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

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

epriestley created this revision.Jul 8 2020, 11:21 PM

Harbormaster completed remote builds in B24752: Diff 50933.Jul 8 2020, 11:21 PM

epriestley requested review of this revision.Jul 8 2020, 11:21 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jul 9 2020, 12:43 AM

Closed by commit rARC65cda1596f25: Preserve bookmarks across "hg rebase --keep --collapse", and destroy them… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rARC65cda1596f25: Preserve bookmarks across "hg rebase --keep --collapse", and destroy them….

epriestley added a commit: rARC2565cc7b4d1d: (stable) Promote 2020 Week 27.Jul 11 2020, 4:34 PM

Revision Contents
Changeset List

Path

Size

src/

land/

engine/

ArcanistMercurialLandEngine.php

67 lines

Diff 50934

src/land/engine/ArcanistMercurialLandEngine.php

Loading...