Re: [PATCH evolve-ext] py3: broad pass for python3 compatibility

2019-05-24 Thread Anton Shestakov
On Fri, 24 May 2019 15:57:53 + Ludovic Chabant wrote: > # HG changeset patch > # User Ludovic Chabant > # Date 1558677189 0 > # Fri May 24 05:53:09 2019 + > # Node ID 3af350fa12d4dbf69d5cbbaf5ca679067472f9ee > # Parent 0b231ea2124baf74fee5e325922a57fb0d89bbe3 > # EXP-Topic py3 >

D6441: help: check if a subtopic exists and raise an error if it doesn't (issue6145)

2019-05-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz requested changes to this revision. martinvonz added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > ngoldbaum wrote in help.py:689-695 > I left this as-is because I find for-else statements hard to read (I never > remember what it means!) and find

mercurial@42369: 2 new changesets

2019-05-24 Thread Mercurial Commits
2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f66628c15e6f changeset: 42368:f66628c15e6f user:Pulkit Goyal date:Fri May 24 15:57:00 2019 +0300 summary: narrow: pass binary nodeids to generateellipsesbundle2()

D6443: py3: use range() instead of xrange()

2019-05-24 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc2d10506725c: py3: use range() instead of xrange() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6443?vs=15250=15257

D6446: relnotes: document changed behavior of ui.origbackuppath pointing to file

2019-05-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6446 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next b/relnotes/next ---

D6403: util: make util.dirs() and util.finddirs() include root directory (API)

2019-05-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6403#93612, @pulkit wrote: > > it no longer errors out when the backup path points to an existing > > file. Instead, it replaces the file by a directory. > > I think this should be a part of relnotes. Note that

D6422: copies: avoid calling matcher if matcher.always()

2019-05-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6422#93611, @marmoute wrote: > (I did some experiment, here seems a good spot to report them) > > I build a crude cache (cbor based storage) for the data that needs caching after this series and tested it against my pypy

D6445: narrow: move heads close to common as they are closely related

2019-05-24 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG343b3ed35cb8: narrow: move heads close to common as they are closely related (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6444: narrow: pass binary nodeids to generateellipsesbundle2()

2019-05-24 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf66628c15e6f: narrow: pass binary nodeids to generateellipsesbundle2() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6441: help: check if a subtopic exists and raise an error if it doesn't (issue6145)

2019-05-24 Thread ngoldbaum (Nathan Goldbaum)
ngoldbaum added inline comments. INLINE COMMENTS > av6 wrote in help.py:689-695 > This made me remember that for-else statement exists. I left this as-is because I find for-else statements hard to read (I never remember what it means!) and find this to be clearer even if there's a bit more

D6442: help: include subtopic in error message if passed

2019-05-24 Thread ngoldbaum (Nathan Goldbaum)
ngoldbaum updated this revision to Diff 15253. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6442?vs=15247=15253 REVISION DETAIL https://phab.mercurial-scm.org/D6442 AFFECTED FILES mercurial/help.py tests/test-help.t CHANGE DETAILS diff --git

mercurial@42367: 25 new changesets

2019-05-24 Thread Mercurial Commits
25 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d8e55c0c642c changeset: 42343:d8e55c0c642c user:Martin von Zweigbergk date:Tue May 16 11:00:38 2017 -0700 summary: util: make util.dirs() and util.finddirs() include root directory (API)

D6442: help: include subtopic in error message if passed

2019-05-24 Thread ngoldbaum (Nathan Goldbaum)
ngoldbaum added inline comments. INLINE COMMENTS > av6 wrote in help.py:826 > Concatenating things is not the best option when it comes to i18n, but even > if it were, I think it would make sense to only show here the subtopic, if > it's provided. If people are curious about internals.foobar

D6440: fix: let fixer tools inherit hg's cwd so they can look at the working copy

2019-05-24 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > hooper wrote in fix.py:106 > It depends on whether we want to make it easier for tools that want to > examine the tree upward from the cwd or tools that want to examine the tree > downward from the root. I suspect that "upward" will be more

D6441: help: check if a subtopic exists and raise an error if it doesn't (issue6145)

2019-05-24 Thread av6 (Anton Shestakov)
av6 added inline comments. INLINE COMMENTS > help.py:689-695 > +exists = False > for names, header, doc in subtopics[name]: > if subtopic in names: > +exists = True > break > +if not exists: > +

D6436: narrow: use narrow_widen wireproto command to widen in case of ellipses

2019-05-24 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D6436#93598, @martinvonz wrote: > This is going to break our server. Can you make it work with existing servers for a while (behave differently depending on capability, I suppose), so we can get a chance to transition? I would

D6442: help: include subtopic in error message if passed

2019-05-24 Thread av6 (Anton Shestakov)
av6 added inline comments. INLINE COMMENTS > help.py:826 > +if subtopic: > +hint += _(" or 'hg help --keyword %s'") % subtopic > raise error.Abort(msg, hint=hint) Concatenating things is not the best option when it comes to i18n, but even if

D6445: narrow: move heads close to common as they are closely related

2019-05-24 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6445 AFFECTED FILES

D6444: narrow: pass binary nodeids to generateellipsesbundle2()

2019-05-24 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We generally work with binary nodeids and it's should be expected that new function gets the

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

2019-05-24 Thread Pulkit Goyal
On Thu, May 23, 2019 at 11:12 PM Navaneeth Suresh wrote: > Hello all, > > Thanks for the comments. I found that a commit with an unresolved state > should be similar to a normal merge commit with some metadata about the > files which have unresolved conflicts. This is how I thought of creating a

D6443: py3: use range() instead of xrange()

2019-05-24 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The latter does not exist on Python 3. This makes test-contrib-perf.t pass on Python 3 again. REPOSITORY rHG Mercurial REVISION DETAIL

D6432: match: de-flake test-doctest.py by not depending on util.dirs() order

2019-05-24 Thread yuja (Yuya Nishihara)
yuja added a comment. > > > @@ -1384,26 +1384,26 @@ > > > > > > >>> _rootsdirsandparents( > > > ... [(b'glob', b'g/h/*', b''), (b'glob', b'g/h', b''), > > > ... (b'glob', b'g*', b'')]) > > > > > > - (['g/h', 'g/h', ''], [], ['', 'g']) +(['g/h',

Re: D6432: match: de-flake test-doctest.py by not depending on util.dirs() order

2019-05-24 Thread Yuya Nishihara
> > > @@ -1384,26 +1384,26 @@ > > > > > > >>> _rootsdirsandparents( > > > ... [(b'glob', b'g/h/*', b''), (b'glob', b'g/h', b''), > > > ... (b'glob', b'g*', b'')]) > > > > > > - (['g/h', 'g/h', ''], [], ['', 'g']) +(['g/h', 'g/h', ''], [], > set(['', 'g'])) > >

Re: [PATCH] match: stabilize _rootsdirsandparents doctest

2019-05-24 Thread Pulkit Goyal
On Fri, May 24, 2019 at 1:49 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1558694026 -7200 > # Fri May 24 12:33:46 2019 +0200 > # Node ID 96fc696a9cb2052561afd8918676b05720ee5244 > # Parent

mercurial@42342: 5 new changesets

2019-05-24 Thread Mercurial Commits
5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/78530404d00b changeset: 42338:78530404d00b user:Martin von Zweigbergk date:Fri May 17 11:32:48 2019 -0700 summary: convert: demonstrate broken {files} list in merge commits with file flags

D6403: util: make util.dirs() and util.finddirs() include root directory (API)

2019-05-24 Thread pulkit (Pulkit Goyal)
pulkit added a comment. > it no longer errors out when the backup path points to an existing > file. Instead, it replaces the file by a directory. I think this should be a part of relnotes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6403 To:

D6422: copies: avoid calling matcher if matcher.always()

2019-05-24 Thread marmoute (Pierre-Yves David)
marmoute added a comment. (I did some experiment, here seems a good spot to report them) I build a crude cache (cbor based storage) for the data that needs caching after this series and tested it against my pypy test case. filelog-based: 15s compatibility mode; without cache:

[PATCH] match: stabilize _rootsdirsandparents doctest

2019-05-24 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1558694026 -7200 # Fri May 24 12:33:46 2019 +0200 # Node ID 96fc696a9cb2052561afd8918676b05720ee5244 # Parent 21e77ede77a299c7bab2a73dd144225a0ff9 # EXP-Topic fix-build # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 3] rust: module policy with importrust

2019-05-24 Thread Georges Racinet
On 5/24/19 1:35 AM, Yuya Nishihara wrote: > On Thu, 23 May 2019 13:29:05 +0200, Georges Racinet wrote: >> # HG changeset patch >> # User Georges Racinet >> # Date 1558603154 -7200 >> # Thu May 23 11:19:14 2019 +0200 >> # Node ID 36b4c4869531b3de0b101c941b77b94da85890b7 >> # Parent

D6389: rust-dirstate: create dirstate submodule

2019-05-24 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in mod.rs:7 > Ok, I'm still not convinced this is the best API to expose but if it is a > public API I guess it can't be changed. Yup. I've rebased this change. REPOSITORY rHG Mercurial REVISION DETAIL

D6389: rust-dirstate: create dirstate submodule

2019-05-24 Thread kevincox (Kevin Cox)
kevincox accepted this revision. kevincox added inline comments. INLINE COMMENTS > Alphare wrote in mod.rs:7 > The current Python public API expects `parents` as return value and does > mutate-on-parse for other in-memory objects. Sorry if I'm missing something > obvious. Ok, I'm still not

D6389: rust-dirstate: create dirstate submodule

2019-05-24 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in mod.rs:7 > I guess the point I am trying to make is why do we pass around this > "half-parsed" object. Why can't the public API go straight from bytes -> > fully parsed. The current Python public API expects `parents` as

D6389: rust-dirstate: create dirstate submodule

2019-05-24 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in mod.rs:7 > This is public so that `hg-cpython` can use it. I think it helps with > readability too, a "bag of bytes" is sometimes not really helpful when > stumbling on code. I guess the point I am trying to make is why do we

D6389: rust-dirstate: create dirstate submodule

2019-05-24 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in mod.rs:6 > If 1 and 2 are the best names why not just make it `pub struct > DirstateParetens([&[u8]; 2])`? I feel that accessing `parents.p1` is more semantic and less noisy than `parents.0[0]`. Also doing DirstateParents([