Re: [PATCH] help: remove repeated word in 'hg help rebase'

2019-06-04 Thread Alan Malloy via Mercurial-devel
I tried hg patch first as per the instructions, but I couldn't see how to get it to use 2FA for Gmail sign in as required by corporate policy, so I hoped the patch would come through okay as is. I'll try phabricator. I see now it's listed as most-preferred, but I somehow failed to see it at all

[PATCH 2 of 2] root: add template variables pointing to repository directories

2019-06-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1559650415 -32400 # Tue Jun 04 21:13:35 2019 +0900 # Node ID 671a49973d8b12fe223b6f81022f02061c4ddb01 # Parent 7182320ee57475303eb677a41dde142b7f87fc9b root: add template variables pointing to repository directories These paths are useful

[PATCH 1 of 2] root: add support for -Tformatter option

2019-06-04 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1559649519 -32400 # Tue Jun 04 20:58:39 2019 +0900 # Node ID 7182320ee57475303eb677a41dde142b7f87fc9b # Parent 4738c292a52072cc6f6a54b5d4066720509dec55 root: add support for -Tformatter option It's useless right now, but it should just work

Re: [PATCH] help: remove repeated word in 'hg help rebase'

2019-06-04 Thread Yuya Nishihara
On Mon, 3 Jun 2019 14:47:27 -0700, Alan Malloy via Mercurial-devel wrote: > # HG changeset patch > # User amalloy > # Date 1559322776 25200 > # Fri May 31 10:12:56 2019 -0700 > # Node ID 33631d3950a2547de55623291f49304f78d168dd > # Parent bfd65b5e070b99d259848e873144c9fc6adbb4a1 > help:

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

2019-06-04 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added a comment. Hopefully not too late INLINE COMMENTS > pulkit wrote in narrowcommands.py:306 > I believe it streams rather than downloading the whole bundle into memory. > `getbundle()` uses the same function and I think we do streaming there. >

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

2019-06-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc767e655ffda: narrow: use narrow_widen wireproto command to widen in case of ellipses (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6438: narrow: pass the bundle to bundle2.widen_bundle() instead of generating there

2019-06-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa97b12f726e4: narrow: pass the bundle to bundle2.widen_bundle() instead of generating there (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6437: narrow: refactor code around widening complicated by previous patch

2019-06-04 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8381b7067f17: narrow: refactor code around widening complicated by previous patch (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 15336. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6436?vs=15334=15336 REVISION DETAIL https://phab.mercurial-scm.org/D6436 AFFECTED FILES hgext/narrow/narrowcommands.py hgext/narrow/narrowwirepeer.py

D6437: narrow: refactor code around widening complicated by previous patch

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 15337. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6437?vs=15335=15337 REVISION DETAIL https://phab.mercurial-scm.org/D6437 AFFECTED FILES hgext/narrow/narrowcommands.py CHANGE DETAILS diff --git

D6437: narrow: refactor code around widening complicated by previous patch

2019-06-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > narrowcommands.py:281 > > +bundle = None > +known = [] nit: looks like this can be deleted > narrowcommands.py:282 > +bundle = None > +known = [] > +common = commoninc[0] nit: looks like these can be moved to before

mercurial@42412: 2 new changesets

2019-06-04 Thread Mercurial Commits
2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/4738c292a520 changeset: 42411:4738c292a520 user:Martin von Zweigbergk date:Fri May 31 15:28:31 2019 -0700 summary: narrowspec: replace one recursion-avoidance hack with another

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

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 15334. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6436?vs=15271=15334 REVISION DETAIL https://phab.mercurial-scm.org/D6436 AFFECTED FILES hgext/narrow/narrowcommands.py hgext/narrow/narrowwirepeer.py

D6437: narrow: refactor code around widening complicated by previous patch

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 15335. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6437?vs=15272=15335 REVISION DETAIL https://phab.mercurial-scm.org/D6437 AFFECTED FILES hgext/narrow/narrowcommands.py CHANGE DETAILS diff --git

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

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit added a subscriber: marmoute. pulkit added inline comments. INLINE COMMENTS > rdamazio wrote in narrowcommands.py:306 > Being nosy here: does this mean that it'll download the whole bundle into > memory before it starts applying it, rather than streaming it into the store? > Bundles,

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

2019-06-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in narrowcommands.py:149 > Also need to check old capability here Only need to check the old capability here. Will update. > martinvonz wrote in narrowcommands.py:282 > Should keep this in the "old" case We don't need this in

[PATCH] help: remove repeated word in 'hg help rebase'

2019-06-04 Thread Alan Malloy via Mercurial-devel
# HG changeset patch # User amalloy # Date 1559322776 25200 # Fri May 31 10:12:56 2019 -0700 # Node ID 33631d3950a2547de55623291f49304f78d168dd # Parent bfd65b5e070b99d259848e873144c9fc6adbb4a1 help: remove repeated word in 'hg help rebase' Specifically, the second 'with' in 'with which to

D6476: merge: correct argument name in docstring

2019-06-04 Thread av6 (Anton Shestakov)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG127937874395: merge: correct argument name in docstring (authored by av6, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6476?vs=15332=15333

D6476: merge: correct argument name in docstring

2019-06-04 Thread av6 (Anton Shestakov)
av6 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/D6476 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py