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

branching: merge default change into stable

branching: merge default branch in stable to prepare 8.5.0 release The release is not fully ready, but the merging is non-trivial.

uncommit: abort if an explicitly given file cannot be uncommitted (BC) This corresponds to f4147ca63d39 in the core uncommit extension.

evolve: store --update flag state in evolvestate file Part of 9c522bdfc846 that wasn't yet accepted.

state: implement cmdstate.__contains__()

changelog: mention Martin work on phase-divergence

test: revert update from 5.0 record logic This revert the test changes from 90f94231db5d.

tests: remove note about already implemented --confirm with --continue 4544067b831b made --confirm work with --continue, but didn't update/remove this comment.

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.

evolve: compat patch for recordfilter change in mercurial This patch fix the broken things because of upstream changes in recordfilter() which is being used to select the hunks interactively. It fixes the test-uncommit-interactive.t by adding the compat layer. But for test-split.t I had to fix the tests manually. To make it more clear: splitting broke at evolve side because after that upstream change now interactive mode doesn't prompt "examine change to foo" if foo is mentioned explicitly using cli; and directly jumps to hunks selection prompt (well, only if there is any changes at hunks level) And the main issue is when file which is explicitly mentioned has no changes at hunk level (for e.g copy, rename, mode change, empty new file), because in that case you don't have any control on selection of that file and it would be included automatically in first cycle of interactive selection. And this "no changes at hunks level" was the reason for test-split.t breakage as now it didn't prompt for those files which are passed on cli. To fix this I have included some content in those files to make sure that tests still demonstrate the same behaviour as they were doing before breakage. Also, I replaced some "n" with "s" as it make more sense to skip all the changes to that file in one go instead of hitting "n" multiple times (if there were multiple hunks)

test: add file cancelation scenario for phase-divergence This improve the test coverage for corner cases.

test: introduce a more complete test for phase-divergence The test the preservation of "change" cancellation in multiple situation.

test: rename test about content divergent meta data The test now use a name in line with the other content divergence test cases.

test: cleanup title and doc phase-divergent cases

test: remove remaining duplicated file This file should have been removed in d02a7c8cdee5.

test: add test for content-divergence with file removal File addition/removal tends to introduce corner case. The actual test content comes from a Martin von Zweigbergk changesets.

test: clarify changeset concent in the first content-divergence test

branching: merge with stable merge with new changeset on stable.

branching: merge with test consolidation Conflict were simple once isolated.

branching: merge with stable This merge happens before the large test consolidation on stable.