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
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 19:25:11 -0700] rev 34485
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
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 16:48:58 -0700] rev 34484
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
Saurabh Singh <singhsrb@fb.com> [Wed, 04 Oct 2017 18:39:26 -0700] rev 34483
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
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 12:10:48 -0400] rev 34482
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
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:37:05 +0200] rev 34481
configitems: register the 'debug.dirstate.delaywrite' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:43:13 +0200] rev 34480
configitems: register the 'merge.preferancestor' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:39:10 +0200] rev 34479
configitems: register the 'email.from' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:24 +0200] rev 34478
configitems: register the 'smtp.port' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:43:48 +0200] rev 34477
configitems: register the 'phases.new-commit' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:41:23 +0200] rev 34476
configitems: register the 'experimental.histeditng' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:41:19 +0200] rev 34475
configitems: register the 'experimental.histedit.autoverb' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:40 +0200] rev 34474
configitems: register the 'histedit.singletransaction' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:39 +0200] rev 34473
configitems: register the 'histedit.linelen' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:38 +0200] rev 34472
configitems: register the 'histedit.dropmissing' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:42:37 +0200] rev 34471
configitems: register the 'histedit.defaultrev' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:30 +0200] rev 34470
configitems: register the 'transplant.log' config
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 03:44:29 +0200] rev 34469
configitems: register the 'transplant.filter' config
Augie Fackler <augie@google.com> [Wed, 04 Oct 2017 11:58:00 -0400] rev 34468
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
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 12:14:21 -0400] rev 34467
cleanup: use urllibcompat for renamed methods on urllib request objects
Differential Revision: https://phab.mercurial-scm.org/D891
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 10:45:03 -0400] rev 34466
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
Saurabh Singh <singhsrb@fb.com> [Wed, 04 Oct 2017 10:42:55 -0700] rev 34465
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
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 01 Oct 2017 22:26:24 +0100] rev 34464
fsmonitor: use configitem
We might as well get this out of the way.
Differential Revision: https://phab.mercurial-scm.org/D893
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 01 Oct 2017 23:47:16 +0100] rev 34463
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
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 12:12:56 +0100] rev 34462
extdata: use subprocess so we don't have to chdir() manually
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 11:58:27 +0100] rev 34461
extdata: just use iterator to read lines one by one
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 11:56:41 +0100] rev 34460
extdata: ignore ambiguous identifier as well
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 11:13:09 +0100] rev 34459
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.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 10:50:00 +0100] rev 34458
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.
Matt Mackall <mpm@selenic.com> [Tue, 13 Sep 2016 14:14:05 -0500] rev 34457
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
Denis Laxalde <denis.laxalde@logilab.fr> [Wed, 04 Oct 2017 10:02:15 +0200] rev 34456
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.
Jun Wu <quark@fb.com> [Tue, 03 Oct 2017 12:00:07 -0700] rev 34455
config: add a missing preparewrite() call
Thanks Yuya for pointing this out in D808.
Differential Revision: https://phab.mercurial-scm.org/D924
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 16:59:17 -0700] rev 34454
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
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 14:35:24 -0700] rev 34453
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
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 13:30:36 -0700] rev 34452
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
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 13:05:58 -0700] rev 34451
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
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 12:49:28 -0700] rev 34450
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
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 12:09:23 -0700] rev 34449
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
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 20:23:25 -0700] rev 34448
zeroconf: do not crash if socket being read is closed by another thread
In zeroconf/__init__.py, there is:
server = Zeroconf.Zeroconf(ip)
l = listener()
Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
time.sleep(1)
server.close()
`server.close()` closes the underlying socket while the `ServiceBrowser` may
still have a background thread reading the socket. There could be a race
condition where the reading thread reads the closed socket, resulting in
EBADF crash. This patch catches the exception.
This makes test-paths.t pass with chg.
Differential Revision: https://phab.mercurial-scm.org/D919
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 19:31:33 -0700] rev 34447
test-revlog-mmapindex: make it compatible with chg
The test misses an explicit flush().
Differential Revision: https://phab.mercurial-scm.org/D918
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 19:10:32 -0700] rev 34446
test-profile: gate chg-incompatible part with '#if chg'
chg has a different extension loading logic, which affects the profiler
extension test case. Gate the block with '#if chg' so the test passes with
chg.
Differential Revision: https://phab.mercurial-scm.org/D916
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 18:22:43 -0700] rev 34445
test-logtoprocess: make it compatible with chg
chg runs more commands and outputs more lines. This patch matches them.
Differential Revision: https://phab.mercurial-scm.org/D914
Saurabh Singh <singhsrb@fb.com> [Tue, 03 Oct 2017 11:10:03 -0700] rev 34444
test-globalopts: make the test compatible with chg
The test fails when run with the '--chg' option. Therefore, this
commit modifies the test to make it compatible with chg.
Test Plan:
Ran 'test-globalopts.t' with and without the '--chg' option.
Differential Revision: https://phab.mercurial-scm.org/D913
Jun Wu <quark@fb.com> [Mon, 02 Oct 2017 16:11:57 -0700] rev 34443
test-pager: make it compatible with chg
chg's runpager implementation is different. It behaves differently for the
"shell=False, command not found" case.
Differential Revision: https://phab.mercurial-scm.org/D911
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 02 Oct 2017 11:03:53 +0100] rev 34442
changelog: use a Factory for default value for files
The default value is compiled into the generated type. This means
that default values are shared between instances. For immutable types
like bool, str, int, and tuple, this is fine. But for mutable types
like list and dict, we need to use attr.Factory() to instantiate a
new instance of the default for each object.
Differential Revision: https://phab.mercurial-scm.org/D901
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 02 Oct 2017 19:28:41 +0100] rev 34441
cext: wrap before brace for functions
This is our prevailing style.
Differential Revision: https://phab.mercurial-scm.org/D910
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 02 Oct 2017 19:09:52 +0100] rev 34440
cext: put case statements on separate line
This seems to be the prevailing style, even though it is a bit more
verbose for very simple switch statements.
Differential Revision: https://phab.mercurial-scm.org/D909
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 02 Oct 2017 19:06:00 +0100] rev 34439
cext: reorder #include
We mostly abide by this style.
In one case, a blank line was inserted to prevent a local
`#include "file"` from coming before a `#include <file>`.
Differential Revision: https://phab.mercurial-scm.org/D908
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 02 Oct 2017 19:02:43 +0100] rev 34438
cext: move braces for control statements to same line
This seems to be the prevailing style in the code by a wide margin.
Differential Revision: https://phab.mercurial-scm.org/D907
Saurabh Singh <singhsrb@fb.com> [Mon, 02 Oct 2017 19:17:04 +0100] rev 34437
registrar: fixing typo in comment
I was just going through the module and noticed the typo. This commit
fixes 'onfalure' -> 'onfailure'.
Differential Revision: https://phab.mercurial-scm.org/D906
Alex Gaynor <agaynor@mozilla.com> [Fri, 29 Sep 2017 15:49:20 +0000] rev 34436
style: never put multiple statements on one line
Differential Revision: https://phab.mercurial-scm.org/D905
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 18:18:57 +0100] rev 34435
annotate: mark lines affected by skip-annotate with *
This is to prevent weird surprises from happening with skips being attributed
to the wrong changeset.
.. feature::
`hg annotate --skip` now prints a `*` on lines with skipped revisions
Differential Revision: https://phab.mercurial-scm.org/D900
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 02:34:47 -0700] rev 34434
annotate: track whether a particular annotation was the result of a skip
We're going to expose this information in the UI in an upcoming patch.
Differential Revision: https://phab.mercurial-scm.org/D899
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 02:34:47 -0700] rev 34433
annotate: introduce attr for storing per-line annotate data
We're going to extend this a bit -- at first by simply adding whether this was
a skipped child. We're well on our way to outgrowing tuples, though -- adding
more and more fields to tuples becomes annoying very quickly.
Differential Revision: https://phab.mercurial-scm.org/D898
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 02:34:47 -0700] rev 34432
context: rename local 'attr' to 'attr_'
In the next diff we're going to import mercurial.thirdparty.attr, and pyflakes
complains about this if this rename isn't done.
Differential Revision: https://phab.mercurial-scm.org/D897
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 02:34:47 -0700] rev 34431
annotate: move annotatepair unit tests to a separate file
In upcoming patches the output is going to be significantly longer than it is
today, and doctests don't allow wrapping the output.
Differential Revision: https://phab.mercurial-scm.org/D896
Siddharth Agarwal <sid0@fb.com> [Mon, 02 Oct 2017 02:34:47 -0700] rev 34430
check-code: allow an exception for camelcase where required
unittest has a `maxDiff` parameter which has to be set to `None` in order for
large enough failure diffs to be displayed. Add a comment to disable the
camelcase check for `self.maxDiff = None` lines.
Differential Revision: https://phab.mercurial-scm.org/D895
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 12:16:34 -0400] rev 34429
url: use native strings for header values
Differential Revision: https://phab.mercurial-scm.org/D889
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 12:15:53 -0400] rev 34428
keepalive: python 3 portability tweaks
Differential Revision: https://phab.mercurial-scm.org/D888
Augie Fackler <augie@google.com> [Sun, 01 Oct 2017 07:29:51 -0400] rev 34427
httppasswordmgrdbproxy: specify exact arguments
We only ever call these functions in a single way, so let's just
actually specify them. We need to do some string/bytes encoding
dancing here for Python 3, so it'll help to know what arguments we
need to convert.
# no-check-commit because I'm modifying functions that check-commit
does not like.
Differential Revision: https://phab.mercurial-scm.org/D885
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Oct 2017 08:37:04 +0100] rev 34426
formatter: fix default list/dict generator to be evaluated more than once
Before, _hybrid.gen must be a generator which could be consumed only once.
It was okay in templatekw.py since template keywords are functions which
create temporary hybrid objects, but the formatter doesn't work in that way.
To work around the issue, this patch makes _hybrid.gen optionally be a
function returning a generator.
Thanks to Pulkit for finding this issue.
Yuya Nishihara <yuya@tcha.org> [Wed, 27 Sep 2017 21:38:48 +0900] rev 34425
doctest: drop hack to run py2/3 tests selectively
All doctests pass on Python 3.
muxator <a.mux@inwind.it> [Sun, 01 Oct 2017 01:02:22 +0200] rev 34424
docker: try to follow the best practices for writing Dockerfiles
Merged multiple RUN instructions and sorted the arguments alphabetically
Reference: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/