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

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.

compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4

evolve: when using evolve, cache files belong into the master repo

changelog: mention issue6089 fix

pick: update working dir branch (issue6089) Previously the working copy was left in an "inconsistent" state.

tests: rename test-grab to test-pick This match the new command name.

evolve: make sure div resolution don't replace the initial author (issue6113) Before this patch, divergence resolution logic taking the current user who is running the resolution command as the author of commit that will be created after merging the two divergent csets. This patch make sure that we preserve the initial author. Changes in test file reflect the fixed behaviour.

evolve: add test which demonstrate issue6113 This patch introducing a new test file which contains the test for issue6113 which is `test-evolve-content-divergent-distributed.t`. This test file is supposed to contain tests for distributed workflows. Next patch will fix the bug.

test: consolidate the content-divergent test cases This commit move most of the content divergent related test in dedicated and thematic test files.

changelog: mention the fix to issue6057

extensions: avoid enabling evolve for unrelated repositories (issue6057) The support for the `experimental.evolve` config have been there forever. So we can stop using the global variable. This help avoiding evolve to enable itself of repository that did not explicitly activated it. For example, this is useful for hgwebdir. Before this change, evolution feature had to be explicitly disabled or enabled in every single repository.

stack: improve set combination logic

stack: fix phasecache._phasesets check logic When _phasesets is not None, it's a list, and it contains set()s of revisions in a specific phase, starting from public, draft, secret and so on. But since repos are supposed to have the majority of revisions in public phase, the first element of this list is not a (potentially huge) set, but None. Previously this code tried to check if there's any element that is None, and was always finding None at index 0, so the short path was executed every time and the rest of the function was never used.

evolve: remove todo markers from a test which has been fixed

next: clarify tests related to `commands.update.check` test This clarify the test and help understand the next changeset.

stack: simplify phasecache checks in _stackcandidates()

evolve: fix divergence resolution when not merging a descendant In divergence resolution, when we merge other cset with divergent one we pass a `mergeancestor` arg to merge.update() and before this patch we were passing `mergeancestor` as True in every case. But it should be True only when we are merging a descendant onto an ancestor. When mergeancestor is True it does two things: 1) allows the merge if the destination is the same as the parent of the ctx (so we can use graft to copy commits) 2) informs update that the incoming changes are newer than the destination so it doesn't prompt about "remote changed foo which local deleted". So this patch change it to pass `mergeancestor` as True only when it is required. And changes in test file shows that it wasn't prompting either in those cases when it should (acc. to 2nd point) Test written by Pierre-Yves David, based the one updated in 5dbaabfe2c59.

test: fix a phase divergence test case to actually not contains conflict The previous test case had a conflict, but that conflict is currently not raise by phase divergence resolution. This is an independent bug to solve.

tests: use current instability names everywhere

test: apply unstability resolution to `test-unstability-resolution-result.t` The test cases in this file probably deserved to be dispatched in other more thematic test file.

test: rename and clarify content of test-unstable-content-divergent.t The troubles → instabilities renaming was not applied here.

test: rename and clarify content of test-unstable-orphan.t The troubles → instabilities renaming was not applied here.

evolve: refactor the code which swap two nodes (in divergence resolution) I see that we are using the code to swap the "divergent" and "other" node; and updating the evolvestate accordingly at many places in divergence resolution. This patch extract that code to a function. Although I don't have strong opinion on this patch. It's a volunteered patch to remove some redundancy.

evolve: remove tmpctx arg from _resolvephasedivergent() Before this patch, in _resolvephasedivergent() function we were passing an optional argument "tmpctx" which was used to store a rebased version of bumped if required. But for sake of simplicity we can achieve the same results even without passing this "tmpctx" into that function. No changes in test files demonstrate that this patch don't break anything.

doc: clarify _resolvephasedivergent role and constraint Small documentation patch before larger changes.

branching: merge with stable

evolve: unindent some lines caught by flake8 The message was: "E117 over-indented".

obsexchange: avoid importing io/StringIO module with a different name Since we're not interested in the whole module, let's shorten the imports and aviod the lint warnings. Otherwise pep8-naming complains: - import io as StringIO: N812 lowercase imported as non lowercase - import StringIO as io: N813 camelcase imported as lowercase

evolve: remove unused StringIO import

compat: add support for new arg name in memfilectx.__init__ This makes us compatible with 550a172a603b (memctx: rename constructor argument "copied" to "copysource" (API), 2019-03-19).

topic: make topics compatible with branchmap refactor See https://phab.mercurial-scm.org/D5290

evolve: compat patch to fix broken evolve obsdiscovery This patch preserve the compatibility for the changes upstreamed by e5ece0f46b40 in hg-committed.

tests: add obslog output to some tests for divergence resolution As suggested by Boris Feld.

tests: add tests for divergence resolution with split+amend As suggested by Boris Feld. G: changed tests/test-evolve-phase-divergence.t

test: use 'split' instead of 'splitted' in the tests

evolve: drop the "computing new diff message" for phase-divergence Future code update will remove this message, dropping it early clarify the future diff.

evolve: clarify output when phase-divergence resolution results in no change I found it pretty confusing that it said "committed as abcd1234" when no commit was created.

tests: reduce dependence on previous tests for setup The tests in test-evolve-phase-divergence.t built on each other for no good reason, which makes the tests hard to modify and hard to read. This patch cleans up some of them. We should clean up the rest too, but the rest won't matter for my next patch, so I haven't bothered.

branching: merge with stable

topicmap: add compatibility for branchcache that now uses self._entries

evolve: fix over-idented block

tests: create "private" repository in already-updated state I'm going to add more copies of the repo and it's easier to work with the repo if it's already been updated.

branching: merge with stable

touch: use action "touch", not "<function touch at ...>", in precheck I just got this message: abort: cannot <function touch at 0x7fde174b69b0> public changesets: f177c51ae98f It has been this way since 1b7b9acda2a9 (touch: use precheck to validate revision, 2017-07-23).

prune: use action "prune", not "touch", in precheck We have been using "touch" since 06ee4ec88190 (prune: use precheck to validate revision, 2017-07-23). That commit modified the tests, so it kind seemed intentional, but I suspect it was still just an oversight.

evolve: test a common case of public divergence evolve: in pubdiv, handle the case when public branch is behind the mutable In public divergence, when public branch is behind the mutable one the behaviour that this patch added is that we relocate the draft one to public side. This should be fine in most case, but might be an issue in some other (eg, when the draft side of the divergence is rebase away from ancestors it relies on.) Test written by Pierre-Yves David <pierre-yves.david@octobus.net>

evolve: add condition in case of pubdiv to not swap the two div csets In public divergence, we have pinned the public cset to the local side when merge is performed. And in divergence resolution implementation divergent cset is the one who is kept at the local side, so to say this in one line: we have pinned public cset to the divergent side. However, in some cases we need to swap the "divergent" and "other" but we can't swap them in case of public divergence as thought would cause an error because of not being able to relocate public cset.