Martin von Zweigbergk <martinvonz@google.com> [Thu, 17 May 2018 15:33:28 -0700] rev 38079
narrow: filter copies in core
Differential Revision: https://phab.mercurial-scm.org/D3576
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
Kyle Lippincott <spectral@google.com> [Wed, 16 May 2018 15:48:12 -0700] rev 38068
tests: test-parseindex.t works just fine with chg
In 538e850ae737 I annotated tests that failed with chg with "#require no-chg",
but did not investigate why the tests were failing. This test was failing for
unrelated reasons (I forgot to rebuild hg) and so should not be marked as
no-chg.
Test Plan:
make local
pushd contrib/chg
make clean; make
popd
cd tests
for f in '' --with-chg=../contrib/chg/chg; do
./run-tests.py --local $f test-parseindex.t
done
Differential Revision: https://phab.mercurial-scm.org/D3571
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 27 Apr 2018 21:55:02 +0530] rev 38067
py3: convert the report to bytes
Differential Revision: https://phab.mercurial-scm.org/D3569
Martin von Zweigbergk <martinvonz@google.com> [Fri, 11 May 2018 10:36:28 -0700] rev 38066
json: reject unicode on py2 as well
This makes it consistent with the behavior on py3.
Differential Revision: https://phab.mercurial-scm.org/D3536
Yuya Nishihara <yuya@tcha.org> [Wed, 16 May 2018 20:22:23 +0900] rev 38065
dispatch: mask negative exit code recorded in blackbox log
That's what we do for the exit code delivered to the environment.
Yuya Nishihara <yuya@tcha.org> [Wed, 16 May 2018 20:17:50 +0900] rev 38064
dispatch: fix exit code of unhandled exception recorded in blackbox log
Spotted by Martin von Zweigbergk.
We might want to change the exit code to -1 (i.e. 255) because 1 means
non-abort error in hg, but that's another issue.
Kyle Lippincott <spectral@google.com> [Tue, 15 May 2018 11:52:43 -0700] rev 38063
tests: mark tests that fail when using chg as #require no-chg
As far as I can tell, most of these failures are due to using $HGPORT, which it
seems chg might be using itself? I don't know enough to debug these failures to
fix them properly.
Differential Revision: https://phab.mercurial-scm.org/D3562
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 27 Apr 2018 21:54:37 +0530] rev 38062
py3: use pycompat.bytestr() instead of str() in extensions.py
Differential Revision: https://phab.mercurial-scm.org/D3568
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 16 May 2018 07:58:02 +0530] rev 38061
py3: use pycompat.bytestr() on bytes before %r-ing it
Differential Revision: https://phab.mercurial-scm.org/D3567
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 15 Feb 2018 17:15:21 +0530] rev 38060
py3: add b'' prefixes in tests/test-extension.t
# skip-blame because just b'' prefixes
Differential Revision: https://phab.mercurial-scm.org/D3564
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 27 Apr 2018 20:55:10 +0530] rev 38059
py3: suppress the value returned by .write() calls
These return values are not present on Python 2.
Differential Revision: https://phab.mercurial-scm.org/D3563
Martin von Zweigbergk <martinvonz@google.com> [Tue, 15 May 2018 09:57:58 -0700] rev 38058
tests: test failure reporting in blackbox code
Differential Revision: https://phab.mercurial-scm.org/D3560
David Demelier <markand@malikania.fr> [Mon, 14 May 2018 12:53:13 +0200] rev 38057
export: add -B option to select a bookmark
Just like `hg email -B`, `hg strip -B`, supports -B in export to select a list
of changesets reachable from a bookmark.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 May 2018 18:05:50 -0700] rev 38056
packaging: move most packaging targets to own Makefile
Since we're putting everything packaging under one roof, let's
define the make targets related to packaging there as well.
I didn't move the "osx" target because it is non-trivial.
Some targets did change slightly as part of the move. But it
was mostly around path normalization.
Differential Revision: https://phab.mercurial-scm.org/D3552
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 May 2018 12:27:51 -0700] rev 38055
packaging: make packaging scripts less reliant on pwd
The scripts currently assume they are executed from the repo root.
This feels like an arbitrary restriction. Let's fix that.
Differential Revision: https://phab.mercurial-scm.org/D3551
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 May 2018 10:57:04 -0700] rev 38054
packaging: move contrib/macosx to contrib/packaging/
And update various references throughout the code.
Differential Revision: https://phab.mercurial-scm.org/D3550
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 May 2018 10:50:30 -0700] rev 38053
packaging: move linux-wheel-centos5-blacklist to contrib/packaging/
Differential Revision: https://phab.mercurial-scm.org/D3549
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 May 2018 10:47:44 -0700] rev 38052
packaging: move build-linux-wheels.sh to contrib/packaging/
Differential Revision: https://phab.mercurial-scm.org/D3548