Re: [PATCH STABLE] scmutil: avoid quadratic membership testing (issue5969)

2018-08-24 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Aug 24, 2018 at 6:23 PM Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1535160115 25200 > # Fri Aug 24 18:21:55 2018 -0700 > # Branch stable > # Node ID db8e86a65460c9bc4794afc4cd6c7e4bb69e3b0b > # Parent bd63ada7e1f838d7a579edcbd8e3c8ff7ec46a43 >

Re: D4365: match: make exactmatcher.visitchildrenset return file children as well

2018-08-24 Thread Yuya Nishihara
> +if not self._fileset or dir not in self._dirs: Just curious why you've added `not self._fileset`. Except a vast style change, the important part is just this: ``` @@ -590,7 +590,7 @@ if dir not in self._dirs: return set() -candidates = self._dirs -

D4365: match: make exactmatcher.visitchildrenset return file children as well

2018-08-24 Thread yuja (Yuya Nishihara)
yuja added a comment. > +if not self._fileset or dir not in self._dirs: Just curious why you've added `not self._fileset`. Except a vast style change, the important part is just this: @@ -590,7 +590,7 @@ if dir not in self._dirs: return

[PATCH STABLE] scmutil: avoid quadratic membership testing (issue5969)

2018-08-24 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1535160115 25200 # Fri Aug 24 18:21:55 2018 -0700 # Branch stable # Node ID db8e86a65460c9bc4794afc4cd6c7e4bb69e3b0b # Parent bd63ada7e1f838d7a579edcbd8e3c8ff7ec46a43 scmutil: avoid quadratic membership testing (issue5969) tr.changes['revs']

[Bug 5969] New: Phase reporting after pull can be O(n^2) for number of changesets fetched

2018-08-24 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5969 Bug ID: 5969 Summary: Phase reporting after pull can be O(n^2) for number of changesets fetched Product: Mercurial Version: stable branch Hardware: Other

D4366: treemanifest: introduce lazy loading of subdirs

2018-08-24 Thread spectral (Kyle Lippincott)
spectral planned changes to this revision. spectral added a comment. In https://phab.mercurial-scm.org/D4366#67144, @indygreg wrote: > I'm not sure how I feel about so many methods having the `if dir in self._lazydirs: self._loadlazy(dir)` pattern. > > On one hand, action at a

[PATCH 4 of 5] phase: expose a `_phase(idx)` revset

2018-08-24 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534981706 -7200 # Thu Aug 23 01:48:26 2018 +0200 # Node ID 57160a3b6795cfde325662406d128d730c10e043 # Parent 93824739fc0d33ce7853ccfd57818df694f5593f # EXP-Topic internal-phase.prepare # Available At

[PATCH 5 of 5] phase: use `_phase` revset instead of string interpolation

2018-08-24 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534981719 -7200 # Thu Aug 23 01:48:39 2018 +0200 # Node ID 4a975a8b96b56b9892ea6bc5ac7efeaf7d7d1a2f # Parent 57160a3b6795cfde325662406d128d730c10e043 # EXP-Topic internal-phase.prepare # Available At

[PATCH 2 of 5] phase: explicitly exclude secret phase and above

2018-08-24 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1528224472 -7200 # Tue Jun 05 20:47:52 2018 +0200 # Node ID 5ec0b78876f2fc334c57d664a67d342859fc2b47 # Parent 79b9bd9659a2b3f9815491a371b988eb7c458726 # EXP-Topic internal-phase.prepare # Available At

[PATCH 3 of 5] phase: handle phase with no command flag

2018-08-24 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534979719 -7200 # Thu Aug 23 01:15:19 2018 +0200 # Node ID 93824739fc0d33ce7853ccfd57818df694f5593f # Parent 5ec0b78876f2fc334c57d664a67d342859fc2b47 # EXP-Topic internal-phase.prepare # Available At

[PATCH 1 of 5] phase: use `trackedphases` in `_getphaserevsnative`

2018-08-24 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1528215367 -7200 # Tue Jun 05 18:16:07 2018 +0200 # Node ID 79b9bd9659a2b3f9815491a371b988eb7c458726 # Parent 66f046116105a306f7c701c9a5cf97d7b6c926c0 # EXP-Topic internal-phase.prepare # Available At

[PATCH] lfs: add a progress bar when searching for blobs to upload

2018-08-24 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1535147146 14400 # Fri Aug 24 17:45:46 2018 -0400 # Node ID 76eca3ae345b261c0049d16269cdf991a31af21a # Parent c9a3f7f5c0235e3ae35135818c48ec5ea006de37 lfs: add a progress bar when searching for blobs to upload The search itself can take an

D4284: copies: correctly skip directories that have already been considered

2018-08-24 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGeebd591803ab: copies: correctly skip directories that have already been considered (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4284: copies: correctly skip directories that have already been considered

2018-08-24 Thread spectral (Kyle Lippincott)
spectral added inline comments. INLINE COMMENTS > jpsugar wrote in copies.py:615 > Maybe do this after the debug loop to avoid an un-pretty output? I personally have no preference, but had been trying to make this an unobservable difference, whereas that is technically observable (though I

D4284: copies: correctly skip directories that have already been considered

2018-08-24 Thread jpsugar (JP Sugarbroad)
jpsugar added inline comments. INLINE COMMENTS > copies.py:615 > > +dirmove = {k + "/": v + "/" for k, v in dirmove.iteritems()} > + Maybe do this after the debug loop to avoid an un-pretty output? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4284 To:

[PATCH 3 of 4] help: revise explanation about capability check while selecting merge tool

2018-08-24 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534915379 -32400 # Wed Aug 22 14:22:59 2018 +0900 # Node ID 9550ea4f1d737a7f3d79fbf2e1aa173497f75d4b # Parent 222400828ff78e0a44cdf20a57cba679304ca913 # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 4 of 4] i18n: merge i18n comments of translatable texts correctly

2018-08-24 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534916276 -32400 # Wed Aug 22 14:37:56 2018 +0900 # Node ID 341fa53ab3c4c8fb2d009e413fe9555c275a817c # Parent 9550ea4f1d737a7f3d79fbf2e1aa173497f75d4b # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 1 of 4] filemerge: make capability check for internal tools ignore merge-tools section

2018-08-24 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534913821 -32400 # Wed Aug 22 13:57:01 2018 +0900 # Node ID 612d99ed365e4865f682a9483f70d525cfd85d1d # Parent bb2b462f81daae07d5400aee7db794857959979c # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 2 of 4] filemerge: avoid putting translated text into docstring

2018-08-24 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534914507 -32400 # Wed Aug 22 14:08:27 2018 +0900 # Node ID 222400828ff78e0a44cdf20a57cba679304ca913 # Parent 612d99ed365e4865f682a9483f70d525cfd85d1d # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

Re: [PATCH 10 of 12] candidates-groups: pass revision number to the function

2018-08-24 Thread Gregory Szorc
On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534570325 -7200 > # Sat Aug 18 07:32:05 2018 +0200 > # Node ID e21fd074f202f62ddde2ea03aa5e2e8cc4073df2 > # Parent 8e08a733133d84db3587e2d780acbb654ade7371 > # EXP-Topic sparse-snapshot

Re: [PATCH 09 of 12] revlogdeltas: extract _getcandidaterevs in a function

2018-08-24 Thread Gregory Szorc
On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534570054 -7200 > # Sat Aug 18 07:27:34 2018 +0200 > # Node ID 8e08a733133d84db3587e2d780acbb654ade7371 > # Parent 23aa0ae26db3a1f912e4f32ffb1f72758d4462f0 > # EXP-Topic sparse-snapshot

Re: [PATCH 05 of 12] revlog: move the good delta heuristic in revlogutils.deltas

2018-08-24 Thread Gregory Szorc
On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534380638 -7200 > # Thu Aug 16 02:50:38 2018 +0200 > # Node ID 9c7224a86df8f316dbfb006ba8e81fc3ce831303 > # Parent 07af069da30de0c6ae0ce8229a0ddd7c22c89313 > # EXP-Topic sparse-snapshot

Re: [PATCH 03 of 12] revlog: split classes related to deltas computation in a new module

2018-08-24 Thread Pulkit Goyal
On Fri, Aug 24, 2018 at 8:45 PM Gregory Szorc wrote: > On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > >> # HG changeset patch >> # User Boris Feld >> # Date 1534378131 -7200 >> # Thu Aug 16 02:08:51 2018 +0200 >> # Node ID 0f38a0bcba5817146fb3a4e079016abc9a424646 >> # Parent

Re: [PATCH 03 of 12] revlog: split classes related to deltas computation in a new module

2018-08-24 Thread Gregory Szorc
On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534378131 -7200 > # Thu Aug 16 02:08:51 2018 +0200 > # Node ID 0f38a0bcba5817146fb3a4e079016abc9a424646 > # Parent 4a61a7a37a499387658b6270ea0b2dadfef86156 > # EXP-Topic sparse-snapshot

Re: [PATCH 02 of 12] revlog: split constants into a new `revlogutils.constants` module

2018-08-24 Thread Gregory Szorc
On Sat, Aug 18, 2018 at 2:27 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1534378093 -7200 > # Thu Aug 16 02:08:13 2018 +0200 > # Node ID 4a61a7a37a499387658b6270ea0b2dadfef86156 > # Parent 544933eed9653945bbeb2577fa1f6decf08dbb1f > # EXP-Topic sparse-snapshot

D4366: treemanifest: introduce lazy loading of subdirs

2018-08-24 Thread indygreg (Gregory Szorc)
indygreg added a comment. I'm not sure how I feel about so many methods having the `if dir in self._lazydirs: self._loadlazy(dir)` pattern. On one hand, action at a distance when it involves caching can be dangerous. And doing the lookup inline will avoid a Python function call. On

D4365: match: make exactmatcher.visitchildrenset return file children as well

2018-08-24 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc9a3f7f5c023: match: make exactmatcher.visitchildrenset return file children as well (authored by spectral, committed by ). CHANGED PRIOR TO COMMIT

D4364: match: document that visitchildrenset might return files

2018-08-24 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG27946fca8a05: match: document that visitchildrenset might return files (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4349: cleanup: make all uses of timedcm specify what they're timing

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG331ab85e910b: cleanup: make all uses of timedcm specify what theyre timing (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4350: util: make timedcm require the label

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe00123f63410: util: make timedcm require the label (API) (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4350?vs=10500=10558

D4348: util: make timedcm context manager also emit trace events

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG497effb0a04a: util: make timedcm context manager also emit trace events (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4343: tests: add support for emitting trace events to run-tests

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc496e8c14b9e: tests: add support for emitting trace events to run-tests (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4345: dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4019b4542e61: dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4347: demandimport: instrument python 2 code with trace events

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG574e1d3bc667: demandimport: instrument python 2 code with trace events (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4342: contrib: new script to read events from a named pipe and emit catapult traces

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9a81f126f9fa: contrib: new script to read events from a named pipe and emit catapult traces (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4344: tracing: new module to make tracing events in hg easier

2018-08-24 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG284440041141: tracing: new module to make tracing events in hg easier (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4346: hg: wrap the highest layer in the `hg` script possible in trace event

2018-08-24 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > hg:23-30 > +libdir = '@LIBDIR@' > > -if libdir != '@' 'LIBDIR' '@': > -if not os.path.isabs(libdir): > -libdir =

D4363: log: respect graphshorten on terminal nodes (collapsing o-~ to just o~)

2018-08-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision. martinvonz added a comment. LGTM, but I'll let a non-Googler queue it in case it seems controversial to others. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4363 To: spectral, #hg-reviewers, indygreg, martinvonz Cc:

D4344: tracing: new module to make tracing events in hg easier

2018-08-24 Thread indygreg (Gregory Szorc)
indygreg added inline comments. INLINE COMMENTS > tracing.py:31-34 > +_pipe.write('START %s %s\n' % (_session, whence)) > +yield > +finally: > +_pipe.write('END %s %s\n' % (_session, whence)) Per my comment in https://phab.mercurial-scm.org/D4342, I think we should

D4342: contrib: new script to read events from a named pipe and emit catapult traces

2018-08-24 Thread indygreg (Gregory Szorc)
indygreg added a comment. In https://phab.mercurial-scm.org/D4342#66811, @durin42 wrote: > Oh, and I'm really not in love with the `catapipe.py` name - got any suggestions for something better? Nothing definitive. But since this is related to tracing, maybe have `tracing` in the

D4372: index: embed nodetree in index object to avoid reference cycle

2018-08-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since the index has a reference to a nodetree and the nodetree has a reference back to the index, there is a reference cycle, so the index (and its nodetree)

Re: [PATCH] diff: use a threshold on similarity index before using word-diff (issue5965)

2018-08-24 Thread Yuya Nishihara
On Fri, 24 Aug 2018 23:54:56 +0900, Yuya Nishihara wrote: > > > It's an ASCII-fied FPGA image (called tabular text file), containing ~320k > > > decimal numbers plus commas (so ~1000k words in our word-diff.) And there > > > are some large hunks as it is a diff of two similar BLOBs split into > >

Re: [PATCH] diff: use a threshold on similarity index before using word-diff (issue5965)

2018-08-24 Thread Yuya Nishihara
On Fri, 24 Aug 2018 10:05:14 +0200, Boris FELD wrote: > On 23/08/2018 14:48, Yuya Nishihara wrote: > > On Wed, 22 Aug 2018 21:35:31 +0900, Yuya Nishihara wrote: > >> On Tue, 21 Aug 2018 17:11:51 +0200, Denis Laxalde wrote: > >>> Yuya Nishihara a écrit : > On Tue, 21 Aug 2018 14:10:33 +0200,

Re: D4125: narrow: add '--extend' flag to tracked command

2018-08-24 Thread Martin von Zweigbergk via Mercurial-devel
Sounds good On Fri, Aug 24, 2018, 07:07 pulkit (Pulkit Goyal) < phabrica...@mercurial-scm.org> wrote: > pulkit added inline comments. > > INLINE COMMENTS > > > foozy wrote in narrowcommands.py:303 > > Just curious, is it intentional that the name of this option is > different from

D4125: narrow: add '--extend' flag to tracked command

2018-08-24 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > foozy wrote in narrowcommands.py:303 > Just curious, is it intentional that the name of this option is different > from `--import-rules` of debugsparse ? I didn't know about that. That likes a good name, @martinvonz what do you think? REPOSITORY

D4125: narrow: add '--extend' flag to tracked command

2018-08-24 Thread foozy (Katsunori FUJIWARA)
foozy added inline comments. INLINE COMMENTS > martinvonz wrote in narrowcommands.py:303 > It looks like it just adds includes and excludes (but yes, adding excludes > means removing files), so I think the name makes sense Just curious, is it intentional that the name of this option is

Re: [PATCH 3 of 5] registrar: add decorator class to register a function as web command (API)

2018-08-24 Thread FUJIWARA Katsunori
At Thu, 23 Aug 2018 21:27:40 +0900, Yuya Nishihara wrote: > > On Wed, 22 Aug 2018 11:21:54 +0900, FUJIWARA Katsunori wrote: > > +# delay importing webcommands, because it implies evaluation of > > +# hgweb/__init__.py, even though web server feature is not used in > > +# almost all