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

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

tests: adjust test output for an early return in mergecopies() CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc

branching

packaging: mark as developer version This avoid confusion when installing from source.

Added tag 9.2.2 for changeset ef41094c34e1

packaging: prepare version 9.2.2

packaging: update tested with version We have tested this with 5.3rc so let mark 5.3 as tested too.

packaging: update changelog for version 9.2.2

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 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: merge stable into mercurial-5.2

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.

compat: add a context manager that calls _quick_access_changeid_invalidate()

evolve: provide branch argument to overlayworkingctx.tomemctx() This is related to upstream 2ecbc4ec87d8 and fixes test-evolve.t.

evolve: compatibility with copies.graftcopies() from hg 5.3

cmdrewrite: avoid accessing scmutil.status fields by index Support for indexed access is going away in Mercurial. Accessing the fields by name is clearer anyway.