Differential D21351

Improve "--hold", save/restore state, bookmark creation, and some warnings for "arc land" in Mercurial
ClosedPublic
Actions

Authored by epriestley on Jun 11 2020, 12:08 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Jan 2, 2:02 AM

	Unknown Object (File)
	Sun, Dec 29, 11:04 AM

	Unknown Object (File)
	Sat, Dec 28, 4:52 PM

	Unknown Object (File)
	Sat, Dec 28, 3:45 PM

	Unknown Object (File)
	Thu, Dec 26, 12:01 PM

	Unknown Object (File)
	Mon, Dec 23, 8:21 PM

	Unknown Object (File)
	Wed, Dec 18, 10:52 AM

	Unknown Object (File)
	Tue, Dec 17, 6:34 AM

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T9948: Modernize "arc land" for Mercurial: bookmark-to-branch, branch-to-self, multiple heads
T13546: Modernize the "arc land" workflow
Commits: rARC92f860ae9b2f: Improve "--hold", save/restore state, bookmark creation, and some warnings for…

Summary

Ref T13546. Ref T9948.

Make "--hold" show the same set of commands to manually push that the normal workflow would use.
Make save/restore state work.
Make bookmark creation prompt for confirmation.
Improve / provide some additional warnings and help text.

Test Plan

Ran various increasingly complex "arc land" workflows, e.g. "arc land --hold --onto fauxmark1 --onto fauxmark2 --into default . --revision 118 --trace"

Diff Detail

Repository

Branch

landx4

Lint

Lint Errors

Severity	Location	Code	Message
Error	src/land/engine/ArcanistMercurialLandEngine.php:117	XHP54	Formatted String
Warning	src/land/engine/ArcanistMercurialLandEngine.php:348	TXT3	Line Too Long
Advice	src/repository/state/ArcanistMercurialLocalState.php:13	XHP16	TODO Comment

Unit

Tests Passed

Build Status

Buildable 24642
Build 33974: Run Core Tests
Build 33973: arc lint + arc unit

Event Timeline

epriestley created this revision.Jun 11 2020, 12:08 AM

Harbormaster completed remote builds in B24641: Diff 50821.Jun 11 2020, 12:08 AM

epriestley requested review of this revision.Jun 11 2020, 12:08 AM

Fix pht() issue.

Harbormaster completed remote builds in B24642: Diff 50822.Jun 11 2020, 12:28 AM

Actually fix pht() issue.

Harbormaster completed remote builds in B24643: Diff 50823.Jun 11 2020, 12:28 AM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 11 2020, 12:31 AM

This revision was landed with ongoing or failed builds.

Closed by commit rARC92f860ae9b2f: Improve "--hold", save/restore state, bookmark creation, and some warnings for… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rARC92f860ae9b2f: Improve "--hold", save/restore state, bookmark creation, and some warnings for….

Revision Contents
Changeset List

Path

Size

src/

land/

engine/

ArcanistMercurialLandEngine.php

169 lines

repository/

state/

ArcanistGitLocalState.php

5 lines

ArcanistMercurialLocalState.php

55 lines

ArcanistRepositoryLocalState.php

4 lines

workflow/

ArcanistLandWorkflow.php

5 lines

Diff 50822

src/land/engine/ArcanistMercurialLandEngine.php

Loading...

src/repository/state/ArcanistGitLocalState.php

Loading...

src/repository/state/ArcanistMercurialLocalState.php

Loading...

src/repository/state/ArcanistRepositoryLocalState.php

Loading...

src/workflow/ArcanistLandWorkflow.php

Loading...