evolve: mention that not all successful operations currently update wdir

evolve: add progress support for --continue The progress starts where it left off when the previous command ran into merge conflicts.

evolve: reduce scope of progress-related variables

evolve: move progress-clearing out of _cleanup() The progress is only used with --all or --rev, so there's no need to clean it in any other case. It's therefore easier to clean it specifically in that case.

evolve: stop passing no-op "progresscb" into continueevolve() The "progresscb" doesn't do anything in the --continue case, so there's no need to pass it into continueevolve(). This lets us remove the --no-all that was added to the test as a workaround.

evolve: _solveunstable() update progress only once There's no need to draw it, then possibly write text over it (with --verbose), and then draw it again.

evolve: don't update progress just before clearing it _cleanup() will clear the progress, so there's little reason to update it just before (except for progress.debug=yes).

evolve: clean up progress bar also when using -r It looks like 1fe3da0b4601 (evolve: add --rev option to the evolve command, 2015-05-05) forgot to update the "showprogress" variable.

tests: add some basic testing of progress

evolve: increment progress *after* a whole merge commit is done The "re-stabilize" step was using the progress that was supposed to be for the next revision.

evolve: use util.acceptintervention() for closing transactions util.acceptintervention() will close the transaction on InterventionRequired.

evolve: use context manager for transactions

evolve: use consistent message and just re-raise InterventionRequired

evolve: use standard InterventionRequired instead of MergeFailure

evolve: don't use exception for local flow control The LocalMergeFailure class was added in 3f91654713dd (obsolete Move merge failure handling into stabilize code, 2012-08-20). I think the "if compat.hasconflict(r)" check was added later. Now that we have that check, we should use that for flow control instead. Note that this means that any unexpected exception from _relocatecommit() will now just raise (and roll back the transaction). I think that's an improvement.

evolve: reduce indentation with an early return statement

evolve: remove a useless return statement at end of function

test: move a test to an appropriate test file This patch introduce a new test file test-evolve-orphan-corner-cases.t for tests which covers corner cases.

test: improve the title of a test

test: remove duplicated test We have the test in test-evolve-orphan-split.t which is covering the same case this test does. Also this test states that evolve shows some error in split case, but now this is not the case we update to the top of splitted csets.

evolve: warn user for the metadata being lost in public divergence resolution This patch print warnings if some "extras" of a divergent changeset that is possibly important metadata which is being lost during the resolution of public divergence.

evolve: show a status message when merging leads to public cset I think it would be fine to tell the user that merging the two divergent csets while resolving public divergence resulted into the public cset itself. If you think we don't need to tell the user, then we can include this in debug-mode for debugging purposes at least.

test: use a shorter test name This is still long but easier to read.

stack: rename troubledcount to unstablecount

evolve: use --all by default (BC) allopt defaults to None to avoid touching _checkevolveopts(). If it were True by default, that function would always act like the flag was provided by user, and so using --abort, --stop, --continue or --rev on their own would never work (hg evolve will complain that you cannot specify both --rev and --all). A notable change in tests is "no troubled changesets" line that gets printed when using `hg evolve` to update to the evolved successor of working directory parent, but there were no actual instabilities.

tests: add --rev to hg evolve to reduce test changes for the next patch

tests: add --no-all to hg evolve to reduce test changes

evolve: don't update after instability resolution by default (BC)

tests: add --update to hg evolve to reduce test changes for the next patch

tests: don't create a nested repo for no reason

branching: merge with stable VErsion 8.5.0 got released

Added tag 8.5.1 for changeset 05c9dcf5512e

packaging: prepare version 8.5.1

test-compat: merge mercurial-4.5 into mercurial-4.4

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge mercurial-4.7 into mercurial-4.6

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge stable into mercurial-4.9

evolve: fix progress display with hg<4.7 Since d1aab9d82f5b (evolve: adapt for deprecated ui.progress(), 2019-01-14), the "item", "units" and "total" are all set to default values. The last one is especially bad since it results in a "spinner" instead of a progress bar.

packaging: mark extensions as tested with 5.0

branching: merge with stable

test-compat: merge mercurial-4.5 into mercurial-4.4

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge mercurial-4.7 into mercurial-4.6

test-compat: merge mercurial-4.8 into mercurial-4.7

evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case. [This re-install a changeset backed out for compatibility reason]

test-compat: merge mercurial-4.9 into mercurial-4.8

compat: drop support for Mercurial 4.4

test-compat: merge stable into mercurial-4.9

compat: backed out changeset cfcb7eedc666 That changesets breaks 4.4 compat. We will reinstall it for the next version.

test-compat: adapt test output to 4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge mercurial-4.7 into mercurial-4.6

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge mercurial-4.9 into mercurial-4.8

test-compat: merge stable into mercurial-4.9

compat: fix a typo in compat patch

changelog: mention extensions isolation (issue6121)

topic: only wrap wireprotocaps for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap _pushb2phases for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap handlecheckheads for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap wireprotobranchmap for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap _headssummary for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap desthistedit for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap _destupdatetopic for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap _destmergebranch for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap gettopicrepo for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap mergeupdate for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap committext for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only affect `hg commit` behavior for repo with topic This helps repository with and without topic to coexist in the same process.

topic: only wrap workingctx.__init__ for repo with topic This helps repository with and without topic to coexist in the same process.

topic: introduce a `hastopicext(repo)` function This function check if a repository has the extension enabled or not.

tests: consolidate the public-content-divergent test cases This commit move the public-content-divergent tests in dedicated test files.

evolve: improve inline documentation for the public divergence resolution

cleanup: remove a duplicated line

changelog: mention topic compatibility

branching: merge stable back into default

tescompat: revert test change for mercurial-4.9 We should still test against mercurial-4.9 expected output.

branching: merge 8.5.0 expected output in stable Upstream stable is now for mercurial 5.0

testcompat: open a branch dedicated to mercurial 4.9 Upstream merged its default branch into the stable one to prepare for Mercurial 5.0

topic: add compatibility for writing copy metadata in changelog.add() As seen in hg 0e41f40b01cc.

serverminitopic: add compatibility for branchcache that now uses self._entries A copy of 9b0cde5efbc9.

branching: merge stable into default

packaging: mark version as development version Thsi help to reduce confusion for people using evolve from source

Added tag 8.5.0 for changeset 33c617626fd9

packaging: prepare version 8.5.0

test-compat: merge mercurial-4.5 into mercurial-4.4

branching: merge stable back into default

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge mercurial-4.7 into mercurial-4.6

test-compat: merge mercurial-4.8 into mercurial-4.7

test-compat: merge stable into mercurial-4.8

changelog: merge 8.4.1 and 8.5.1 entries

branching: merge stable into default