D6274: copies: document cases in _chain()

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. I think the rest of the stack from this patch are independent of the ones before, so if reviewers are intimidated by https://phab.mercurial-scm.org/D6255, they should still be able to take this section of the stack. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH] httppeer: make sure we limit argument for older server not supporting batch

2019-04-24 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Apr 24, 2019 at 7:25 PM Gregory Szorc wrote: > On Wed, Apr 24, 2019 at 12:29 AM Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > >> # HG changeset patch >> # User Pierre-Yves David >> # Date 1556049342 -7200 >> # Tue Apr 23 21:55:42 2019 +0200 >> # Node ID

Re: [PATCH] httppeer: make sure we limit argument for older server not supporting batch

2019-04-24 Thread Gregory Szorc
On Wed, Apr 24, 2019 at 12:29 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1556049342 -7200 > # Tue Apr 23 21:55:42 2019 +0200 > # Node ID 26f277f0f415206036a57f17400284107816f00d > # Parent

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-24 Thread indygreg (Gregory Szorc)
indygreg added a comment. Ideally the new part would be documented in `internals.bundle2`. But other narrow parts aren't documented, so maybe we can hold off... INLINE COMMENTS > narrowbundle2.py:160 > > +@bundle2.parthandler('Narrowspec') > +def _handlenarrowspecs(op, inpart): I don't

D6298: phabricator: include commit (node) and parent in the local:commits metadata

2019-04-24 Thread indygreg (Gregory Szorc)
indygreg added inline comments. INLINE COMMENTS > phabricator.py:403 > +b'commit': ctx.hex(), > +b'parents': [ctx.p1().hex()], > b'branch': ctx.branch(), What about p2? REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 1 of 2 v2] py3: handle meta-path finders that only use pre-python3.4 API

2019-04-24 Thread Gregory Szorc
On Wed, Apr 24, 2019 at 4:28 PM Yuya Nishihara wrote: > On Tue, 23 Apr 2019 23:37:17 -0400, Ludovic Chabant wrote: > > > Does find_module() return a spec? We might instead have to skip py3.4 > > > finders. > > > > Ah you're right, it returns something else. It looks like Python > > does this: >

Re: [PATCH] buildrpm: bump bundled Python version to 2.7.16 when building for centos{5, 6}

2019-04-24 Thread Gregory Szorc
On Thu, Apr 18, 2019 at 5:53 PM Antonio Muci via Mercurial-devel < mercurial-devel@mercurial-scm.org> wrote: > # HG changeset patch > # User Antonio Muci > # Date 1555633465 -7200 > # Fri Apr 19 02:24:25 2019 +0200 > # Branch stable > # Node ID 76724fb64a22ca2c68e165e71914827601339300 > #

D6309: tests: demonstrate `hg log -r . ` linkrev bug

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGeb68fd841984: tests: demonstrate `hg log -r . file` linkrev bug (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH 1 of 2 v2] py3: handle meta-path finders that only use pre-python3.4 API

2019-04-24 Thread Yuya Nishihara
On Tue, 23 Apr 2019 23:37:17 -0400, Ludovic Chabant wrote: > > Does find_module() return a spec? We might instead have to skip py3.4 > > finders. > > Ah you're right, it returns something else. It looks like Python > does this: > > try: > find_spec = finder.find_spec > except

D6302: phabricator: include branch in the phabread output

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. This series looks reasonable to me, but I have no experience with this code. Anyone else feels like reviewing? Otherwise I'll probably just queue it in a day or two. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6302 To: Kwan,

D6301: phabricator: fallback to reading metadata from diff for phabread

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in phabricator.py:926 > I'm not very good at using the phabricator interface, but it seems like this > has been addressed since this line doesn't have a `get`. Can someone confirm? Oh, sorry, Kwan is the author is this series

D6301: phabricator: fallback to reading metadata from diff for phabread

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > Kwan wrote in phabricator.py:926 > I didn't use `get` here because "dateCreated" is set by conduit, not the > submitted data, so should always be present and valid (but will make it `get` > if requested). I'm not very good at using the

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f3eae30719a: context: check file exists before getting data from _wrappedctx (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6289: unionrepo: sync with repository API

2019-04-24 Thread joerg.sonnenberger (Joerg Sonnenberger)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG608ab4a3889d: unionrepo: sync with repository API (authored by joerg.sonnenberger, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6289?vs=14868=14917#toc REPOSITORY rHG

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7a1ae0632829: tests: show IMM is broken when merging file empty in destination (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6289: unionrepo: sync with repository API

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > unionrepo.py:131 > raise NotImplementedError > -def addgroup(self, deltas, transaction, addrevisioncb=None): > +def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None, > maybemissingparents=False): >

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-24 Thread idlsoft (Sandu Turcan)
idlsoft added inline comments. INLINE COMMENTS > narrowbundle2.py:167 > +excludepats = set(exc.splitlines()) > +narrowspec.validatepatterns(includepats) > +narrowspec.validatepatterns(excludepats) shouldn't this be inside the if? `includepats` and `excludepats` are not defined

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > narrowbundle2.py:160 > > +@bundle2.parthandler('Narrowspec') > +def _handlenarrowspecs(op, inpart): Could you extract the name to a constant like `_SPECPART` etc? I'd also prefer it to start with `narrow:` like the other ones do (so maybe

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit added a comment. I created a new version at https://phab.mercurial-scm.org/D6310. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6218 To: pulkit, durin42, martinvonz, #hg-reviewers Cc: indygreg, idlsoft, mercurial-devel

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit added a comment. This is a new version of https://phab.mercurial-scm.org/D6218. I updated that one but it was not showing in Yadda as that's already marked as closed. So creating a new one. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6310 To:

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-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 Before this patch, when ACL is involved, narrowspecs are send as bundle2 parameter for

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14913. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14911=14913 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14912. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6307?vs=14909=14912 REVISION DETAIL https://phab.mercurial-scm.org/D6307 AFFECTED FILES tests/test-rebase-inmemory.t CHANGE DETAILS diff --git

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14911. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14910=14911 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14910. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14907=14910 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14909. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6307?vs=14906=14909 REVISION DETAIL https://phab.mercurial-scm.org/D6307 AFFECTED FILES tests/test-rebase-inmemory.t CHANGE DETAILS diff --git

D6309: tests: demonstrate `hg log -r . ` linkrev bug

2019-04-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/D6309 AFFECTED FILES tests/test-log.t CHANGE DETAILS diff --git a/tests/test-log.t

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in context.py:1827 > Does `str?` means that it can be a str or a None? That would be my interpretation REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6308 To: pulkit, #hg-reviewers Cc: martinvonz,

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in context.py:1827 > `_markdirty()` without a specified `data` argument seems to do that. The > documentation also seems to say that it can be `None` (line 1804 in this > version) Does `str?` means that it can be a str or a

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in context.py:1827 > I was unable to find some code which can set this to `None`. If you look at > write() below in line 1993, it makes sure data is not None. > > I am not sure I understand what this if does. Do you have ideas?

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in context.py:1827 > I would have expected the only change to be to add ` is not None` to this > line. Isn't that enough? I was unable to find some code which can set this to `None`. If you look at write() below in line 1993, it

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > context.py:1827 > if self._cache[path]['exists']: > if self._cache[path]['data']: > return self._cache[path]['data'] I would have expected the only change to be to add ` is not None` to this

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > test-rebase-inmemory.t:770 > + $ cd test > + $ echo " " > foo > + $ hg ci -Aqm 'added foo' It seems like it would be a little easier to read the test (the diffs in particular) if a visible character was used. (I assume that the content

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit added a comment. This series is meant for stable branch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6307 To: pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D6308: context: check file exists before getting data from _wrappedctx

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY overlayworkingctx class is used to do in-memory merging. The data() function of that class has logic to look for data() in the wrappedctx if the file data in

D6307: tests: show IMM is broken when merging file empty in destination

2019-04-24 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When we are doing in-memory merging, and we are merging a file which is empty in merge destination, it leads to error 'abort: xxx not found in manifest'.

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-24 Thread Raphaël Gomès
Alphare updated this revision to Diff 14905. Alphare marked 13 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6271?vs=14904=14905 REVISION DETAIL https://phab.mercurial-scm.org/D6271 AFFECTED FILES rust/Cargo.lock

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-24 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in filepatterns.rs:61 > I don't understand. The example I showed would give a boolean. The only > difference I see is that the returned value would be 1 less (because > .position() wouldn't count the skipped element) but this

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-24 Thread kevincox (Kevin Cox)
kevincox accepted this revision. kevincox added a comment. Thanks for the changes. INLINE COMMENTS > Alphare wrote in filepatterns.rs:18 > I think I hit the same problem as the person in this issue: > `https://github.com/rust-lang/regex/issues/451`. It's a hassle to escape > bytes using

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-24 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in filepatterns.rs:18 > Why not use https://docs.rs/regex/1.1.6/regex/fn.escape.html? If you are > worried about performance you can use > https://docs.rs/regex-syntax/0.6.6/regex_syntax/fn.escape_into.html which is > quite fast.

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-24 Thread Raphaël Gomès
Alphare updated this revision to Diff 14904. Alphare marked 12 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6271?vs=14840=14904 REVISION DETAIL https://phab.mercurial-scm.org/D6271 AFFECTED FILES rust/Cargo.lock

[PATCH] httppeer: make sure we limit argument for older server not supporting batch

2019-04-24 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1556049342 -7200 # Tue Apr 23 21:55:42 2019 +0200 # Node ID 26f277f0f415206036a57f17400284107816f00d # Parent 84bd6ae2d1f656dff1d494a03558c4edb58ebd31 # EXP-Topic discovery-followup # Available At

Re: [PATCH 1 of 2 V2] peer: introduce a limitedarguments attributes

2019-04-24 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Apr 23, 2019 at 11:35 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 4/17/19 8:33 PM, Martin von Zweigbergk wrote: > > > > > > On Wed, Apr 17, 2019 at 10:41 AM Pierre-Yves David > > mailto:pierre-yves.da...@ens-lyon.org>> > > > wrote: > > > > > > > > On 4/17/19

Re: [PATCH 1 of 2 V2] peer: introduce a limitedarguments attributes

2019-04-24 Thread Pierre-Yves David
On 4/17/19 8:33 PM, Martin von Zweigbergk wrote: On Wed, Apr 17, 2019 at 10:41 AM Pierre-Yves David mailto:pierre-yves.da...@ens-lyon.org>> wrote: On 4/17/19 7:17 PM, Martin von Zweigbergk wrote: > > > On Wed, Apr 17, 2019 at 10:07 AM Pierre-Yves David >

Re: [PATCH V4] repoview: introduce a `experimental.extra-filter-revs` config

2019-04-24 Thread Pierre-Yves David
Gentle ping on that patch. All the feedback from the previous round should have been applied. On 4/17/19 4:37 PM, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1554565579 -7200 # Sat Apr 06 17:46:19 2019 +0200 # Node ID