Augie Fackler <augie@google.com> [Mon, 09 Jul 2018 09:50:23 -0400] rev 38601
merge with stable
Joerg Sonnenberger <joerg@bec.de> [Fri, 06 Jul 2018 17:57:46 +0200] rev 38600
ui: make the large file warning limit fully configurable
While add --large can be used to override it selectively, often enough
the user simply doesn't care about machines with less than 100MB RAM or
so, so make it possible to just specify a larger limit in hgrc.
Differential Revision: https://phab.mercurial-scm.org/D3893
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:26:04 +0900] rev 38599
fileset: sort debugfileset output
Unlike revset, the order of fileset result doesn't matter since it's used
as a matcher predicate. This stabilizes debugfileset output for upcoming
changes.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:00:26 +0900] rev 38598
fileset: move helper functions to top
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:45:42 +0900] rev 38597
py3: fix bundle heads to be consumable more than once
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:37:05 +0900] rev 38596
py3: byte-stringify literals in hook script in test-bundle.t
# skip-blame just some b''
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:17:54 +0900] rev 38595
py3: make 'None in lazyancestors' not crash
This looks somewhat weird, but we have callers like 'torev(n) in futurecommon'
around where torev(n) is dictlike.get(n). I could fix callers, but that would
be unnecessarily verbose.
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:55:21 +0900] rev 38594
py3: convert server-string to unicode to make http library happy
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:45:40 +0900] rev 38593
py3: fix dumbhttp.py to convert --daemon-postexec arguments back to bytes
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:31:14 +0900] rev 38592
py3: use bytes.endswith() instead of bytes[n]
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:21:26 +0900] rev 38591
diff: graduate word-diff option from experimental
Per 4.6 Sprint notes.
I've also made it gated by "formatchanging" since it could change the output
if we had an option to highlight words without using colors.
Danny Hooper <hooper@google.com> [Fri, 06 Jul 2018 12:47:02 -0700] rev 38590
fix: add test case that shows why --whole with --base is useful
Differential Revision: https://phab.mercurial-scm.org/D3894
Martin von Zweigbergk <martinvonz@google.com> [Fri, 06 Jul 2018 16:45:44 -0700] rev 38589
context: raise ProgrammingError on repo['my-tag']
We had an internal extension that I had failed to migrate off of the
deprecated API and its "'my-tag' in repo" check just started returning
False. It took a while to figure out that that was what was
happening. This patch would have helped.
Differential Revision: https://phab.mercurial-scm.org/D3895
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:49:25 +0900] rev 38588
diffutil: move the module out of utils package
mercurial.utils modules inherit the property of the mercurial.util, which is
no dependency on ui, repo, ctx, etc. As the diffutil module seems to reside
in the scmutil layer, it's probably better to not put it under the utils
package.
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:41:36 +0900] rev 38587
diffutil: remove diffopts() in favor of diffallopts()
patch.diffopts() exists only for backward compatibility. We don't need it
in new module.