test-annotate: fix up expected output for pure This is just a side effect of surfacing the "revisions were skipped" state in the blame output. Differential Revision: https://phab.mercurial-scm.org/D956

style: never use a space before a colon or comma Differential Revision: https://phab.mercurial-scm.org/D954

eol: make [eol] config section sensitive for chg confighash The eol extension may mangle the [eol] config section and that means chg is unable to detect config file change (because it re-applies setconfig changes). This makes test-eol.t pass with chg. Differential Revision: https://phab.mercurial-scm.org/D917

test-alias: make it compatible with chg ad1bdea (dispatch: defer environment variable resolution in alias commands (BC), 2016-05-06) made environment variables lazily resolved. But after D805 (alias: make alias command lazily resolved 2017-09-23), alias resolution happened after uisetup, which breaks the test for chg. `uisetup` is known to behave different in chg. Let's verify the feature without using `*setup`. Differential Revision: https://phab.mercurial-scm.org/D912

serve: make tests compatible with chg chg only supports 'hg serve' when the options to the serve command follow the 'hg serve'. For example, 'hg -R <repo> serve ..' is unsupported. This leads to issues with chg running for the following tests: - test-bundle2-exchange.t - test-clone-uncompressed.t - test-hgweb-csp.t - test-http-bad-server.t - test-http-bundle1.t - test-http-protocol.t - test-http.t There was an effort made earlier to fix this issue for chg and the tests were fixed to confirm to the compatible pattern. But the new tests did not take care of the same and hence, fail. Hopefully, there will be continuous build setup for chg after all tests are made compatible with chg so that we can avoid such issues. Test Plan: Ran the aforementioned tests with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D946

ui: convert to/from Optional[bytes] to Optional[str] in password manager This password manager proxy is roughly the right-looking layer to convert between strings and bytes. Many of these arguments can be None, so we have a helper method to make the conversion preserve Nones without exploding. Differential Revision: https://phab.mercurial-scm.org/D886

tests: invoke run-tests.py in test-hghave using $PYTHON (issue5697) Some platforms (notably pkgsrc on NetBSD) only provide versioned Python interpreters (eg `python2.7` exists, but `python` does not), which exposes this error. We want to be running run-tests.py with the python given in $PYTHON, since that might be `pypy` or `python3`.

configitems: register the 'debug.dirstate.delaywrite' config

configitems: register the 'merge.preferancestor' config

configitems: register the 'email.from' config

configitems: register the 'smtp.port' config

configitems: register the 'phases.new-commit' config

configitems: register the 'experimental.histeditng' config

configitems: register the 'experimental.histedit.autoverb' config

configitems: register the 'histedit.singletransaction' config

configitems: register the 'histedit.linelen' config

configitems: register the 'histedit.dropmissing' config

configitems: register the 'histedit.defaultrev' config

configitems: register the 'transplant.log' config

configitems: register the 'transplant.filter' config

urllibcompat: move some adapters from pycompat to urllibcompat These are all the httpserver and urllib.* aliases. They seem to make more sense in the slightly-more-specific urllibcompat package than the general-purpose pycompat. Differential Revision: https://phab.mercurial-scm.org/D935

cleanup: use urllibcompat for renamed methods on urllib request objects Differential Revision: https://phab.mercurial-scm.org/D891

urllibcompat: new library to help abstract out some python3 urllib2 stuff Doing a new file instead of pycompat because I'm starting to feel like pycompat is getting a little enormous in terms of scope. Differential Revision: https://phab.mercurial-scm.org/D890

test-devel-warnings: make the test compatible with chg The test fails when run with the "--chg" option. Therefore, this commit makes it compatible with chg. Test Plan: Ran the test "test-devel-warnings.t' with and without the "--chg" option Differential Revision: https://phab.mercurial-scm.org/D915