test-compat: merge stable into mercurial-5.2

topic: hg <= 4.8 compatibility for wrapping exchange._checkpublish() phase-divergent update to 1a81bbc94d45:

branching: merge with stable

topic: check that exchange._checkpublish() exists before wrapping it

head-checking: also test single head enforcement with topic They are an important part of why we want this.

head-checking: ignore obsoleted section when checking head creation locally Same as for the server side check, these do not need to be taken in account.

head-checking: ignore obsolete section when checking for single heads This overwrite the core code that enforce single heads to ignore obsolete section. That way older obsolete version of a branch no longer prevent the new version to be pushed.

head-checking: update changelog

head-checking: add test variant mixing branch and topics

head-checking: add test variants with topics

head-checking: backport fix from 7d5455b988ec See 7d5455b988ec for details. Having a version in the evolve repository allow us to check the behavior when topic is enabled. It will also become the base of further head checking fix and topic compatibility.

head-checking: filter out obsolete heads when checking for new heads This does not affect any tests right now, but this will be useful for the next changeset. This is also the start of a more aggressive removal of obsolete heads in places where it does not make sense to take them into account.

topics: fix auto-publish=abort with servers publishing bare branches Before this change, servers that automatically publish bare branches were detected as "non publishing" and the check for automatic publishing on push assumed nothing was to be published. Now we signal the server-side config to clients via a new capability so that they can adjust their behavior.

evolve: fixed some typos in stablerangecache LONG_MESSAGE (issue6279) phase-divergent update to bf37ba1c80ee

evolve: fixed some typos in stablerangecache LONG_MESSAGE, fix #6279

evolve: fixed some typos in stablerangecache LONG_MESSAGE, fix #6279

branching: merge stable in default

WIP: fix

WIP: rotate loop

WIP: test

build: make docs/conf.py compatible with py3 I don't even know what this file does, but it made our Debian build fail on py3 because it attempted to pass unicode to `mercurial.ui.setconfig()`.

obshistory: add _debugobshistorydisplaypredsandmarkers() and test it

obshistory: make patchavailable() handle predecessors too

templatekw: add obsorigin keyword

obshistory: implement predecessorsandmarkers() for obsorigin

fold: proposal for output improvement Listing other changeset we got folded with seems like a good idea. We need to think about the case where changesets we got folded with is filtered.

obslog: add display of precursor information to the default template This will still only be output when the user passes --precursors to the command (otherwise the data just won't be there). This addresses a common user request, where they actually would find more intuitive to use --precursors --no-successors.

obslog: add flags to control the output of precursors and successors With just this change, precursors are only shown in structured output.

obslog: extract display of a markers to its own function

tests: allow an empty merge commit to have tests pass without too many changes Not the greatest fix, but this allows us to have the same test case for all versions of Mercurial. Hash of 29 changes because instead of both parents only one is set in hg 5.3.

uncommit: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes potential quick-access desync problems where repo[b'.'] would be different from repo.dirstate.p1().

touch: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes potential quick-access desync problems where repo[b'.'] would be different from repo.dirstate.p1().

evolve: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes an actual quick-access desync problem where repo[b'.'] would be different from repo.dirstate.p1(), as demonstrated by test-evolve-phase-divergence.t when ran on hg 5.3rc0 and later. Modified _uncommitdirstate() too, because it is used in dirstatedance(), which sometimes follows repo.setparents() calls.

tests: demonstrate that evolve swaps parents of merge commits Tests currently pass, don't forget to change FIXME items.

ci: cache pytype-related files between runs

evolve: add pre-check logic for creation of phase divergence locally Changes in tests reflect the added behaviour.

evolve: add test to show that user can create phase-divergence locally After resolution of phase-divergence, user can locally create phase-divergence by rewriting the old bumped (obsolete now) changeset. Next patch will be adding the pre-check logic for creation of this phase-divergence.

evolve: remove unnecessary code since it's been covered already We don't need this logic any more since the case of "two divergent csets where one is the parent of other" has been handled correctly by the logic present in method _prepcontentdivresolution() This is how things works in method _prepcontentdivresolution() for our case i.e "content-divergence with parent-child relation": cset_b (content-divergent) | cset_a (content-divergent) | ~ Acc. to revision selection criteria: "divergent" = min_revision(cset_a, cset_b) So always "divergent" will be cset_a and "other" will be "cset_b" and resolution parent will be the successor of parent of cset_a Both the csets will be merged and resolution cset will be based on correct revision. The result could be wrong only in the case when "divergent" is cset_b which is not possible acc. to the current logic.

test: no need to look at full log

evolve: refactor content-divergence resolution logic > What is the case we are looking at? This is about refactoring the part of content-div resolution logic where it decides which cset should be relocated and where. > What is a "topologicial common ancestors" vs a "greatest common ancestors"? `tca` is an ancestor which we can decide/find by looking at the at graph visually for e.g ``` c3(*) c4(*) | | c2(x) c1(x) c5 | / \ | / c0 ``` (c5 is the successor of c2 and c1) now here, `tca` of c3 and c4 is: c0 `gca` of c3 and c4 is: c5 > What is the new top-level logic/behavior that makes it better? The old code had some unnecessary edge cases just because we were using `gca`, since it can point to a revision that is not a topological ancestor. For e.g see b779b40f996e Eventually, the code around this was getting messy unnecessarily. So I looked into it and found a simple and more robust approach. And in new code, it is simple and straightforward (and easy to understand), where we handle the following 4 cases when solving content-div: 1) when both are on the same parent => (no need to do anything special, and simply proceed) 2) both are on the different parent but a) `tca` is the parent of one of them or b) there is no non-obsolete revision between `tca` and one of the divergent cset. => (relocate one to the other side and proceed) 3) both are on different parents and `tca` is not the parent of any of them and there is at least one non-obsolete cset between tca and both the divergent cset i.e (tca::div1) and (tca::div2) both the ranges have at least one non-obs revision. => (this is the case which we don't handle yet, but the solution would be to prompt the user to choose an evolve destination.) 4) both are in the parent-child relation => (both are merged and new cset will be based on the successor of `tca`) Changes in test-evolve-issue5958.t demonstrate that new code also covered case4 because in a resolution of "two divergent csets with parent-child relation" there should be one cset as a result and no orphan revs (as you can see there was an orphan before this patch).

evolve: remove duplicated code See at line 500.

evolve: make necessary changes in a test to reflect a fix in next patch

evolve: add quotes around the action in msg of pre-checking

metaedit: use pre-checking before rewriting csets Changes in test file demonstrate the changed behaviour.

evolve: update the pre-check message for risk of orphans

evolve: add pre-check logic for creation of phase divergence locally Changes in tests reflect the added behaviour.

evolve: add test to show that user can create phase-divergence locally After resolution of phase-divergence, user can locally create phase-divergence by rewriting the old bumped (obsolete now) changeset. Next patch will be adding the pre-check logic for creation of this phase-divergence.

evolve: remove a check which is already done by rewriteutil.precheck() We have tests to check if fold is being performed on public cset. There is no changes in test files because testing that never touched the part this patch removes, and already caught in rewriteutil.precheck()

evolve: add pre-check logic for content-divergence in rewriteutil.precheck() For now, pre-check will abort if rewriting a rev create divergence (and config experimental.evolution.allowdivergence is not set to True). But this behaviour can be improved where instead of abort maybe we can confirm the user to either proceed with divergence or some other options depends on what command user is running. Changes in test file are used to overrides the pre-check for testing purpose (using experimental.evolution.allowdivergence=yes).

topic: make in-memory rebase preserve topic The override code thought that `__init__` would return the runtime instance, but it's actually the first argument to the function (the `self` argument), so the code had no effect at all before this patch. I think the bug only affected in-memory rebase because the in-working-copy rebase used the current topic, which was set correctly since 5156a67f66a6 (topics: update current topic to the topic of newly rebased commit (issue5551), 2017-06-29).

Temporary commit for time measurement of test file + pandoc

ci: Add CI job for building the documentation

tutorial: compile the tutorial in rst so it can be included

tutorial: run the tutorial test file to update to latests ui messages

ignore: fix hgignore to point to the correct folder Files might have been imported initially as docs/training but were moved to docs/tutorial and the hgignore was likely forgotten.

stack: rename stack.revs into stack.indexedrevs They are accessible by an index, and are sorted. But they don't include all revisions for show in showstack().

stack: return from behindcount() early Reduces indentation.

stack: use self._revs in stack.behindcount() This code also doesn't care about the order of revisions, it just wants all revs except stack base, and that's what self._revs is.

stack: use self._revs in stack.heads() No code cares about the ordering of the heads anyway, so let's use the unordered property that doesn't need to be sliced (because it doesn't include base).

pick: Add a test to check that pick pick the right content

WIP on handling stacks

test: add a test for current behavior of precursors revset The precursors revset currently returns the closest predecessors of a revset. If these predecessors are not known locally, it returns an empty list.

obshistory: give a more correct name to a variable This variable holds a list of predecessors, which obslog presents to graphmod as parents so the latter could understand the data without the need to introduce another graph edge type specifically for predecessors. Also remove debug comments.

tests: unindent lines that only have one leading space One space is not even defined in our .t files syntax.

rewind: make __rewind-hash__ extra field be bytes

touch: make __touch-noise__ extra field be bytes

branching: merge with stable

evolve: fix some documentation grammar/typos

evolve: fix some documentation grammar/typos

changelog: mention the recent evolve improvements

tests: merge two tests about split changesets Because the removed test case is essentially already included in the succeeding one, the tests are merged by removing the first.

evolve: support successors of ancestor of orphan with multiple roots The previous code checked that the set of successors has a single root. However, there’s no reason to require that in general. Example: o 6 | o 5 |\ | o 4 | | o | 3 |/ | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3, 4 and 6. We are considering the case when 2 gets evolved. The roots are [3, 4] and the heads are [6]. Before the change, the user was asked which destination to choose, but there was only one choice (6). After the change, 6 is chosen as the destination.

evolve: support ancestor of orphan split with unrelated changeset in between This is done by searching for roots and heads within the range delimited on both sides by the target revs instead of just within the target revs. Example: o 5 | o 4 | o 3 | | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3 and 5. We are considering the case when 2 gets evolved. Before the change, both roots and heads were [3, 5]. The user was offered a choice between 3 and 5 as the destination. After the change, roots are [3] and heads are [5]. 5 is chosen as the destination.

exchange: deal with empty obscommon The case can happen, we better support it.

topic: compat with tr.changes[b'phases'], it's now a list

topic: fix compatibility issues caused because of change in transaction API In 36f08ae87ef687be53a59bd87376bcfbe4479205 in core mercurial, `_validator` attribute to transaction class was removed and a dict was introduced. It added a `addvalidator()` function to transaction class which can be used to register multiple validator callbacks. This updates the code to use `addvalidator()` when `_validator` attribute is not present.

obsexchange: fallback to simpler request for dumb http server If the http server cannot accept many arguments, avoid sending too large requests (at the cost of more data exchanged). A better solution would be to aggregate contiguous range, but this is a question for later.

obsexchange: swap the 'common' and 'missing' clause

obsdiscovery: avoid considering locally hidden changeset This looks like a dubious optimisation

obsdiscovery: add a test where some common node are hidden This is useful to prevent regression.

tests: use appropriate Python (2 or 3) for dummyssh

evolve: add missing 'of' in message The message refers to the changeset that is currently evolved. Therefore the message needs an additional 'of' to be correct.

test: fix graph label in test-push-checkheads-pruned-B5.t They were wrong.

readme: mention compat string format

readme: copywrite the section about branch policy, wrap long lines

compat: update hg-X.Y compat comments and test them

contrib: add a script to check release in compat comments that have node hash

changelog: add an entry about the cleanup

evolve: drop compat for pre-4.5 context.memfilectx()

compat: update a couple of obviously outdated version comments

evolve: drop pre 4.0 compat for dirstate.parentchange()

evolve: drop 4.5 compat for scmutil.resolvehexnodeidprefix()

evolve: drop 4.5 compatibility for patch in tryimportone()

evolve: drop 4.5 compatibility with `patch.extract` API

evolve: drop 4.5 compatibility for template keywords

topic: drop 4.5 compatibility for template keywords

compat: drop 4.5 compatibility for strdiff

compat: drop 4.5 compatibility layer for log utility

compat: drop 4.5 related compatibility around wireprotocol module

compat: directly use status attribute instead of the compat layer With 4.5 dropped, this compat layer is no longer needed.

compat: directly use function from dateutil Since support for 4.5 have been dropped we no longer needs this indirection.

compat: drop 4.5 compatibility for `_filterederror`

compat: drop import compatibility <= 4.5 for `forcebytestr` We no longer support 4.5

tests: adapt now that Mercurial clears the merge state for empty wdir `hg evolve` forgot to clear the merge state when its attempt to commit resulted in no commit because the working copy had no changes. That resulted in test-evolve-issue5967.t showing a conflict state that shouldn't be there. The responsibility for clearing the merge state was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear resolved mergestate even if working copy is clean, 2020-02-28), so the bug is now fixed in `hg evolve`, which impacts that test case. CORE-TEST-OUTPUT-UPDATE: 6a34e438461b

tests: add more involved tests for obslog -T now that everything is a property

obslog: remove the separate "obslog -f" implementation and use the common one

obslog: provide successors and multiple markers to marker-displaying function

obslog: make date template property into dates

obslog: make note template property into notes

obslog: make operation template property into operations

obslog: make user template property into users

obslog: have at least one test that shows multiple dates with -f flag

obslog: use fm.data() instead of fm.write() because it's all templates now

tests: add checkheads-related cap CORE-TEST-OUTPUT-UPDATE: edc8504bc26b

branching: merge stable back into default evolve 9.3.0 have been released.

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 mercurial-5.0 into mercurial-4.9

test-compat: merge mercurial-5.1 into mercurial-5.0