Yuya Nishihara <yuya@tcha.org> [Sat, 25 Feb 2017 17:29:30 +0900] rev 31497
pager: flush outputs before firing pager process
So that buffered outputs are always sent to the console.
Yuya Nishihara <yuya@tcha.org> [Sat, 25 Feb 2017 17:27:48 +0900] rev 31496
patchbomb: use modern pager to display -n/--test result (BC)
This should provide more consistent UX, but is a BC because the pager will
no longer be fired up for each message.
Yuya Nishihara <yuya@tcha.org> [Sat, 18 Mar 2017 16:02:14 +0900] rev 31495
httpconnection: make sure to clear progress of httpsendfile at EOF
read() should never raise EOFError. If it did, UnboundLocalError would occur
due to unassigned 'ret' variable.
This issue was originally reported to TortoiseHg:
https://bitbucket.org/tortoisehg/thg/issues/4707/
Yuya Nishihara <yuya@tcha.org> [Tue, 14 Mar 2017 18:23:59 +0900] rev 31494
py3: convert log opts to bytes-key dict
Now simple log command works.
Yuya Nishihara <yuya@tcha.org> [Tue, 14 Mar 2017 18:16:13 +0900] rev 31493
graphlog: pass function arguments without expansion
It's annoying on Python 3 because keys must be unicode type. Let's stop using
**opts expansion when not necessary.
Yuya Nishihara <yuya@tcha.org> [Fri, 17 Mar 2017 23:48:22 +0900] rev 31492
py3: call codecs.escape_decode() directly
The same rule as 3b7a6941a6ef applies.
Yuya Nishihara <yuya@tcha.org> [Fri, 17 Mar 2017 23:42:46 +0900] rev 31491
util: wrap s.decode('string_escape') calls for future py3 compatibility
Augie Fackler <augie@google.com> [Sat, 18 Mar 2017 12:27:52 -0400] rev 31490
merge with stable
Matt Harbison <matt_harbison@yahoo.com> [Sun, 05 Mar 2017 22:22:32 -0500] rev 31489
hgwebdir: add support for explicit index files
This is useful for when repositories are nested in --web-conf, and in the future
with hosted subrepositories. The previous behavior was only to render an index
at each virtual directory. There is now an explicit 'index' child for each
virtual directory. The name was suggested by Yuya, for consistency with the
other method names.
Additionally, there is now an explicit 'index' child for every repository
directory with a nested repository somewhere below it. This seems more
consistent with each virtual directory hosting an index, and more discoverable
than to only have an index for a directory that directly hosts a nested
repository. I couldn't figure out how to close the loop and provide one in each
directory without a deeper nested repository, without blocking a committed
'index' file. Keeping that seems better than rendering an empty index.
Jun Wu <quark@fb.com> [Fri, 17 Mar 2017 09:19:56 -0700] rev 31488
ui: move configlist parser to config.py
The list parser is complex and reusable without ui. Let's move it to
config.py.
This allows us to parse a list from a "pure" config object without going
through ui. Like, we can make "_trustusers" calculated from raw configs,
instead of making sure it's synchronized by calling "fixconfig"s.
Martin von Zweigbergk <martinvonz@google.com> [Fri, 17 Mar 2017 09:58:49 -0700] rev 31487
tests: allow ModuleNotFoundError in addition to ImportError
My environment (Python version? PYTHONPATH? something else?) raises
ModuleNotFoundError in test-check-py3-compat.t. This patch allows any
"*Error". The error string contains "error importing", so it seems
specific enough even after.
Augie Fackler <augie@google.com> [Wed, 15 Mar 2017 20:34:26 -0400] rev 31486
pager: skip running the pager if it's set to 'cat'
Avoid useless uses of cat.
Augie Fackler <augie@google.com> [Wed, 15 Mar 2017 20:33:47 -0400] rev 31485
pager: avoid shell=True on subprocess.Popen for better errors (issue5491)
man(1) behaves as poorly as Mercurial without this change. This cribs
from git's run-command[0], which has a list of characters that imply a
string that needs to be run using 'sh -c'. If none of those characters
are present in the command string, we can use shell=False mode on
subprocess and get significantly better error messages (see the test)
when the pager process is invalid. With a complicated pager command
(that contains one of the unsafe characters), we behave as we do today
(which is no worse than git manages.)
I briefly tried tapdancing in a thread to catch early pager exits, but
it's just too perilous: you get races between fd duping operations and
a bad pager exiting, and it's too hard to differentiate between a
slow-bad-pager result and a fast-human-quit-pager-early result.
I've observed some weird variation in exit code handling in the "bad
experience" case in test-pager.t: on my Mac hg predictably exits
nonzero, but on Linux hg always exits zero in that case. For now,
we'll work around it with || true. :(
0: https://github.com/git/git/blob/cddbda4bc87b9d2c985b6749b1cf026b15e2d3e7/run-command.c#L201
Rishabh Madan <rishabhmadan96@gmail.com> [Fri, 17 Mar 2017 19:12:22 +0530] rev 31484
py3: change explicit conversion of config value from str to pycompat.bytestr
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 13 Mar 2017 12:40:14 -0700] rev 31483
py3: add __bool__ to every class defining __nonzero__
__nonzero__ was renamed to __bool__ in Python 3. This patch simply
aliases __bool__ to __nonzero__ for every class implementing
__nonzero__.
Martin von Zweigbergk <martinvonz@google.com> [Mon, 13 Mar 2017 21:58:43 -0700] rev 31482
merge: also allow 'e' action with experimental.updatecheck=noconflict
With experimental.updatecheck=noconflict set, if one checks out
f3398f1f70a0 (tests: add execute bit and fix shbang line, 2015-12-22)
and then try to check out its parent, hg will complain about
conflicting changes, even though the working directory is clean. We
need to also allow the 'e' action in merge.py. The 'e' action is used
when moving to a commit where the only change to the file is to its
executable flag, so it's just an optimized 'g' action.
Doesn't seem to be worth writing a test for, since the existing setup
in test-update-branches.t does not set any flags.
Martijn Pieters <mjpieters@fb.com> [Sun, 12 Mar 2017 11:43:31 -0700] rev 31481
config: honour the trusted flag in ui.configbytes
Jun Wu <quark@fb.com> [Wed, 15 Mar 2017 20:43:12 -0700] rev 31480
osutil: fix potential wrong fd close
According to POSIX closedir [1]:
If a file descriptor is used to implement type DIR, that file descriptor
shall be closed.
According to POSIX fdopendir [2]:
Upon calling closedir() the file descriptor shall be closed.
So we should avoid "close(dfd)" after "closedir(dir)". With threads, there
could be a race where an innocent fd gets closed. But Python GIL seems to
help hiding the issue well.
[1]: http://pubs.opengroup.org/onlinepubs/009695399/functions/closedir.html
[2]: http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdopendir.html
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 09 Mar 2017 12:09:31 -0800] rev 31479
parsers: use Python memory allocator for indexObject->offsets
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 09 Mar 2017 12:02:59 -0800] rev 31478
parsers: use Python memory allocator in commonancestorsheads()
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 09 Mar 2017 11:56:47 -0800] rev 31477
osutil: use Python memory allocator in _listdir
The Python memory allocator has performance advantages
for small allocations.
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 09 Mar 2017 11:54:25 -0800] rev 31476
bdiff: use Python memory allocator in fixws
Python has its own memory allocation APIs. For allocations
<= 512 bytes, it allocates memory from arenas. This means that
average small allocations don't call the system allocator, which
makes them faster. Also, arena allocations cut down on memory
fragmentation, which can matter for performance in long-running
processes.
Another advantage of using the Python memory allocator is that
allocations are tracked by Python. This is a bigger deal in
Python 3, as modern versions of Python have some decent built-in
tools for examining memory usage, leaks, etc.
This patch converts a trivial malloc() + free() in the bdiff code
to use the Python allocator APIs. Since the object being
operated on is a line, chances are it will use an arena. So,
this could have a net positive impact on performance (although
I didn't measure it).
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Mar 2017 11:17:55 -0700] rev 31475
localrepo: fix deprecation warning version of wfile
The patch lingered a bit too long in my local clone and I messed up when I
updated the version number. Since nobody caught it, I'm fixing the version after
the fact.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 15 Mar 2017 15:07:14 -0700] rev 31474
util: explicitly tests for None
Changeset 8b6927eb7efd removed the mutable default value, but did not explicitly
tested for None. Such implicit checking can introduce semantic and performance
issue. We move to an explicit check for None as recommended by PEP8:
https://www.python.org/dev/peps/pep-0008/#programming-recommendations
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 15 Mar 2017 15:38:02 -0700] rev 31473
context: simplify call to icase matcher in 'match()'
The two function takes the very same arguments. We make this clearer and less
error prone by dispatching on the function only and having a single call point
in the code.
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 16 Mar 2017 09:13:13 +0530] rev 31472
py3: make sure using bytes status char rather than ascii values
'MAR!?IC' is converted to their ascii values when slicing through it. This
patch uses pycompat.iterbytestr() to get bytes value.
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:27:41 -0700] rev 31471
shelve: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:40:34 -0700] rev 31470
rebase: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:39:18 -0700] rev 31469
mq: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:36:35 -0700] rev 31468
histedit: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:34:35 -0700] rev 31467
record: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:23:49 -0700] rev 31466
import: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:18:50 -0700] rev 31465
clone: get rid of ui.backupconfig
Jun Wu <quark@fb.com> [Thu, 16 Mar 2017 14:15:20 -0700] rev 31464
commit: get rid of ui.backupconfig
Durham Goode <durham@fb.com> [Wed, 15 Mar 2017 15:48:57 -0700] rev 31463
branchmap: handle nullrev in setcachedata
906be86990 recently changed to switch from:
self._rbcrevs[rbcrevidx:rbcrevidx + _rbcrecsize] = rec
to
pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx)
This causes an exception if rbcrevidx is -1 (i.e. the nullrev). The old code
handled this because python handles out of bound sets to arrays gracefully. The
new code throws because the self._rbcrevs buffer isn't long enough to write 8
bytes to. Normally it would've been resized by the immediately preceding line,
but because the 0 length buffer is greater than the idx (-1) times the size, no
resize happens.
Setting the branch for the nullrev doesn't make sense anyway, so let's skip it.
This was caught by external tests in the Facebook extensions repo, but I've
added a test here that catches the issue.
Yuya Nishihara <yuya@tcha.org> [Wed, 15 Mar 2017 23:28:39 +0900] rev 31462
py3: call codecs.escape_encode() directly
string_escape doesn't exist on Python 3, but fortunately the undocumented
codecs.escape_encode() function exists on CPython 2.6, 2.7, 3.5 and PyPy 5.6.
So let's use it for now.
http://stackoverflow.com/a/23151714
Yuya Nishihara <yuya@tcha.org> [Wed, 15 Mar 2017 23:21:30 +0900] rev 31461
templatekw: make join() escape values of extras (BC) (issue5504)
Since extras may contain blob, the default template escapes its values:
'extra': '{key}={value|stringescape}'
join() should follow the output style of the default template.
Yuya Nishihara <yuya@tcha.org> [Wed, 15 Mar 2017 23:06:50 +0900] rev 31460
util: wrap s.encode('string_escape') call for future py3 compatibility
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 09:24:53 -0700] rev 31459
py3: prove hg tip works
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 09:19:07 -0700] rev 31458
py3: call strftime() with native str type
Since strftime() may contain non-ascii character if locale set, we use
strfrom/tolocal().
Now "hg tip" works.
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 09:12:56 -0700] rev 31457
encoding: add converter between native str and byte string
This kind of encoding conversion is unavoidable on Python 3.
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 09:11:08 -0700] rev 31456
encoding: factor out unicode variants of from/tolocal()
Unfortunately, these functions will be commonly used on Python 3.
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 08:53:31 -0700] rev 31455
py3: use next() to obtain next item from inner generator of generatorset
.next attribute does not exist on Python 3. As this function seems to really
care about the overhead of the Python interpreter, I follow the way of micro
optimization.
Yuya Nishihara <yuya@tcha.org> [Mon, 13 Mar 2017 08:44:57 -0700] rev 31454
py3: rewrite itervalues() as values() by importer
I'm not a great fan of these importer magics, but this should be okay since
"itervalues" seems as unique name as "iteritems".
Yuya Nishihara <yuya@tcha.org> [Sun, 12 Mar 2017 17:20:42 -0700] rev 31453
py3: use portable way to stringify cache key of repoview
Kostia Balytskyi <ikostia@fb.com> [Mon, 13 Mar 2017 12:44:13 -0700] rev 31452
exewrapper: prefer HackableMercurial python if availbale
Currently hg.exe will only try to load python27.dll from hg-python
subdir if PYTHONHOME environment variable is not set. I think that
it is better to check whether 'hg-python' subdir exists and load
python from it in that case, regardless of environment. This allows
for reliable approach of distributing Mercurial with its own Python.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 14 Mar 2017 23:07:08 -0700] rev 31451
import-checkers: split tests of the tool from running it on the source
We did such splits for other tools already. The 'test-check-*.t' performs the
check of the source code while the regular tests verifies the tools works.
One of the benefit is that is provides a simple file to reuse in third party
extensions.
Yuya Nishihara <yuya@tcha.org> [Thu, 16 Mar 2017 21:36:21 +0900] rev 31450
py3: use bytestr wrapper in revsetlang.tokenize()
This backs out 77270ec0cdd9 and wraps program by bytestr() instead.