Martin von Zweigbergk <martinvonz@google.com> [Thu, 17 May 2018 15:25:52 -0700] rev 38078
narrow: filter set of files to check for case-folding to core
Differential Revision: https://phab.mercurial-scm.org/D3575
Martin von Zweigbergk <martinvonz@google.com> [Thu, 17 May 2018 15:12:48 -0700] rev 38077
narrow: filter merge actions in core
Part of the ongoing effort to move narrow into core.
Differential Revision: https://phab.mercurial-scm.org/D3574
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 17 May 2018 12:23:38 -0700] rev 38076
hgweb: extract code for emitting multiple changelist records
changelistentry() exists so extensions can easily monkeypatch the
function to add additional metadata.
In at least one case at Mozilla, we have an extension doing this
where performance would greatly benefit if we were able to "batch
fetch" metadata for all revisions that will eventually have their
data set.
By extracting the logic for "obtain records for N revisions" into
a standalone function, we make it possible for a monkeypatched
function to more efficiently bulk fetch data for N revisions.
Differential Revision: https://phab.mercurial-scm.org/D3573
Matt Harbison <matt_harbison@yahoo.com> [Wed, 16 May 2018 22:44:27 -0400] rev 38075
phabricator: register config settings
I didn't bother registering the deprecated phabricator.auth.*, and I'm not sure
if the two flagged as 'developer config' should be moved to [devel] (or why
there's a distinction between `repophid` and `callsign`).
hindlemail <tom_hindle@sil.org> [Wed, 16 May 2018 14:11:41 -0600] rev 38074
filemerge: support specifying a python function to custom merge-tools
Eliminates the need to specify a python executable, which may not exist on
system. Additionally launching script inprocess aids portability on systems
that can't execute python via the shell.
Example usage "merge-tools.myTool.executable=python:c:\myTool.py:mergefn"
where myTool.py contains a function:
"def mergefn(ui, repo, args, **kwargs):"
where args is list of args passed to merge tool.
(by default, expanded: $local $base $other)
Invoking the specified python function was done by exposing and invoking
(hook._pythonhook -> hook.pythonhook)
Yuya Nishihara <yuya@tcha.org> [Sun, 13 May 2018 11:09:53 +0900] rev 38073
test-http-branchmap: fix stdio mode on Windows
Yuya Nishihara <yuya@tcha.org> [Sun, 13 May 2018 11:08:35 +0900] rev 38072
test-http-branchmap: fix encoding test to wrap the server stream
Wrapping sys.std* streams has no effect since 39d13b8c101d, "py3: bulk
replace sys.stdin/out/err by util's."
Yuya Nishihara <yuya@tcha.org> [Thu, 17 May 2018 21:55:00 +0900] rev 38071
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Joerg Sonnenberger <joerg@bec.de> [Sat, 12 May 2018 23:44:08 +0200] rev 38070
notify: add option to include function names in the diff output
This is a localized version of diff.showfunc.
Differential Revision: https://phab.mercurial-scm.org/D3553
Martin von Zweigbergk <martinvonz@google.com> [Wed, 16 May 2018 10:34:31 -0700] rev 38069
tests: update py3 test since json fields are now sorted
The fields have been sorted since 814151cd8c4a (logcmdutil: rewrite
jsonchangeset printer to be backed by jsonformatter, 2018-04-13), and
the test case has thus been failing since that commit.
Differential Revision: https://phab.mercurial-scm.org/D3570