[Differential] [Request, 5 lines] D72: httpclient: honor the timeout when setting up the connection

2017-07-12 Thread simpkins (Adam Simpkins)
simpkins created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously HTTPConnection._connect() called socket.create_connection() without specifying a timeout. This could cause the code to hang forever trying to

[PATCH] zsh_completion: add '--partial' flag to completions for 'import' (issue5618)

2017-07-12 Thread Martin Tietze
# HG changeset patch # User Martin Tietze # Date 1499847062 -7200 # Wed Jul 12 10:11:02 2017 +0200 # Node ID 879903976b5ca11dc2cc0ec6c4f2d8bc2576fc5e # Parent 062c1bde178118b7c4d5abb1ead16ac8ad494280 zsh_completion: add '--partial' flag to completions for 'import'

Re: [PATCH 4 of 4] bundle2: no longer use 'retractboundary' in updatephases

2017-07-12 Thread Sean Farley
Boris Feld writes: > # HG changeset patch > # User Boris Feld > # Date 1499742361 -7200 > # Tue Jul 11 05:06:01 2017 +0200 > # Node ID 002ca6e17d6b53123c5ab4a4a46fb3f5d453e072 > # Parent 5a2c6c050e33e4f2a571247f5d1e150a3ef1d295 > #

Re: [PATCH 2 of 3] configitems: use codemod script to register coreconfigitems

2017-07-12 Thread Jun Wu
Excerpts from Jun Wu's message of 2017-07-12 18:22:47 -0700: > This is the result of running: > > contrib/codemod/codemod_configitems.py mercurial/**/*.py This line should be: contrib/codemod/codemod_configitems.py {mercurial,hgext}/**/*.py I have got it right in some local commits. But I

[PATCH 2 of 3] configitems: use codemod script to register coreconfigitems

2017-07-12 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1499898287 25200 # Wed Jul 12 15:24:47 2017 -0700 # Node ID a0df53ed55b26539c62584231cfcb567594ab34a # Parent 695702ea1caedaeeed9a6d63473c0e338adf35f4 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 3 of 3] configitems: use devel.all-warnings to replace devel.all

2017-07-12 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1499898287 25200 # Wed Jul 12 15:24:47 2017 -0700 # Node ID 61035c132ae5643796a2a5b1571d5cc7f350c133 # Parent a0df53ed55b26539c62584231cfcb567594ab34a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 1 of 3] contrib: add a codemod script to write coreconfigitem

2017-07-12 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1499891115 25200 # Wed Jul 12 13:25:15 2017 -0700 # Node ID 695702ea1caedaeeed9a6d63473c0e338adf35f4 # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[Differential] [Commented On] D69: tests: put temporary files in $TESTTMP

2017-07-12 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > test-check-pyflakes.t:13 > + $ pyflakes "$TESTTMP/test.py" 2>/dev/null | "$TESTDIR/filterpyflakes.py" > + $TESTTMP/test.py:1: undefined name 'undefinedname' > In theory this needs a "(glob)" at the end of the line. (test-check-code might

[Differential] [Accepted] D69: tests: put temporary files in $TESTTMP

2017-07-12 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. Ha, https://phab.mercurial-scm.org/D67 was supposed to fix the same thing. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D69 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/

[Differential] [Commented On] D64: histedit: remove transaction from state object

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > dsp wrote in histedit.py:283 > I think you can also remove this. I don't see it anywhere used. I thought I did, but apparently not. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D64 EMAIL PREFERENCES

[Differential] [Updated, 32 lines] D66: histedit: extract InterventionRequired transaction handling to utils

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 100. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D66?vs=94=100 REVISION DETAIL https://phab.mercurial-scm.org/D66 AFFECTED FILES hgext/histedit.py mercurial/util.py CHANGE DETAILS Index:

[Differential] [Updated, 17 lines] D65: histedit: create transaction outside of try

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 99. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D65?vs=93=99 REVISION DETAIL https://phab.mercurial-scm.org/D65 AFFECTED FILES hgext/histedit.py CHANGE DETAILS Index: hgext/histedit.py

[Differential] [Updated, 19 lines] D64: histedit: remove transaction from state object

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 98. martinvonz marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D64?vs=92=98 REVISION DETAIL https://phab.mercurial-scm.org/D64 AFFECTED FILES hgext/histedit.py CHANGE DETAILS

[Differential] [Accepted] D64: histedit: remove transaction from state object

2017-07-12 Thread dsp (David Soria Parra)
dsp accepted this revision. dsp added inline comments. INLINE COMMENTS > histedit.py:283 > self.backupfile = None > self.tr = None > if replacements is None: I think you can also remove this. I don't see it anywhere used. REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Request, 6 lines] D69: tests: put temporary files in $TESTTMP

2017-07-12 Thread simpkins (Adam Simpkins)
simpkins created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Update test-check-pyflakes.t to write test.py in the $TESTTMP directory. Previously when using "run_tests.py -l" it would write test.py into your local

[Differential] [Commented On] D57: match: write forceincludematcher using unionmatcher

2017-07-12 Thread dsp (David Soria Parra)
dsp added a comment. In https://phab.mercurial-scm.org/D57#735, @martinvonz wrote: > What arguments do you pass to "hg debugwalk" to get a forceincludematcher? You are right, as we don't use forceincludematcher inside match() it never gets into debugwalk. Your patch seems fine.

[Differential] [Request, 53 lines] D68: dirstate: update backup functions to take full backup filename

2017-07-12 Thread simpkins (Adam Simpkins)
simpkins created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Update the dirstate functions so that the caller supplies the full backup filename rather than just a prefix and suffix. The localrepo code was already

[Differential] [Request, 2 lines] D67: test-check-pyflakes: do not leave test.py in the repo

2017-07-12 Thread quark (Jun Wu)
quark 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/D67 AFFECTED FILES tests/test-check-pyflakes.t CHANGE DETAILS Index: tests/test-check-pyflakes.t

[Differential] [Request, 32 lines] D66: histedit: extract InterventionRequired transaction handling to utils

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY rebase will have similar logic, so let's extract it. Besides, it makes the histedit code more readable. We may want to parametrize acceptintervention() by

[Differential] [Request, 18 lines] D64: histedit: remove transaction from state object

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The transaction is only used within a single function, so no need to store it on the state object. REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Request, 17 lines] D65: histedit: create transaction outside of try

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Just a little refactoring to simplify the next patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D65 AFFECTED FILES

mercurial@33387: 21 new changesets

2017-07-12 Thread Mercurial Commits
21 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/6029939f7e98 changeset: 33367:6029939f7e98 user:Augie Fackler date:Fri Jul 07 15:07:36 2017 -0400 summary: filterpyflakes: move self-test into test file

[Differential] [Commented On] D62: rebase: add config to move rebase into a single transaction

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > rebase.py:721 > +except error.InterventionRequired: > +tr.close() > +raise Won't this and tr's context manager together double-close the transaction? REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Commented On] D63: rebase: use one dirstateguard for when using rebase.singletransaction

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > phillco wrote in test-rebase-base.t:400 > It'd be nice to have such a style, I think. I'd be fine with that, but I don't want to decide it right now, so I've dropped the '- ' in flight and queued this. REPOSITORY rHG Mercurial REVISION

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Phillip Cohen
> Unless you're talking about Phabricator's webui. Then I don't know because I don't use it. I was, sorry for the ambiguity. On Wed, Jul 12, 2017 at 1:42 PM, Sean Farley wrote: > > Phillip Cohen writes: > >> I'm using the webui, though, so it all looks the

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Sean Farley
Phillip Cohen writes: > I'm using the webui, though, so it all looks the same. But with different mailing lists, it's now solvable through your own client: filtering based on the headers. Unless you're talking about Phabricator's webui. Then I don't know because I don't

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Phillip Cohen
I'm using the webui, though, so it all looks the same. On Wed, Jul 12, 2017 at 1:35 PM, Sean Farley wrote: > > Phillip Cohen writes: > >>> Also: Jun has suggested to me that we should avoid using "Accept >>> Commit", because that should be a state applied

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Sean Farley
Phillip Cohen writes: >> Also: Jun has suggested to me that we should avoid using "Accept >> Commit", because that should be a state applied only when a commit is >> queued to `hg-committed` (either by the reviewer or by a future bot). >> Once the commit goes to `hg` it

[Differential] [Changed Subscribers] D63: rebase: use one dirstateguard for when using rebase.singletransaction

2017-07-12 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > martinvonz wrote in test-rebase-base.t:400 > I haven't seen this style of starting a comment with '-' elsewhere, so it > feels more confusing than helpful. I can see the point of doing it to > indicate intra-testcase comments (as opposed to the

[Differential] [Accepted] D62: rebase: add config to move rebase into a single transaction

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision. martinvonz added inline comments. INLINE COMMENTS > util.py:592 > > +class nullcontextmanager(object): > +"""A no-op context manager. The body looks more like a "nulltransaction" (I think close(), release(), abort() are part of transaction's interface),

Re: [PATCH v3] releasenotes: add custom admonitions support for release notes

2017-07-12 Thread Rishabh Madan
> > > @@ -111,9 +112,25 @@ > > self.addnontitleditem(section, paragraphs) > > > > class releasenotessections(object): > > -def __init__(self, ui): > > -# TODO support defining custom sections from config. > > -self._sections = list(DEFAULT_SECTIONS) > > +

[Differential] [Accepted] D62: rebase: add config to move rebase into a single transaction

2017-07-12 Thread phillco (Phil Cohen)
phillco accepted this revision as: phillco. phillco added a comment. This revision is now accepted and ready to land. Actual LGTM. Though, it's interesting, it looks like I have the ability to accept as `hg`. I presume I'll need to keep unchecking that so I don't accidentally pretend to

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Phillip Cohen
> Augie just added a herald rule that adds the hg-reviewers as a > blocking reviewer to all HG reviews. So you can accept > whatever diffs you want, to indicate you > are happy with them, > but the diff as a whole won't be "Accepted" until someone from > hg-reviewers accepts it. That works for

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Durham Goode
On 7/12/17 12:41 PM, Phillip Cohen wrote: Also: Jun has suggested to me that we should avoid using "Accept Commit", because that should be a state applied only when a commit is queued to `hg-committed` (either by the reviewer or by a future bot). Once the commit goes to `hg` it should be

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Phillip Cohen
> Also: Jun has suggested to me that we should avoid using "Accept > Commit", because that should be a state applied only when a commit is > queued to `hg-committed` (either by the reviewer or by a future bot). > Once the commit goes to `hg` it should be automatically closed (this > should happen

[Differential] [Commented On] D62: rebase: add config to move rebase into a single transaction

2017-07-12 Thread phillco (Phil Cohen)
phillco added a comment. lgtm INLINE COMMENTS > util.py:592-594 > +class nullcontextmanager(object): > +"""A no-op context manager. > +""" Thanks, I was looking for something like this on one of my branches! REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 7 of 8] branchmap: remove use of buffer() to support Python 2.6

2017-07-12 Thread Gregory Szorc
On Wed, Jul 12, 2017 at 12:00 PM, FUJIWARA Katsunori wrote: > At Thu, 8 Jun 2017 12:13:27 -0700, > Gregory Szorc wrote: > > > > [1 ] > > On Thu, Jun 8, 2017 at 11:41 AM, Augie Fackler wrote: > > > > > > > > > On Jun 8, 2017, at 12:02, FUJIWARA Katsunori

Re: [PATCH 7 of 8] branchmap: remove use of buffer() to support Python 2.6

2017-07-12 Thread FUJIWARA Katsunori
At Thu, 8 Jun 2017 12:13:27 -0700, Gregory Szorc wrote: > > [1 ] > On Thu, Jun 8, 2017 at 11:41 AM, Augie Fackler wrote: > > > > > > On Jun 8, 2017, at 12:02, FUJIWARA Katsunori > > wrote: > > > > > > At Sat, 13 May 2017 12:54:39 -0700, > > > Gregory

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Durham Goode
On 7/12/17 9:21 AM, Durham Goode wrote: On 7/10/17 1:00 PM, Kevin Bullock wrote: Greetings, Mercurial hackers! We've set up an instance of Phabricator that we're going to experiment with for code reviews. At this time, we're not planning on using any of the other features of Phabricator, and

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Sean Farley
Sean Farley writes: > Adrian Buehlmann writes: > >> On 2017-07-10 22:00, Kevin Bullock wrote: >>> Greetings, Mercurial hackers! >>> >>> We've set up an instance of Phabricator that we're going to experiment with >>> for code reviews. At this time, we're

Re: [PATCH] revset: add experimental set subscript operator

2017-07-12 Thread Sean Farley
Jun Wu writes: > Excerpts from Yuya Nishihara's message of 2017-07-13 00:50:33 +0900: >> Do we want this experimental feature in 4.3? The patches are mostly ready, >> but this is completely new operator, so I'm not sure. >> >> > Note: the names (changeloglinear etc.) here are

Re: [PATCH] revset: add experimental set subscript operator

2017-07-12 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-07-13 00:50:33 +0900: > Do we want this experimental feature in 4.3? The patches are mostly ready, > but this is completely new operator, so I'm not sure. > > > Note: the names (changeloglinear etc.) here are just examples, not final. > > It's

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Sean Farley
Adrian Buehlmann writes: > On 2017-07-10 22:00, Kevin Bullock wrote: >> Greetings, Mercurial hackers! >> >> We've set up an instance of Phabricator that we're going to experiment with >> for code reviews. At this time, we're not planning on using any of the other >>

Re: [PATCH] revset: add experimental set subscript operator

2017-07-12 Thread Sean Farley
Yuya Nishihara writes: > On Fri, 7 Jul 2017 08:26:53 -0700, Jun Wu wrote: >> I'm currently leaning towards "outside the operator". That could make "[]" >> closer to existing language. It also looks flexible and clean. For example, >> use "#ordertype", like: >> >>

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Adrian Buehlmann
On 2017-07-10 22:00, Kevin Bullock wrote: > Greetings, Mercurial hackers! > > We've set up an instance of Phabricator that we're going to experiment with > for code reviews. At this time, we're not planning on using any of the other > features of Phabricator, and the use of Phabricator for

[PATCH 6 of 7] tests: avoid tests related to directory permission if running with fsmonitor

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883479 -32400 # Thu Jul 13 03:17:59 2017 +0900 # Node ID e9ba6543da0c07111a3bfbbbea047dc1774c8798 # Parent 6727043ee44165d5e7527f0ec3d64c6ac0940a03 tests: avoid tests related to directory permission if running

[PATCH 4 of 7] tests: add extra output for fsmonitor at showconfig

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883478 -32400 # Thu Jul 13 03:17:58 2017 +0900 # Node ID 08feef4f8daa3dd00e680fc02c4775934846bc11 # Parent ade468df596d7c00c74fd71b5845fdb7cf464930 tests: add extra output for fsmonitor at showconfig diff

[PATCH 3 of 7] tests: take extra care for fsmonitor at enabling incompatible extension

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883478 -32400 # Thu Jul 13 03:17:58 2017 +0900 # Node ID ade468df596d7c00c74fd71b5845fdb7cf464930 # Parent 5e5e7e76130ef77d04f26d9ed90f05567e18336e tests: take extra care for fsmonitor at enabling incompatible

[PATCH 1 of 7] tests: remove meaningless comment from blacklist for fsmonitor

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883477 -32400 # Thu Jul 13 03:17:57 2017 +0900 # Node ID a174d2007a3300b4352c0528966f4cfc4a21b683 # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 tests: remove meaningless comment from blacklist for fsmonitor

[PATCH 2 of 7] tests: remove meaningless entries from blacklist for fsmonitor

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883477 -32400 # Thu Jul 13 03:17:57 2017 +0900 # Node ID 5e5e7e76130ef77d04f26d9ed90f05567e18336e # Parent a174d2007a3300b4352c0528966f4cfc4a21b683 tests: remove meaningless entries from blacklist for fsmonitor

[PATCH 7 of 7] tests: categorize entries in blacklist for fsmonitor for future reference

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883479 -32400 # Thu Jul 13 03:17:59 2017 +0900 # Node ID 1ce0071a1d382d3b74d9c26884baecf38b9e08ab # Parent e9ba6543da0c07111a3bfbbbea047dc1774c8798 tests: categorize entries in blacklist for fsmonitor for

[PATCH 5 of 7] tests: add extra output for fsmonitor at checking under .hg

2017-07-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1499883478 -32400 # Thu Jul 13 03:17:58 2017 +0900 # Node ID 6727043ee44165d5e7527f0ec3d64c6ac0940a03 # Parent 08feef4f8daa3dd00e680fc02c4775934846bc11 tests: add extra output for fsmonitor at checking under .hg

[Differential] [Request, 40 lines] D62: rebase: add config to move rebase into a single transaction

2017-07-12 Thread durham (Durham Goode)
durham created this revision. Herald added a subscriber: mercurial-devel. REVISION SUMMARY This was previously landed as https://phab.mercurial-scm.org/rHGcf8ad0e6c0e4555809c8e7232c8819ecf152bf1b but backed out in https://phab.mercurial-scm.org/rHGa5abaa81fad665602821b939ca4101d48f4d0ef7

[Differential] [Request, 97 lines] D63: rebase: use one dirstateguard for when using rebase.singletransaction

2017-07-12 Thread durham (Durham Goode)
durham created this revision. Herald added a subscriber: mercurial-devel. REVISION SUMMARY This was previously landed as https://phab.mercurial-scm.org/rHG2519994d25ca405edee20b816e70f2289fee553d but backed out in https://phab.mercurial-scm.org/rHGb63351f6a246cd8d444ed38641054fefc78bff93

[Differential] [Updated] D57: match: write forceincludematcher using unionmatcher

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D57#743, @durham wrote: > makeittso > > Might be nice to have unit tests for matchers, now that they're getting

[Differential] [Commented On] D59: sparse: override dirstate.walk() instead of dirstate._ignore

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > durham wrote in sparse.py:224 > Do we know if the ignore wrapper was ever accessed outside of the walk? It > might be worth hacking in a temporary message that prints if the > ignorewrapper is called while walk is not in the traceback, then

Re: [PATCH V2] amend: new extension providing the amend command

2017-07-12 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Jul 12, 2017 at 12:47 AM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1499831635 25200 > # Tue Jul 11 20:53:55 2017 -0700 > # Node ID d1092112d98c29fc3e1b4cb700eed4fc48dd7d8e > # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 > #

[Differential] [Commented On] D60: match: remove unused negatematcher

2017-07-12 Thread durham (Durham Goode)
durham added a comment. _like_ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D60 EMAIL PREFERENCES

[Differential] [Commented On] D58: match: make unionmatcher a proper matcher

2017-07-12 Thread durham (Durham Goode)
durham added a comment. _like_ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D58 EMAIL PREFERENCES

Re: [PATCH 9 of 9] template: use template-engine for obsfate

2017-07-12 Thread Jun Wu
As previously discussed in the "operation" thread [1]. I think we want to use "operation" metadata instead of introducing flags, "obsfate" and/or "verb" as new concepts. Practically "rebased as X" / "histedited as X" is more friendly to end-user than just "rewritten as X". With "operation"

[Differential] [Commented On] D57: match: write forceincludematcher using unionmatcher

2017-07-12 Thread durham (Durham Goode)
durham added a comment. makeittso Might be nice to have unit tests for matchers, now that they're getting some complications. REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Commented On] D59: sparse: override dirstate.walk() instead of dirstate._ignore

2017-07-12 Thread durham (Durham Goode)
durham added inline comments. INLINE COMMENTS > sparse.py:224 > - > -replacefilecache(dirstate.dirstate, '_ignore', ignorewrapper) > Do we know if the ignore wrapper was ever accessed outside of the walk? It might be worth hacking in a temporary message that prints if the ignorewrapper

Re: Experimenting with Phabricator for reviews

2017-07-12 Thread Durham Goode
On 7/10/17 1:00 PM, Kevin Bullock wrote: Greetings, Mercurial hackers! We've set up an instance of Phabricator that we're going to experiment with for code reviews. At this time, we're not planning on using any of the other features of Phabricator, and the use of Phabricator for reviews is

[Differential] [Commented On] D59: sparse: override dirstate.walk() instead of dirstate._ignore

2017-07-12 Thread durham (Durham Goode)
durham added a comment. My only concern would be if tools ever use hg status -A to get the full state of the working copy (like what files exist). But I think that's pretty minor. Do we know if the ignore wrapper was ever accessed outside of the walk? It might be worth hacking in a

Re: [PATCH 9 of 9] template: use template-engine for obsfate

2017-07-12 Thread Yuya Nishihara
On Wed, 12 Jul 2017 15:44:13 +0200, Boris Feld wrote: > On Wed, 2017-07-12 at 00:06 +0900, Yuya Nishihara wrote: > > Guessing from the PATCH 4, which has the following functions, > > > >   obsfatedata: ctx => [succs, ...] => [(succs, markers), ...] > > > > maybe we'll want a template function

[Bug 5619] New: obsmarker pushed for prune even though changeset was not pushed

2017-07-12 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5619 Bug ID: 5619 Summary: obsmarker pushed for prune even though changeset was not pushed Product: Mercurial Version: default branch Hardware: PC OS: Linux

[Differential] [Commented On] D59: sparse: override dirstate.walk() instead of dirstate._ignore

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D59#733, @dsp wrote: > -1 on this. > > I feel this can lead to confusing behavior for users and require too much understanding of the underlying behaviors. See the following example > > 1. create a sparse profile ```

[PATCH 3 of 4] bundle2: automatically add 'targetphase' parameter in writenewbundle

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499742723 -7200 # Tue Jul 11 05:12:03 2017 +0200 # Node ID 5a2c6c050e33e4f2a571247f5d1e150a3ef1d295 # Parent a600e69f8de0b75998a11502c3cb868936e6cb4a # EXP-Topic tr.changes.phases bundle2: automatically add 'targetphase'

[PATCH 4 of 4] bundle2: no longer use 'retractboundary' in updatephases

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499742361 -7200 # Tue Jul 11 05:06:01 2017 +0200 # Node ID 002ca6e17d6b53123c5ab4a4a46fb3f5d453e072 # Parent 5a2c6c050e33e4f2a571247f5d1e150a3ef1d295 # EXP-Topic tr.changes.phases bundle2: no longer use 'retractboundary'

[PATCH 1 of 4] changegroup: stop treating strip as special when dealing with phases

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499741576 -7200 # Tue Jul 11 04:52:56 2017 +0200 # Node ID e46f9cabad79aa5429c2e8d80d5c60e42e42abb1 # Parent 4672db164c986da4442bd864cd044512d975c3f2 # EXP-Topic tr.changes.phases changegroup: stop treating strip as

[PATCH 2 of 4] bundle2: support the 'targetphase' parameter for the changegroup part

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499742712 -7200 # Tue Jul 11 05:11:52 2017 +0200 # Node ID a600e69f8de0b75998a11502c3cb868936e6cb4a # Parent e46f9cabad79aa5429c2e8d80d5c60e42e42abb1 # EXP-Topic tr.changes.phases bundle2: support the 'targetphase'

[Differential] [Commented On] D57: match: write forceincludematcher using unionmatcher

2017-07-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D57#731, @dsp wrote: > I am slightly -1 on this, as it removes `__repr__` for forceincludematcher. This would lead to remove information from `hg debugwalk`. What arguments do you pass to "hg debugwalk" to get a

[Differential] [Commented On] D59: sparse: override dirstate.walk() instead of dirstate._ignore

2017-07-12 Thread dsp (David Soria Parra)
dsp added a comment. -1 on this. I feel this can lead to confusing behavior for users and require too much understanding of the underlying behaviors. See the following example 1. create a sparse profile [include] foo/ [exclude] 2. create directory bar/ and file

[Differential] [Commented On] D57: match: write forceincludematcher using unionmatcher

2017-07-12 Thread dsp (David Soria Parra)
dsp added a comment. I am slightly -1 on this, as it removes `__repr__` for forceincludematcher. This would lead to remove information from `hg debugwalk`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D57 EMAIL PREFERENCES

[Differential] [Commented On] D58: match: make unionmatcher a proper matcher

2017-07-12 Thread dsp (David Soria Parra)
dsp added a comment. LGTM REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D58 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: martinvonz Cc: dsp, mercurial-devel ___

Re: [PATCH 9 of 9] template: use template-engine for obsfate

2017-07-12 Thread Boris Feld
On Wed, 2017-07-12 at 00:06 +0900, Yuya Nishihara wrote: > On Tue, 11 Jul 2017 11:16:03 +0200, Boris Feld wrote: > > Obsfate has a difficult task: summarize the obsolescence history > > (potentially spanning multiple obs-markers), aggregating the > > different > > values and all of this in

Re: [PATCH 9 of 9] template: use template-engine for obsfate

2017-07-12 Thread Yuya Nishihara
On Tue, 11 Jul 2017 12:44:52 -0700, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-07-12 00:06:13 +0900: > > Well, I don't have expertise in the obsolete thingy, though I'm > > (unfortunately) > > a template expert. > > > > Guessing from the PATCH 4, which has the following

[PATCH 01 of 10] configitems: register the 'bugzilla.mocklog' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414643 -7200 # Fri Jul 07 10:04:03 2017 +0200 # Node ID fcb4529a633634e7885ed4b79a62743a52a4a6b3 # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 10 of 10] configitems: register the 'bugzilla.version' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414661 -7200 # Fri Jul 07 10:04:21 2017 +0200 # Node ID 0ed2de9467f9abc9443bb583e57fcb1ff8703f42 # Parent 26a2797083007305df1f79cf9edf1675e51745a2 # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 03 of 10] configitems: register the 'bugzilla.regexp' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414647 -7200 # Fri Jul 07 10:04:07 2017 +0200 # Node ID 1ca312b6211d3bde677c53972abd95c4be45f8ff # Parent f56a5222c189bad35178708eeba73f333691e148 # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 02 of 10] configitems: register the 'bugzilla.password' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414645 -7200 # Fri Jul 07 10:04:05 2017 +0200 # Node ID f56a5222c189bad35178708eeba73f333691e148 # Parent fcb4529a633634e7885ed4b79a62743a52a4a6b3 # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 07 of 10] configitems: register the 'bugzilla.timeout' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414655 -7200 # Fri Jul 07 10:04:15 2017 +0200 # Node ID 5b67961350d4084c8e50c14826335f69711fa65d # Parent a8c4ac38c3d2f0e52653de1814a71fdc8801ee12 # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 09 of 10] configitems: register the 'bugzilla.usermap' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414659 -7200 # Fri Jul 07 10:04:19 2017 +0200 # Node ID 26a2797083007305df1f79cf9edf1675e51745a2 # Parent b3631f450acf389945b3abd5c68137f7f06e783d # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 05 of 10] configitems: register the 'bugzilla.style' config

2017-07-12 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499414651 -7200 # Fri Jul 07 10:04:11 2017 +0200 # Node ID 60189e1716c6dfd71b10f43aa49f6946d4021b2f # Parent 69feb1d1d3d3b2d2dee30941cc910b7a1b98b04b # EXP-Topic config.register.bugzilla configitems: register the

[PATCH 2 of 2 v2] commitextras: check the format of the arguments and no internal key is used

2017-07-12 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1499856010 -19800 # Wed Jul 12 16:10:10 2017 +0530 # Node ID e8200f6a0783798ad61cd84f73c1721264966f02 # Parent 3d742534fa70a38a2b540cfb0bf68610ecc63d0e # EXP-Topic fbext commitextras: check the format of the arguments and

[PATCH 1 of 2 v2] commitextras: move fb extension to core which add extras to a commit

2017-07-12 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1499799225 -19800 # Wed Jul 12 00:23:45 2017 +0530 # Node ID 3d742534fa70a38a2b540cfb0bf68610ecc63d0e # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 # EXP-Topic fbext commitextras: move fb extension to core which add

[Bug 5618] New: zsh completion: for 'import' command the flag '--partial' is not in list of possible completions

2017-07-12 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5618 Bug ID: 5618 Summary: zsh completion: for 'import' command the flag '--partial' is not in list of possible completions Product: Mercurial Version: 4.1.1 Hardware: All

[PATCH V2] amend: new extension providing the amend command

2017-07-12 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1499831635 25200 # Tue Jul 11 20:53:55 2017 -0700 # Node ID d1092112d98c29fc3e1b4cb700eed4fc48dd7d8e # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH] amend: new extension providing the amend command

2017-07-12 Thread Jun Wu
Excerpts from Martin von Zweigbergk's message of 2017-07-11 23:18:21 -0700: > I use "hg amend -e" quite often. Would be nice to have that too. > > Comparing this to evolve's version, there are a few differences: > > * Missing support for --edit and --logfile (as noted above, I > personally often

Re: [PATCH] amend: new extension providing the amend command

2017-07-12 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Jul 11, 2017 at 9:01 PM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1499831635 25200 > # Tue Jul 11 20:53:55 2017 -0700 > # Node ID 906655cf953a84750642abd93d8c42663e808561 > # Parent 26e4ba058215e536d3827befbea99ff6203d35f8 > #