Augie Fackler <augie@google.com> [Thu, 05 Oct 2017 14:12:51 -0400] rev 34509
hgweb: in protocol adapter, avoid control reaching end of non-void function
This greatly confounded some Python 3 porting work, once it was
managing to get this far.
Differential Revision: https://phab.mercurial-scm.org/D962
Saurabh Singh <singhsrb@fb.com> [Thu, 05 Oct 2017 14:18:55 -0700] rev 34508
test-check-code: fail new commits which use 'atexit' instead of 'ui.atexit'
Callbacks registered with 'atexit' are sometimes not called (like when
hg aborts and calls os._exit). On the other hand, callbacks registered with
'ui.atexit' are called in most cases. Therefore, encouraging the use of
'ui.atexit' by failing the test 'test-check-code.t' appropriately.
Test Plan:
Ran the test 'test-check-code.t' after importing 'atexit' in one of
the py files and confirmed that the test fails.
Differential Revision: https://phab.mercurial-scm.org/D961
Saurabh Singh <singhsrb@fb.com> [Thu, 05 Oct 2017 20:46:49 +0000] rev 34507
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
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 02 Oct 2017 04:48:06 +0530] rev 34506
py3: use '%d' for integers instead of '%s'
Differential Revision: https://phab.mercurial-scm.org/D973
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 02 Oct 2017 04:46:17 +0530] rev 34505
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
Jun Wu <quark@fb.com> [Thu, 05 Oct 2017 20:41:50 -0700] rev 34504
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
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:36:10 +0200] rev 34503
configitems: register the 'convert.p4.encoding' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:34 +0200] rev 34502
configitems: register the 'gpg.key' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:33 +0200] rev 34501
configitems: register the 'gpg.cmd' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:50 +0200] rev 34500
configitems: register the 'keywordset.svn' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:35 +0200] rev 34499
configitems: register the 'hgk.path' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:18 +0200] rev 34498
configitems: register the 'share.poolnaming' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:17 +0200] rev 34497
configitems: register the 'share.pool' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:19 +0200] rev 34496
configitems: register the 'shelve.maxbackups' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:43:33 +0200] rev 34495
configitems: register the 'pager.attend' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:43:46 +0200] rev 34494
configitems: register the 'perf.stub' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:32:25 +0200] rev 34493
configitems: register the 'commands.rebase.requiredest' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:06 +0200] rev 34492
configitems: register the 'experimental.rebaseskipobsolete' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:41:49 +0200] rev 34491
configitems: register the 'experimental.nonnormalparanoidcheck' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:39:44 +0200] rev 34490
configitems: register the 'experimental.allowdivergence' config
Saurabh Singh <singhsrb@fb.com> [Thu, 05 Oct 2017 21:56:25 +0000] rev 34489
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
Saurabh Singh <singhsrb@fb.com> [Thu, 05 Oct 2017 00:48:44 +0000] rev 34488
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
Augie Fackler <augie@google.com> [Thu, 05 Oct 2017 15:12:11 -0400] rev 34487
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
Alex Gaynor <agaynor@mozilla.com> [Fri, 29 Sep 2017 15:48:34 +0000] rev 34486
style: never use a space before a colon or comma
Differential Revision: https://phab.mercurial-scm.org/D954