indygreg added a comment.
After coding up a handful of patches to switch to the new interface, I
concede that I like the use of methods on the existing API. However, it is
important for protocol version 2 that the peer interface switch to futures. I'm
very reluctant to change the return
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Calls to the legacy commands "changegroup" and "changegroupsubset" have
been ported to the new command executor interface.
Because we always pass arguments
indygreg updated this revision to Diff 8039.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3272?vs=8038=8039
REVISION DETAIL
https://phab.mercurial-scm.org/D3272
AFFECTED FILES
mercurial/treediscovery.py
CHANGE DETAILS
diff --git
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We conceivably don't need to distribute this package on Python 3
since we will use the version in the standard library. However,
we want installs to be usable
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
wireproto.py contains code for both the client and the server. There
*should* be a somewhat strong separation between the two.
This commit extracts the
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Today, the peer interface exposes methods for each command that can
be executed. In addition, there is an iterbatch() API that allows
commands to be issued in
indygreg created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is also shared between client and server and will need to
exist in a shared module when that code is split into different
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Good riddance.
Some tests have been ported to the new API. This probably should
have been done in earlier commits. But duplicating the test coverage
would
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is a bit more complicated than non-batch requests because we
need to buffer sends until the last request arrives *and* we need
to support resolving
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Python 3 has a concurrent.futures package in the standard library
for representing futures. The "futures" package on PyPI is a backport
of this package to work
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Now that we've defined our new interface for issuing commands,
let's implement it.
We add the interface to the base peer interface. This means all
peer
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We now have a new interface for requesting that commands run.
Switch to it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3272
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This makes the package conform with our importing policy,
silencing a number of warnings. It also makes the package usable
when it isn't named
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is used so mutliple directories can provide a package. We don't
need it when vendoring.
REPOSITORY
rHG Mercurial
REVISION DETAIL
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
peer.py hardly contained any code. The code it did contain was
generic to the version 1 peer interface or specific to the
local repository peer.
So code
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is the only other user of iterbatch() in core.
Tests changed because the new command executor is smart enough
to not send a "batch" command over the
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
On Python 3, we use the built-in version in the standard library. Else
we use our vendored backport.
REPOSITORY
rHG Mercurial
REVISION DETAIL
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
It is complaining about unused imports.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3263
AFFECTED FILES
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is low hanging fruit. We might as well start somewhere.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3254
AFFECTED FILES
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
These functions should live in the same place. I plan to separate
client from server code in upcoming commits. wireprototypes is
where we are putting shared
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
So we can implement them without having to implement support for
every command.
REPOSITORY
rHG Mercurial
REVISION DETAIL
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is a bit crude. The capabilities mechanism for version 2 of
the wire protocol is a bit different from version 1. And code
in core is relying on strings
# HG changeset patch
# User Matt Harbison
# Date 1523485409 14400
# Wed Apr 11 18:23:29 2018 -0400
# Node ID cf37bf9b296f3b9f4f248f0f8bf3deb563033b11
# Parent b6cfe8dcd4bb32aa963967eff4287a4643c850de
lfs: handle paths that don't end with '/' when inferring the blob
# HG changeset patch
# User Matt Harbison
# Date 1523211732 14400
# Sun Apr 08 14:22:12 2018 -0400
# Node ID b6cfe8dcd4bb32aa963967eff4287a4643c850de
# Parent 63e77f03856a17fbe6e8dbfddc7b8d48567ad7ce
lfs: infer the blob store URL from an explicit push dest or
# HG changeset patch
# User Matt Harbison
# Date 1523165019 14400
# Sun Apr 08 01:23:39 2018 -0400
# Node ID 63e77f03856a17fbe6e8dbfddc7b8d48567ad7ce
# Parent 11de91e25707a7acb2052fe87fe7aacde88b65ca
lfs: infer the blob store URL from an explicit pull source
I
# HG changeset patch
# User Matt Harbison
# Date 1523482195 14400
# Wed Apr 11 17:29:55 2018 -0400
# Node ID 11de91e25707a7acb2052fe87fe7aacde88b65ca
# Parent 8478b198af9cb96463582be895f0b9a06747a13c
lfs: special case the null:// usercache instead of treating it as
mharbison72 added a comment.
In https://phab.mercurial-scm.org/D3251#52132, @durin42 wrote:
> In https://phab.mercurial-scm.org/D3251#52130, @mharbison72 wrote:
>
> > Is this something where a substitution pattern would work (so that it is
automatic)? I looked at subbing in
durin42 added a comment.
In https://phab.mercurial-scm.org/D3251#52130, @mharbison72 wrote:
> Is this something where a substitution pattern would work (so that it is
automatic)? I looked at subbing in $LOCALIP$ instead of having to glob
$LOCALIP lines manually, but I didn't because
mharbison72 added a comment.
Is this something where a substitution pattern would work (so that it is
automatic)? I looked at subbing in $LOCALIP$ instead of having to glob
$LOCALIP lines manually, but I didn't because all I could tell was that the
glob helped FreeBSD jails in some way
https://bz.mercurial-scm.org/show_bug.cgi?id=5837
Bug ID: 5837
Summary: Rebasing a copy onto a source-file edit loses the edit
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
quark added a comment.
I thought it was `for line in mdiff.splitnewlines(...)`. If we have both
`rawline` and `line` variables, then it is easier.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3210
To: quark, #hg-reviewers
Cc: yuja, mercurial-devel
durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3253
AFFECTED FILES
contrib/python3-whitelist
CHANGE DETAILS
diff
smf added a comment.
In https://phab.mercurial-scm.org/D2873#52100, @indygreg wrote:
> In https://phab.mercurial-scm.org/D2873#52025, @smf wrote:
>
> > In https://phab.mercurial-scm.org/D2873#52021, @indygreg wrote:
> >
> > > Looks good!
> >
> >
> > I'm very heavily against
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Also increase sleep to two seconds so this test will likely pass on FAT32.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3252
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
These localhost instances are actually from a getfqdn call, which
means on some of my test systems it comes out as localhost.localdomain
or
quark added a comment.
In https://phab.mercurial-scm.org/D3212#51917, @yuja wrote:
> Can you split a patch changing the color scheme so we can easily
> back it out as needed?
Note the color configs are not entirely equivalent to the old code. To give
an example:
-LINE-1
indygreg added a comment.
In https://phab.mercurial-scm.org/D2873#52025, @smf wrote:
> In https://phab.mercurial-scm.org/D2873#52021, @indygreg wrote:
>
> > Looks good!
>
>
> I'm very heavily against this direction. Changing the behavior of push
(even in this extension) is
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We're still parsing the stdlib-provided headers here, so we need to
tread carefully and use native strings. Yuck.
REPOSITORY
rHG Mercurial
REVISION DETAIL
durin42 updated this revision to Diff 8015.
durin42 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3246?vs=8010=8015
REVISION DETAIL
https://phab.mercurial-scm.org/D3246
AFFECTED FILES
mercurial/keepalive.py
durin42 updated this revision to Diff 8014.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3245?vs=8008=8014
REVISION DETAIL
https://phab.mercurial-scm.org/D3245
AFFECTED FILES
mercurial/hgweb/wsgiheaders.py
CHANGE DETAILS
diff --git
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This fixes a lot of hanging tests on Python 3, because
"Content-Length" was getting sent as "b'Content-Length'" (yes, really)
and then clients would expect a
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This re-fixes test-pull-http.t on Python 3. Probably many others as well.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3249
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This also gives us some minimal "it loads" coverage on showstack,
which I rather like.
I added this in service of debugging a hang introduced on Python 3 by
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
It turns out http.client on Python 3 sometimes uses readinto() in the
implementation of read().
Subclassing is bad, folks.
REPOSITORY
rHG Mercurial
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will let us restore Python 3 compatibility for tests that do http things.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3245
durin42 updated this revision to Diff 8009.
durin42 edited the summary of this revision.
durin42 retitled this revision from "hgweb: str/bytes followups after
indygreg's refactoring" to "hgweb: use our forked wsgiheaders module instead of
stdlib one".
REPOSITORY
rHG Mercurial
CHANGES SINCE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8478b198af9c: tests: add tests showing pulling from
infinitepush works over wire (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
I'm not crazy about the implementation. But for an experimental feature, I
think it is fine. The bundle2 changes to do this right are definitely scope
bloat.
INLINE COMMENTS
>
smf added a comment.
In https://phab.mercurial-scm.org/D2873#52021, @indygreg wrote:
> Looks good!
I'm very heavily against this direction. Changing the behavior of push (even
in this extension) is something I've always considered outside the scope of
remotenames. Having another
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
Looks good!
INLINE COMMENTS
> remotenames.py:113
> +else:
> +msg = _("bookmark '%s' does not exists on remote")
> +raise error.Abort(msg % bookmark)
Nit: "exist".
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG41ba336d9f1e: fix: use a portable python script instead of
sed in test (authored by hooper, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 accepted this revision.
durin42 added a comment.
This revision is now accepted and ready to land.
Sorry, this fell through the cracks somehow. Queued.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2988
To: hooper, #hg-reviewers, durin42
Cc: durin42,
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc4a0626f6b6e: py3: use pycompat.bytestr() where repr in
involved (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 accepted this revision.
durin42 added a comment.
This revision is now accepted and ready to land.
queued, congrats on becoming the new mq maintainer
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3244
To: pulkit, #hg-reviewers, durin42
Cc: durin42,
On Wed, Apr 11, 2018 at 9:03 PM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1523274281 -32400
> # Mon Apr 09 20:44:41 2018 +0900
> # Node ID da53a21e2b96040ca2005d627b6c69a91e83f938
> # Parent
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG734515aca84d: wireproto: define and implement HTTP
handshake to upgrade protocol (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8a73132214a3: httppeer: support protocol upgrade (authored
by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3243?vs=7961=8004
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb77aa48ba690: httppeer: only advertise partial-pull if
capabilities are known (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6b08cf6b900f: httppeer: allow opener to be passed to
makepeer() (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG930c433eb311: httppeer: always add x-hg* headers to Vary
header (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG301a1d2e8016: httppeer: dont accept very old media
types (BC) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG66d1001e1500: httppeer: extract code for creating a request
into own function (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG835ccc2a5ef1: httppeer: move requestbuilder defaults into
makepeer() argument (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG946eb204ba67: httppeer: extract common response handling
into own function (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb5862ee01abe: httppeer: move error handling and response
wrapping into sendrequest (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG93397c4633f6: wireproto: extract HTTP version 2 code to own
module (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG01361be9e2dc: wireproto: introduce a reactor for
client-side state (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3a2367e6c6f2: wireproto: move version 2 command handlers to
wireprotov2server (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1ec5ce21cb46: tests: extract wire protocol framing tests to
own file (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8e7a4435ab6d: httppeer: extract code for performing an HTTP
request (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG55b5ba8d4e68: wireproto: client reactor support for
receiving frames (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 added inline comments.
INLINE COMMENTS
> httppeer.py:507
>
> -url = '%s/api/%s/%s/%s' % (self.url, wireprotoserver.HTTPV2,
> permission,
> - name)
> +url = '%s/api/%s/%s/%s' % (self.url, wireprotov2server.HTTPV2,
> +
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbe5d4749edc0: wireproto: port pushkey command to wire
protocol version 2 (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4a0d58d6faba: wireproto: only expose getbundle
and unbundle to v1 transports (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3e5e37204b32: wireproto: disallow commands handlers for
multiple transport versions (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG89fed81bbb6c: wireproto: port lookup to wire protocol v2
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3205?vs=7909=7984
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2003da12f49b: wireproto: only expose
clonebundles to version 1 transports (authored by indygreg,
committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG69e46c1834ac: wireproto: define and expose types of wire
command arguments (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG693cb3768943: wireproto: make @wireprotocommand version 1
only by default (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf4985497986: wireproto: implement capabilities for wire
protocol v2 (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG465187fec06f: wireproto: only expose stream_out
to version 1 transports (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 added inline comments.
INLINE COMMENTS
> indygreg wrote in test-wireproto-command-pushkey.t:1
> And at the same time having giant test files makes it difficult to refactor
> an existing test file because tests below change due to differences above.
> You end up doing all kinds of
> On Apr 11, 2018, at 7:54 AM, Yuya Nishihara wrote:
>
>> On Tue, 10 Apr 2018 16:09:25 -0400, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison
>> # Date 1523165019 14400
>> # Sun Apr 08 01:23:39 2018 -0400
>> # Node ID
# HG changeset patch
# User Yuya Nishihara
# Date 1523032645 -32400
# Sat Apr 07 01:37:25 2018 +0900
# Node ID 209a355d60e0d4996b5587d0e017380d3484670b
# Parent c487b1b45eabcbe4cfd38a22a66e2fe6a71176b3
diffhelpers: be more tolerant for stripped empty lines of CRLF ending
# HG changeset patch
# User Yuya Nishihara
# Date 1523274774 -32400
# Mon Apr 09 20:52:54 2018 +0900
# Node ID 69d8de4156f5a230b8abc73d87e5aeb46ceb5b06
# Parent 79d149236bfa8ebfb221573ad33b8f8f715fde7d
diffhelpers: naming and whitespace cleanup
diff --git
# HG changeset patch
# User Yuya Nishihara
# Date 1523274905 -32400
# Mon Apr 09 20:55:05 2018 +0900
# Node ID 62ebfa7e5a3388c1761830d788b53dd46d0a9ad4
# Parent 5985aee99980721a04dda5980dc4c33eb560ff72
diffhelpers: remove unused return value from fixnewline() and addlines()
# HG changeset patch
# User Yuya Nishihara
# Date 1523274579 -32400
# Mon Apr 09 20:49:39 2018 +0900
# Node ID 2d521734ec51a8dbf99c77fd0c2242669c7b5109
# Parent 35a82b6cd55528b0aa0028321c69756d41175b54
patch: stop using cext.diffhelpers
The C implementation has a couple of
# HG changeset patch
# User Yuya Nishihara
# Date 1523275606 -32400
# Mon Apr 09 21:06:46 2018 +0900
# Node ID 6265e0c7a7ab727f253fdc915caa2339fbe65728
# Parent 62ebfa7e5a3388c1761830d788b53dd46d0a9ad4
patch: error out if reached to EOF while reading hunk
This was where
# HG changeset patch
# User Yuya Nishihara
# Date 1523275732 -32400
# Mon Apr 09 21:08:52 2018 +0900
# Node ID c487b1b45eabcbe4cfd38a22a66e2fe6a71176b3
# Parent 6265e0c7a7ab727f253fdc915caa2339fbe65728
diffhelpers: make return value of testhunk() more Pythonic
It's no longer
# HG changeset patch
# User Yuya Nishihara
# Date 1523274840 -32400
# Mon Apr 09 20:54:00 2018 +0900
# Node ID 5985aee99980721a04dda5980dc4c33eb560ff72
# Parent 69d8de4156f5a230b8abc73d87e5aeb46ceb5b06
diffhelpers: move out of pure package
diff --git
# HG changeset patch
# User Yuya Nishihara
# Date 1523274683 -32400
# Mon Apr 09 20:51:23 2018 +0900
# Node ID 79d149236bfa8ebfb221573ad33b8f8f715fde7d
# Parent 2d521734ec51a8dbf99c77fd0c2242669c7b5109
diffhelpers: remove C implementation in favor of pure Python version
diff
# HG changeset patch
# User Yuya Nishihara
# Date 1523274463 -32400
# Mon Apr 09 20:47:43 2018 +0900
# Node ID 35a82b6cd55528b0aa0028321c69756d41175b54
# Parent da53a21e2b96040ca2005d627b6c69a91e83f938
diffhelpers: port docstrings from cext to pure
I'll remove the C
# HG changeset patch
# User Yuya Nishihara
# Date 1523274281 -32400
# Mon Apr 09 20:44:41 2018 +0900
# Node ID da53a21e2b96040ca2005d627b6c69a91e83f938
# Parent 8475c9bf096d5f67b3a82de73b27a61ef53018f1
py3: get rid of character access from pure.diffhelpers
's' is a result of
On Wed, 11 Apr 2018 11:50:15 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1520412972 18000
> # Wed Mar 07 03:56:12 2018 -0500
> # Node ID 00090d394d4e0a7c2637f161493353530dcf739d
> # Parent 5c1a0d784a26d4e8659dcec80503c8764432a303
> #
On Wed, 11 Apr 2018 11:36:05 +0200, Feld Boris wrote:
> >> The proposal here is to define a prefix for which we break backward
> >> compatibility. If we do so, people with a "" label will have to use:
> >>
> >> "":whatever
> >>
> >> to get a similar effect.
> > IIRC x:y was the most important
On Wed, 11 Apr 2018 07:57:56 -0400, Matt Harbison wrote:
> >> +url = util.url(bytes(defaulturl))
> >
> > Nit: perhaps no need to reparse the url since defaulturl is a url object.
>
> I don’t have the code in front of me, but I think there is an _originalpath
> member that doesn’t
yuja added a comment.
> That said, I'm fine with changing the defaults to whatever. So feel
> free to send follow-ups changing it.
Can you split a patch changing the color scheme so we can easily
back it out as needed?
INLINE COMMENTS
> quark wrote in patch.py:2536
> For a split
yuja added a comment.
It's just a few-line patch after removal of the current worddiff, and can be
simplified further.
Anyway, I can clean up later.
diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -2490,10
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa7de62adcf03: py3: workaround comparing NoneType and
integers (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8475c9bf096d: context: add deprecation warnings for
deprecated types of changeids (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
1 - 100 of 131 matches
Mail list logo