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

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

test-compat: back out changeset 2371d40f0878

test-compat: back out changeset bb2042ff6444

test-compat: merge stable into mercurial-5.2

packaging: mark as developer version

packaging: add tag 9.3.0 for changeset 583dc6ef3eb2

packaging: prepare version 9.3.0

branching: preserve test change on stable CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2

topic: extend topic gating to descendant If a changeset with topic as descendant without topic, we need to exclude them too when using: topic.server-gate-topic-changesets.

changelog: more entries for 9.3.0, sorting

compat: fix subsettable import for mercurial <= 4.8

compat: officialy drop compatibility with mercurial 4.5

test-compat: back out changeset 591a0afd2ef3

test-compat: back out changeset 51e38bf936cf

branching: merge into stable in preparation for release

branching: closing test-compat branch for mercurial-4.5

branching: merge with stable

tests: update graph output after core change CORE-TEST-OUTPUT-UPDATE: 14d0e89520a2

fix: reinstall import from the right location

topic: option to hide topic changesets to plain client This is the first version of an option that make topic changeset hidden to client without the extension. It might become the default in the future.

readme: update heptapod link

py3-exceptions: wrap more Exceptions in forcebytestr before formatting

touch: allow divergence with -A even if allowdivergence=no This is a phase-divergent update to 731b5a89a784. 1f92a6aa40d6 (evolve: add pre-check logic for content-divergence in rewriteutil.precheck(), 2019-11-04) taught `rewriteutil.precheck()` to check for divergence. It also set allowdivergence=yes in test-touch.t to silence the error. However, if one does *not* have that set, it is no longer possible to allow divergence with `hg touch -A`. This patch fixes that.

touch: allow divergence with -A even if allowdivergence=no 1f92a6aa40d6 (evolve: add pre-check logic for content-divergence in rewriteutil.precheck(), 2019-11-04) taught `rewriteutil.precheck()` to check for divergence. It also set allowdivergence=yes in test-touch.t to silence the error. However, if one does *not* have that set, it is no longer possible to allow divergence with `hg touch -A`. This patch fixes that.

tests: add test of `hg touch -A` There didn't seem to be any before. It currently passes because the test case incorrectly (IMO) sets `evolution.allowdivergence = True`.

release-checklist: do not forget to move the '@' bookmark

topic: use `%d` for integers instead of `%s` on py3 I have system mercurial using py3 which lead me to the traceback pointing to this.

prune: actually track folds using fold-* metadata in obsmarkers

packaging: handle docs in a separate block in MANIFEST.in

packaging: simplify inclusion of docs in MANIFEST.in

packaging: simply prune some directories in MANIFEST.in in a dedicated block exclude+recursive-exclude is basically prune.

metaedit: replace a compat condition with a less specific proxy Same reasoning as for the previous patch. In this case, the closest commit I could find was 36 commits later (3d35304bd09b).

fold: replace a compat condition with a less specific proxy If `scmutil.cleanupnodes()` is overridden, the check in `scmutil.cleanupnodes.__code__.co_varnames` will fail. Let's use a less specific proxy for that condition so extensions are safely override `scmutil.cleanupnodes()`. I picked `util.safehasattr(scmutil, 'nullrev')` as the proxy. That basically checks for Mercurial commit d739f423bf06, which is two commits later than the commit we actually care about.

tests: drop useless "(glob)" for timezone offsets

changelog: obslog shows folds now

obslog: use _successorsetverb() in regular obslog too It was already used for obslog --filternonlocal.

release: do not forget to tweet about it

branching: merge with stable

release: fix a silly typo

branching: merge with stable

release: add missing checklist items

heptapod: add an issue template for new version

packaging: create a release check list This should help other to release version of evolve.

obshistory: add 'folded' to the list of precise verbs It's used for templates and for obslog --filternonlocal, but not for regular obslog.

metaedit: actually track folds using fold-* metadata in obsmarkers