morestatus: check whether the conflict message is None before printing There are cases like bisect when the conflict message can be None. So we make sure that we don't print None in that case. Thanks to Martin for catching this. Differential Revision: https://phab.mercurial-scm.org/D461

bundle2: fixed usage of an attribute that was removed in py3k Differential Revision: https://phab.mercurial-scm.org/D482

releasenotes: add check flag for use of admonitions and its validity While using releasenotes extension, we will be using admonitions in commit messages. The check (-c) flag will look for an admonition within the message. If it exists, it will verify if it is stated under default or custom admonition. The check fails if the admonition is not present in any of them. It also suggests similar admonitions in case the admonition is invalid. Differential Revision: https://phab.mercurial-scm.org/D368

copies: fix misaligned lines

copies: fix typo in comment "will not be limited" was meant to be "will not be visited". I missed this when writing the original graft-through-rename patch series.

python3: whitelist test-imports-checker.t, which now passes

contrib: make import checker always think in terms of bytes The doctests now do some regrettable things, but they'll always work since we're dealing with ASCII module names etc.

contrib: work around some modules not existing on Py3 in import checker

tests: stop using old except syntax in test-bundle2-format

tests: update test-archive to always use hashlib We don't need the fallback to the old modules anymore.