test-push-race: use 'ui.atexit' instead of python's 'atexit' Callbacks registered with 'atexit' are sometimes not called (like when a process is killed by the SIGTERM signal). Therefore, this commit replaces it with 'ui.atexit' which ensures that the callbacks are always called. This also makes the test compatible with chg. Test Plan: Ran the test 'test-push-race.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D957

py3: use '%d' for integers instead of '%s' Differential Revision: https://phab.mercurial-scm.org/D973

py3: fix keyword arguments handling in mq This patch fixes the handling of keyword arguments to functions on Python 3. On python3, the keys of keyword arguments need to str which is unicode. So any keyword argument will get will have str keys and any dictionary we pass as kwargs must have all the keys as str. This patch uses pycompat.(strkwargs|byteskwargs) to do so conversion between bytes keys and str keys and use r'' if there are very less uses and conversion can be prevented. Differential Revision: https://phab.mercurial-scm.org/D972

test-rebase-base: clarify it is about the "--base" flag It happened several times that people use `test-rebase-base.t` as a general purposed test file for rebase. But it is intended to be only related to the `--base` flag. This patch split, renamed the test, and added a note to clarify. Differential Revision: https://phab.mercurial-scm.org/D975

configitems: register the 'convert.p4.encoding' config

configitems: register the 'gpg.key' config

configitems: register the 'gpg.cmd' config

configitems: register the 'keywordset.svn' config

configitems: register the 'hgk.path' config

configitems: register the 'share.poolnaming' config

configitems: register the 'share.pool' config

configitems: register the 'shelve.maxbackups' config

configitems: register the 'pager.attend' config

configitems: register the 'perf.stub' config

configitems: register the 'commands.rebase.requiredest' config

configitems: register the 'experimental.rebaseskipobsolete' config

configitems: register the 'experimental.nonnormalparanoidcheck' config

configitems: register the 'experimental.allowdivergence' config

histedit: removing the experimental config 'histeditng' This config has been around for about 2 years now. So, it can be assumed to be stable. Therefore, I am removing the config. This also makes the test 'test-histedit-base.t' compatible with chg. Test Plan: - Ran the test 'test-histedit-base.t' with and without '--chg' option. - Ran all the other tests without '--chg' option. - Checked the output of 'hg help histedit'. Differential Revision: https://phab.mercurial-scm.org/D942

convert: fix the RevisionSpec import in the bzr module This import was failing (because its invalid) which was resulting in the following tests failing with chg running: - test-convert-bzr.t - test-convert-bzr-directories.t - test-convert-bzr-ghosts.t - test-convert-bzr-treeroot.t - test-convert-bzr-114.t - test-convert-bzr-merges.t This commit fixes the import which in turn fixes the tests. Test Plan: Ran the aforementioned tests with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D936

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

fsmonitor: use configitem We might as well get this out of the way. Differential Revision: https://phab.mercurial-scm.org/D893

fsmonitor: access copymap in new location fsmonitor has been busted since 0865d25e8a8a due to moving self._copymap. Fix it. Differential Revision: https://phab.mercurial-scm.org/D892

extdata: use subprocess so we don't have to chdir() manually

extdata: just use iterator to read lines one by one

extdata: ignore ambiguous identifier as well

templater: add experimental support for extdata This is minimal and non-controversial implementation of extdata() template function. Originally extdata sources were exposed to the keyword namespace, but I've changed it to a plain function for simplicity.

revset: add experimental support for extdata This is minimal and non-controversial implementation of extdata() revset. Originally extdata sources were exposed to the symbol namespace, but I've changed it to a plain function for simplicity.

extdata: add extdatasource reader This adds basic support for extdata, a way to add external data sources for revsets and templates. An extdata data source is simply a list of lines of the form: <revision identifier>[<space><freeform text>]\n An extdata source is configured thusly: [extdata] name = <a url or path> urls of the form shell: are launch shell commands to generate data. This patch is slightly modified by Yuya Nishihara as follows: - fix typo - remove unused function - remove future expansion point for parameter (which can be added later as the extdata revset/template are experimental) You can see the original patch at https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-September/088426.html

tests: change to parent directory before all "hg init" in test-log.t Add a "cd .." before the second "hg init" so that all repositories are on top level of test directory. Makes inspection of test directory easier.

config: add a missing preparewrite() call Thanks Yuya for pointing this out in D808. Differential Revision: https://phab.mercurial-scm.org/D924

test-strip: make test compatible with chg The test was using reposetup which had the logic for stripping commits. This leads to a situation where if the reposetup was called twice for an extension (which can happen with chg running), the stripped node would not be found the second time. Therefore, this commit changes the test to put the stripping logic inside commands instead of the reposetup. This ensures that the stripping logic is invoked only when the command is invoked and thus, avoids any problems. Test Plan: Ran the test 'test-strip.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D928

test-hook: make test compatible with chg The test uses the 'print' method instead of writing to stdout using 'ui.write' which leads to incompatibility with chg. This commit modifies the test to use 'ui' instead which fixes the problem. Test Plan: Ran the test 'test-hook.t' with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D927

test-setdiscovery: make test compatible with chg The test checks the output of the blackbox extension which will contain logs corresponding to chg in case chg is running. Therefore, this commit modifies the test to take chg into consideration while working with the blackbox extension. Test Plan: Ran the test 'test-setdiscovery.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D926

test-merge-subrepos: make test compatible with chg The test checks the output of '.hg/blackbox.log' which will contain logs corresponding to chg in case chg is running. Therefore, this commit modifies the test to take chg into consideration while checking the blackbox.log contents. Test Plan: Ran the test 'test-merge-subrepos.t' with and without the '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D925

test-convert-cvs: make test compatible with chg The test uses the 'print' method instead of writing to stdout using 'ui.write' which leads to incompatibility with chg. This commit modifies the test to use the 'ui' object instead which fixes the problem. Test Plan: Ran the test 'test-convert-cvs.t' with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D923

test-basic: make test compatible with chg The error codes returned when writing to /dev/full are different after the first failure with and without '--chg' option. Therefore, this commit conditionally handles the error codes as appropriate. Test Plan: Ran the test 'test-basic.t' with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D922