Kyle Lippincott <spectral@google.com> [Sat, 20 Jan 2018 15:33:48 -0800] rev 35948
merge: use operation-provided labels (ex: dest/source) in several merge-tools
Tools that did not use labels already, used only one, or used some label other
than the exact strings of "local" or "other" were unmodified. Cases that used
the label "base" were modified as well, if they were otherwise changed in this
CL; "merged" was *not* changed.
There are other possible changes we might want to make, but I didn't:
- bcompare (linux and osx) uses the labels "parent1" and "parent2" instead of
"local" and "other", so it was left alone, even though beyondcompare3
(windows) *was* changed.
- araxis used the labels "Other", "Base", and "Local :$local", so it was also
left alone.
- UltraCompare didn't provide a label for 'local', just for 'base' and 'other',
so it was left alone.
Differential Revision: https://phab.mercurial-scm.org/D2012
Kyle Lippincott <spectral@google.com> [Wed, 17 Jan 2018 17:35:05 -0800] rev 35947
filemerge: support passing labels to external merge tools
This adds $labellocal, $labelother, and $labelbase to the replacement set for
merge-tools.<tool>.args config variables, and to the environment as HG_MY_LABEL,
HG_OTHER_LABEL, and HG_BASE_LABEL, respectively.
We also add merge-tools.<tool>.mergemarkers and
merge-tools.<tool>.mergemarkertemplate config variables as counterparts of
the variables available in [ui]. We are intentionally *not* respecting
ui.mergemarkers when calling out to external merge programs; too often the
default template will be too wide to display comfortably in most GUIs.
Differential Revision: https://phab.mercurial-scm.org/D2011
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:20:55 -0500] rev 35946
bookmarks: drop deprecated methods (API)
The ProgrammingError prevents accidental usage of the dict base class methods.
.. api::
The following deprecated methods have been removed from bookmarks:
__setitem__(), __delitem__(), update(), and recordchange(). Use
bookmarks.applychanges() instead.
Yuya Nishihara <yuya@tcha.org> [Sat, 03 Feb 2018 15:26:13 +0900] rev 35945
archive: rewrite default metadata template as a multi-line bytes literal
This fixes test-directaccess.t on Python 3.
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 17:46:37 +0900] rev 35944
py3: drop b'' from repr() of smartset
cmdutil._maybebytestr() is moved to pycompat.
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 17:31:25 +0900] rev 35943
py3: always drop b'' prefix from repr() of bytestr
Perhaps this is what we wanted for py2-3 compatibility.
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 17:13:51 +0900] rev 35942
py3: format revision number as '%d' in debugrevspec
Now "hg debugrevspec" works on Python 3.
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 17:12:35 +0900] rev 35941
py3: build repr() of smartset as bytes then convert to str
This isn't pretty, but we have no way to teach Python 3 that our __repr__()
would like to return a byte string.
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 13:33:31 +0900] rev 35940
py3: factor out helpers to apply string conversion recursively
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 13:14:06 +0900] rev 35939
py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr()
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 13:11:46 +0900] rev 35938
py3: replace "if ispy3" by pycompat.bytestr()
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 13:09:49 +0900] rev 35937
py3: replace "if ispy3" by encoding.strtolocal()
Matt Harbison <matt_harbison@yahoo.com> [Sat, 03 Feb 2018 00:01:57 -0500] rev 35936
localrepo: drop the deprecated walk() method (API)
.. api::
The deprecated localrepo.walk() has been removed, and replaced by
repo[node].walk().
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:57:52 -0500] rev 35935
dirstate: drop deprecated methods (API)
.. api::
beginparentchange() and endparentchange() have been replaced by the
parentchange context manager.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:53:57 -0500] rev 35934
templatekw: drop the deprecated '{troubles}' keyword
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:52:19 -0500] rev 35933
obsutil: drop deprecated methods (API)
.. api::
The following deprecated methods have been removed from obsutil:
marker.precnode() and allprecursors(). Use marker.prednode() and
allpredecessors() instead.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:48:25 -0500] rev 35932
revset: drop deprecated evolution predicates
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:45:31 -0500] rev 35931
obsolete: drop deprecated methods (API)
.. api::
The following deprecated methods have been removed from obsolete, with
replacements:
- _addprecursors() -> _addpredecessors()
- obsstore.precursors -> obsstore.predecessors
- allprecursors() -> obsutil.allprecursors()
- allsuccessors() -> obsutil.allsuccessors()
- marker() -> obsutil.marker
- getmarkers() -> obsutil.getmarkers()
- exclusivemarkers() -> obsutil.exclusivemarkers()
- foreground() -> obsutil.foreground()
- successorssets() -> obsutil.successorsset()
- unstable() -> orphan()
- bumped() -> phasedivergent()
- divergent() -> contentdivergent()
Matt Harbison <matt_harbison@yahoo.com> [Fri, 02 Feb 2018 23:27:30 -0500] rev 35930
context: drop deprecated methods (API)
.. api::
The following deprecated methods have been removed from context, with
replacements:
- unstable() -> orphan()
- bumped() -> phasedivergent()
- divergent() -> contentdivergent()
- troubled() -> isunstable()
- troubles() -> instabilities()
Joerg Sonnenberger <joerg@bec.de> [Thu, 25 Jan 2018 20:00:58 +0100] rev 35929
ui: improve performance for multi-component writes
It is more efficient to pass down one large string to the output streams
than many small ones. For a ``hg diff`` test case, it improves time from
2m26s to 2m8s.
Differential Revision: https://phab.mercurial-scm.org/D1939
Yuya Nishihara <yuya@tcha.org> [Sun, 21 Jan 2018 13:03:03 +0900] rev 35928
cmdutil: drop aliases for logcmdutil functions (API)
.. api::
Log-related utility functions has been renamed as follows:
- cmdutil.loglimit -> logcmdutil.getlimit
- cmdutil.diffordiffstat -> logcmdutil.diffordiffstat
- cmdutil._changesetlabels -> logcmdutil.changesetlabels
- cmdutil.changeset_printer -> logcmdutil.changesetprinter
- cmdutil.jsonchangeset = logcmdutil.jsonchangeset
- cmdutil.changeset_templater -> logcmdutil.changesettemplater
- cmdutil.logtemplatespec -> logcmdutil.templatespec
- cmdutil.makelogtemplater -> logcmdutil.maketemplater
- cmdutil.show_changeset -> logcmdutil.changesetdisplayer
- cmdutil.getlogrevs -> logcmdutil.getrevs
- cmdutil.getloglinerangerevs -> logcmdutil.getlinerangerevs
- cmdutil.displaygraph -> logcmdutil.displaygraph
- cmdutil.graphlog -> logcmdutil.graphlog
- cmdutil.checkunsupportedgraphflags -> logcmdutil.checkunsupportedgraphflags
- cmdutil.graphrevs -> logcmdutil.graphrevs
- cmdutil._makenofollowlogfilematcher -> logcmdutil._makenofollowfilematcher
Yuya Nishihara <yuya@tcha.org> [Sun, 21 Jan 2018 12:48:39 +0900] rev 35927
logcmdutil: drop redundant "log" from function names (API)
A few exceptions:
- s/loglimit/getlimit/ to avoid name conflict
- s/_logrevs/_initialrevs/ to clarify its functionality
Yuya Nishihara <yuya@tcha.org> [Sun, 21 Jan 2018 12:36:43 +0900] rev 35926
logcmdutil: rename classes and functions to conform to our coding style (API)
show_changeset is renamed to changesetdisplayer as its return value is called
a displayer.
Yuya Nishihara <yuya@tcha.org> [Sun, 21 Jan 2018 12:26:42 +0900] rev 35925
cmdutil: split functions of log-like commands to new module (API)
cmdutil.py is painfully big and makes Emacs slow. Let's split log-related
functions.
% wc -l mercurial/cmdutil.py
4027 mercurial/cmdutil.py
% wc -l mercurial/cmdutil.py mercurial/logcmdutil.py
3141 mercurial/cmdutil.py
933 mercurial/logcmdutil.py
4074 total
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 02 Feb 2018 13:13:46 -0800] rev 35924
httppeer: remove support for connecting to <0.9.1 servers (BC)
Previously, HTTP wire protocol clients would attempt a
"capabilities" wire protocol command. If that failed, they would
fall back to issuing a "between" command.
The "capabilities" command was added in Mercurial 0.9.1 (released
July 2006). The "between" command has been present for as long as
the wire protocol has existed. So if the "between" command failed,
it was safe to assume that the remote could not speak any version
of the Mercurial wire protocol.
The "between" fallback was added in 395a84f78736 in 2011. Before that
changeset, Mercurial would *always* issue the "between" command and
would issue "capabilities" if capabilities were requested. At that time,
many connections would issue "capabilities" eventually, so it was
decided to issue "capabilities" by default and fall back to "between"
if that failed. This saved a round trip when connecting to modern
servers while still preserving compatibility with legacy servers.
Fast forward ~7 years. Mercurial servers supporting "capabilities"
have been around for over a decade. If modern clients are
connecting to <0.9.1 servers, they are getting a bad experience.
They may even be getting bad data (an old server is vulnerable to
numerous security issues and could have been p0wned, leading to a
Mercurial repository serving backdoors or other badness).
In addition, the fallback can harm experience for modern servers.
If a client experiences an intermittent HTTP request failure (due to
bad network, etc) and falls back to a "between" that works, it would
assume an empty capability set and would attempt to communicate with
the repository using a very ancient wire protocol. Auditing HTTP logs
for hg.mozilla.org, I did find a handful of requests for the
null range of the "between" command. However, requests can be days
apart. And when I do see requests, they come in batches. Those
batches seem to correlate to spikes of HTTP 500 or other
server/network events. So I think these requests are fallbacks from
failed "capabilities" requests and not from old clients.
If you need even more evidence to discontinue support, apparently
we have no test coverage for communicating with servers not
supporting "capabilities." I know this because all tests pass
with the "between" fallback removed.
Finally, server-side support for <0.9.1 pushing (the "addchangegroup"
wire protocol command along with locking-related commands) was dropped
from the HTTP client in fda0867cfe03 in 2017 and the SSH client in
9f6e0e7ef828 in 2015.
I think this all adds up to enough justification for removing client
support for communicating with servers not supporting "capabilities."
So this commit removes that fallback.
Differential Revision: https://phab.mercurial-scm.org/D2001
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 01 Feb 2018 21:55:06 -0800] rev 35923
internals: document when "hello" and "capabilities" commands were added
Both were introduced in 0.9.1.
"hello" made its entrance in b17eebc911ae, 144280f1578f, and
a1cfe679192c to support SSH.
"capabilities" was added in c660691fb45d to support HTTP.
Differential Revision: https://phab.mercurial-scm.org/D2000
Yuya Nishihara <yuya@tcha.org> [Sat, 27 Jan 2018 14:17:26 +0900] rev 35922
tests: make doctest py3-compatible again
A parsed tree is replaced with parse(expr) because it sucks to add b'' to
every string literal.
Matt Harbison <matt_harbison@yahoo.com> [Mon, 29 Jan 2018 22:09:48 -0500] rev 35921
lfs: emit a status message to indicate how many blobs were uploaded
Previously, there was a progress bar indicating the byte count, but then it
disappeared once the transfer was done. Having that value stay on the screen
seems useful. Downloads are done one at a time, so hold off on that until they
can be coalesced, to avoid a series of lines being printed. (I don't have any
great ideas on how to do that. It would be a shame to have to wrap a bunch of
read commands to be able to do this.)
I'm not sure if the 'lfs:' prefix is the right thing to do here. The others in
the test are verbose/debug messages, so in the normal case, this is the only
line that's prefixed.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 30 Jan 2018 20:33:21 -0500] rev 35920
lfs: drop an unused function parameter
Martin von Zweigbergk <martinvonz@google.com> [Thu, 01 Feb 2018 10:10:01 -0800] rev 35919
discovery: don't reimplement all()
Differential Revision: https://phab.mercurial-scm.org/D1993
Augie Fackler <augie@google.com> [Thu, 01 Feb 2018 16:01:43 -0500] rev 35918
contrib: fix dirstatenonnormalcheck to work in Python 3
This is a redo of D1963 that has the added benefit of not breaking
Python 2. Oops.
# skip-blame because this is bytes prefixes and a s/iteritems/items/
Differential Revision: https://phab.mercurial-scm.org/D1970
Augie Fackler <augie@google.com> [Thu, 18 Jan 2018 13:12:09 -0500] rev 35917
python3: whitelist another 24 passing tests
Differential Revision: https://phab.mercurial-scm.org/D1911
Augie Fackler <augie@google.com> [Thu, 01 Feb 2018 18:14:52 -0500] rev 35916
mdiff: use slice instead of index on bytestr when checking single bytes
This is portable to Python 3.
Differential Revision: https://phab.mercurial-scm.org/D1992
Augie Fackler <augie@google.com> [Thu, 18 Jan 2018 13:04:16 -0500] rev 35915
obsutil: work around filter() being a generator in Python 3
Differential Revision: https://phab.mercurial-scm.org/D1910
Augie Fackler <augie@google.com> [Thu, 18 Jan 2018 12:59:40 -0500] rev 35914
cmdutil: add a kludge to make bytes repr() the same on 2 and 3
This fixes the output formatting problems I see in debugobsolete. I
still am seeing some effectflag differences, which we'll need to
tackle separately.
I'm not in love with this approach. There might be something better we
could do, and I'd love it if someone else wanted to take a run at
this.
Differential Revision: https://phab.mercurial-scm.org/D1909
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:32:21 -0800] rev 35913
wireprotoserver: make name part of protocol interface
This is a required part of the interface. Abstract properties must
be defined at type creation time. So we make name a @property.
Differential Revision: https://phab.mercurial-scm.org/D1991
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:30:16 -0800] rev 35912
wireprotoserver: make abstractserverproto a proper abstract base class
Plug in the abc module so we can have run-time validation of type
conformance.
Differential Revision: https://phab.mercurial-scm.org/D1990
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:26:03 -0800] rev 35911
wireprotoserver: make response handling attributes private
The send* methods are specific to sshserver and aren't part of the
common protocol interface. So rename them accordingly.
The handlers dict is also specific to sshserver and is related to
these methods. So give it the same treatment.
Differential Revision: https://phab.mercurial-scm.org/D1989
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:24:44 -0800] rev 35910
wireprotoserver: make some instance attributes private
sshserver attempts to conform to a well-defined interface. The instance
attributes changed as part of this commit don't appear to be part of
that interface. So prefix them with _ to mark them as private.
Differential Revision: https://phab.mercurial-scm.org/D1988
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:19:47 -0800] rev 35909
wireprotoserver: remove sshserver.getarg()
AFAICT the last consumer of this helper method was removed by
d054cc5c7737 in 2010.
Differential Revision: https://phab.mercurial-scm.org/D1987
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:19:05 -0800] rev 35908
wireprotoserver: remove lock references
AFAICT sshserver.lock is unused. The last caller of it disappeared
in 9f6e0e7ef828 ~18 months ago as part of removing code to support
ancient wire protocol commands. Let's remove some dead code.
Differential Revision: https://phab.mercurial-scm.org/D1986
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 11:17:41 -0800] rev 35907
wireprotoserver: remove support for do_<command> handlers (API)
Old versions of wire protocol handlers relied on methods
named do_<command> to handle wire protocol commands. The last
definition of these methods on sshserver was removed by
9f6e0e7ef828 ~2 years ago. I think it's time to not support this
mechanism for defining command handlers.
.. api::
sshserver no longers looks for wire protocol command handlers
in methods named do_<command>. Use @wireproto.wireprotocommand
to declare wire protocol command handler functions.
Differential Revision: https://phab.mercurial-scm.org/D1985
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 10:19:08 -0800] rev 35906
wireprotoserver: make attributes private
These aren't part of the protocol interface. So they should be
_ prefixed.
Differential Revision: https://phab.mercurial-scm.org/D1984
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 10:17:11 -0800] rev 35905
wireprotoserver: remove unused response attribute
I think the last use of this attribute was removed by 2f8adc60e013
in 2010.
Differential Revision: https://phab.mercurial-scm.org/D1983
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 31 Jan 2018 10:09:41 -0800] rev 35904
wireprotoserver: rename p to proto
To aid readability. And to make it easier to search the code base
for protocol instances.
Differential Revision: https://phab.mercurial-scm.org/D1982
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 30 Jan 2018 17:51:57 -0800] rev 35903
wireprotoserver: add some blank lines between methods
Let's make this file slightly easier to read.
Differential Revision: https://phab.mercurial-scm.org/D1981
Augie Fackler <augie@google.com> [Thu, 25 Jan 2018 23:01:20 -0500] rev 35902
tests: start a set of unit tests for mdiff.py, starting with splitnewlines
I want to optimize splitnewlines, so writing tests seems prudent.
Differential Revision: https://phab.mercurial-scm.org/D1972
# no-check-commit because of test_ funciton
Augie Fackler <augie@google.com> [Thu, 25 Jan 2018 14:46:19 -0500] rev 35901
perf: add a perfunidiff command for benchmarking unified diff speed
Differential Revision: https://phab.mercurial-scm.org/D1971