D4498: util: properly copy lrucachedict instances

2018-09-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > indygreg wrote in util.py:1302 > Yes, this does feel like a bug. But it feels unrelated to the series, no? > > I can certainly code up a patch easily enough. I may tack one on the end of > the series... Yes, definitely unrelated (that's what

D4506: util: update lrucachedict order during get()

2018-09-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY get() should have the same semantics as __getitem__ for item retrieval. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4506

Re: [PATCH 09 of 10] shelve: use the internal phase when possible

2018-09-07 Thread Boris FELD
On 30/08/2018 17:02, Augie Fackler wrote: On Aug 29, 2018, at 12:30 PM, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1527588738 -7200 # Tue May 29 12:12:18 2018 +0200 # Node ID ccb9572516145a1b6f11a8d199c4a7da4774898b # Parent

D4502: util: allow lrucachedict to track cost of entries

2018-09-07 Thread lothiraldan (Boris Feld)
lothiraldan added inline comments. INLINE COMMENTS > util.py:1277 > if node is not None: > +self.totalcost -= node.cost > node.value = v I'm not sure this line is tested, I didnd't see a test where we replace an entry with an associated cost REPOSITORY rHG

mercurial@39466: 11 new changesets

2018-09-07 Thread Mercurial Commits
11 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8d858fbf2759 changeset: 39456:8d858fbf2759 parent: 39453:ab452995eaff user:Matt Harbison date:Tue Sep 04 22:29:38 2018 -0400 summary: cbor: teach the encoder to handle python `long` type for

Re: [PATCH 6 of 7] context: introduce a `_findchangeid` method to `filectx`

2018-09-07 Thread Boris FELD
On 07/09/2018 11:17, Martin von Zweigbergk via Mercurial-devel wrote: On Fri, Sep 7, 2018 at 8:13 AM Boris Feld > wrote: # HG changeset patch # User Boris Feld mailto:boris.f...@octobus.net>> # Date 1536255775 14400 #      Thu Sep 06 13:42:55

D4498: util: properly copy lrucachedict instances

2018-09-07 Thread indygreg (Gregory Szorc)
indygreg added inline comments. INLINE COMMENTS > martinvonz wrote in util.py:1302 > Btw, why doesn't this do `return self[k]` instead? It seems surprising that > the recency is not updated. Yes, this does feel like a bug. But it feels unrelated to the series, no? I can certainly code up a

D4498: util: properly copy lrucachedict instances

2018-09-07 Thread indygreg (Gregory Szorc)
indygreg added a comment. Added https://phab.mercurial-scm.org/D4506 to the series to fix the bug with `get()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4498 To: indygreg, #hg-reviewers Cc: martinvonz, mercurial-devel

[PATCH 2 of 4] hgweb: add error template to json so it won't crash

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1536326368 -32400 # Fri Sep 07 22:19:28 2018 +0900 # Node ID 90fe6481af4fd42def159f8e501612f305979822 # Parent cd0c58017ae949408c1e746c9c81ca6847591b3c hgweb: add error template to json so it won't crash diff --git

[PATCH 3 of 7] context: fix introrev to avoid computation as initially intended

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536254177 14400 # Thu Sep 06 13:16:17 2018 -0400 # Node ID a4c3eb6c1a36cbbf64fa8930b173154b2e77ef2b # Parent 9a18509c522deeb62a7b244dcf4c7b79a8dc1132 # EXP-Topic copy-perf # Available At https://bitbucket.org/octobus/mercurial-devel/ #

Re: [PATCH 6 of 7] context: introduce a `_findchangeid` method to `filectx`

2018-09-07 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Sep 7, 2018 at 8:13 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1536255775 14400 > # Thu Sep 06 13:42:55 2018 -0400 > # Node ID 441c39342d63c75ee101587b2fbf3af60800762f > # Parent f74f706f6d061cf9369cd45caa3a71d3fc03b293 > # EXP-Topic copy-perf > #

[PATCH 4 of 4] hgweb: do not audit URL path as working-directory path

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1535289489 -32400 # Sun Aug 26 22:18:09 2018 +0900 # Node ID 70d6fff1bccfe8760f06bc92ca0b23a61c3ddca9 # Parent 61b6dff6e23fde7831422b5787430a32003a4d33 hgweb: do not audit URL path as working-directory path Since hgweb is an interface to

[PATCH 1 of 7] ancestors: actually iterate over ancestors in topological order (issue5979)

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536267628 14400 # Thu Sep 06 17:00:28 2018 -0400 # Node ID eb80c721aea9715e23dc35cdd119428aa120ea93 # Parent ab452995eafffa69c34e863e4d8c03e163d8f3ad # EXP-Topic issue5979 # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH] phase: report number of non-public changeset alongside the new range

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1535586801 -7200 # Thu Aug 30 01:53:21 2018 +0200 # Node ID 5f931c1d1422e9a8c08cca3a59804b25a1183449 # Parent ab452995eafffa69c34e863e4d8c03e163d8f3ad # EXP-Topic phase-report # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 7 of 7] context: floor adjustlinkrev graph walk during copy tracing

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536255188 14400 # Thu Sep 06 13:33:08 2018 -0400 # Node ID 0f720a4aa166d08daaa39e8462f2291f77e825c1 # Parent 441c39342d63c75ee101587b2fbf3af60800762f # EXP-Topic copy-perf # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 3 of 4] hgweb: map Abort to 403 error to report inaccessible path for example

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1535289805 -32400 # Sun Aug 26 22:23:25 2018 +0900 # Node ID 61b6dff6e23fde7831422b5787430a32003a4d33 # Parent 90fe6481af4fd42def159f8e501612f305979822 hgweb: map Abort to 403 error to report inaccessible path for example Abort is so common

D4452: tests: improve the widening testing in test-narrow-widen*

2018-09-07 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG83dd656586b1: tests: improve the widening testing in test-narrow-widen* (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 2 of 7] ancestors: ensure a consistent order even in the "inclusive" case

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536277058 14400 # Thu Sep 06 19:37:38 2018 -0400 # Node ID 9a18509c522deeb62a7b244dcf4c7b79a8dc1132 # Parent eb80c721aea9715e23dc35cdd119428aa120ea93 # EXP-Topic issue5979 # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 5 of 7] context: split `introrev` logic in a sub function

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536255508 14400 # Thu Sep 06 13:38:28 2018 -0400 # Node ID f74f706f6d061cf9369cd45caa3a71d3fc03b293 # Parent a7dba588d74f3d71c988b9a89b9591fb530a1d14 # EXP-Topic copy-perf # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D4462: narrow: use util.readfile() and improve error message using --narrowspec

2018-09-07 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4062bbb1d10f: narrow: use util.readfile() and improve error message using --narrowspec (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT

[PATCH 4 of 7] context: introduce an `isintroducedafter` method and use it in copies

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536252767 14400 # Thu Sep 06 12:52:47 2018 -0400 # Node ID a7dba588d74f3d71c988b9a89b9591fb530a1d14 # Parent a4c3eb6c1a36cbbf64fa8930b173154b2e77ef2b # EXP-Topic copy-perf # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 4] hgweb: show shortlog by default in json output (issue5978)

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1536325966 -32400 # Fri Sep 07 22:12:46 2018 +0900 # Node ID cd0c58017ae949408c1e746c9c81ca6847591b3c # Parent 83dd656586b14a06b1b7e0fa57ab2a801eab3da5 hgweb: show shortlog by default in json output (issue5978) diff --git

D4341: sparse: add local files to temporaryfiles if they exist out of sparse

2018-09-07 Thread pulkit (Pulkit Goyal)
pulkit added a comment. gentle ping for review. If something is missing from this patch or if there is a way I can make this review easy, let me know. I will be happy to do that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4341 To: pulkit, #hg-reviewers Cc:

[PATCH 6 of 7] context: introduce a `_findchangeid` method to `filectx`

2018-09-07 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1536255775 14400 # Thu Sep 06 13:42:55 2018 -0400 # Node ID 441c39342d63c75ee101587b2fbf3af60800762f # Parent f74f706f6d061cf9369cd45caa3a71d3fc03b293 # EXP-Topic copy-perf # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D4502: util: allow lrucachedict to track cost of entries

2018-09-07 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 10832. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4502?vs=10821=10832 REVISION DETAIL https://phab.mercurial-scm.org/D4502 AFFECTED FILES contrib/perf.py mercurial/util.py tests/test-lrucachedict.py

D4371: treemanifest: use visitchildrenset when doing a walk

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10837. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4371?vs=10549=10837 REVISION DETAIL https://phab.mercurial-scm.org/D4371 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

D4368: treemanifest: avoid unnecessary copies/processing when using alwaysmatcher

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10834. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4368?vs=10546=10834 REVISION DETAIL https://phab.mercurial-scm.org/D4368 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

D4369: treemanifest: avoid loading everything just to get their nodeid

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10835. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4369?vs=10547=10835 REVISION DETAIL https://phab.mercurial-scm.org/D4369 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

D4367: treemanifest: attempt to avoid loading all lazily-loaded subdirs in _isempty

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10833. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4367?vs=10545=10833 REVISION DETAIL https://phab.mercurial-scm.org/D4367 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

D4370: treemanifest: use visitchildrenset when filtering a manifest to a matcher

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10836. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4370?vs=10548=10836 REVISION DETAIL https://phab.mercurial-scm.org/D4370 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

D4429: narrow: demonstrate that widening is still broken

2018-09-07 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Actually the tests were broken. I fixed them in https://www.mercurial-scm.org/repo/hg-committed/rev/83dd656586b1. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4429 To: pulkit, durin42, #hg-reviewers Cc: mercurial-devel

D4502: util: allow lrucachedict to track cost of entries

2018-09-07 Thread indygreg (Gregory Szorc)
indygreg planned changes to this revision. indygreg added inline comments. INLINE COMMENTS > lothiraldan wrote in util.py:1277 > I'm not sure this line is tested, I didnd't see a test where we replace an > entry with an associated cost Good catch! I'll send a revised patch. FWIW, cost

Re: [PATCH 2 of 7] ancestors: ensure a consistent order even in the "inclusive" case

2018-09-07 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Sep 7, 2018 at 8:06 AM Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1536277058 14400 > # Thu Sep 06 19:37:38 2018 -0400 > # Node ID 9a18509c522deeb62a7b244dcf4c7b79a8dc1132 > # Parent eb80c721aea9715e23dc35cdd119428aa120ea93 > # EXP-Topic issue5979 > #

Re: [PATCH] tests: stabilize test-removeemptydirs.t on Windows

2018-09-07 Thread Yuya Nishihara
On Fri, 07 Sep 2018 00:27:43 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1536291444 14400 > # Thu Sep 06 23:37:24 2018 -0400 > # Node ID e5449ff273d68abd3fd4e7b5766fb6d22edf30b7 > # Parent 7df9ae38c75ca7fd4d0d20802fbc4ab489bb1f06 > tests: stabilize

Re: D4477: merge: move purge logic from extension

2018-09-07 Thread Yuya Nishihara
Queued the series, thanks. > +matcher = scmutil.match(repo[None], dirs or (), { > +'include': opts.get('include'), > +'exclude': opts.get('exclude')}) > > -match = scmutil.match(repo[None], dirs, opts) Restored the original `match` construction, which looks simpler.

D4477: merge: move purge logic from extension

2018-09-07 Thread yuja (Yuya Nishihara)
yuja added a comment. Queued the series, thanks. > +matcher = scmutil.match(repo[None], dirs or (), { > +'include': opts.get('include'), > +'exclude': opts.get('exclude')}) > > - match = scmutil.match(repo[None], dirs, opts) Restored the original

D4477: merge: move purge logic from extension

2018-09-07 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7fea205fd5dc: merge: move purge logic from extension (authored by indygreg, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4477?vs=10825=10827#toc REPOSITORY rHG Mercurial

D4478: merge: use vfs methods for I/O

2018-09-07 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3dd34b401bc2: merge: use vfs methods for I/O (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4478?vs=10826=10828 REVISION

[Bug 5983] New: `hg pull` resulting in "RevlogError: missing processor for flag '0x2000'"

2018-09-07 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5983 Bug ID: 5983 Summary: `hg pull` resulting in "RevlogError: missing processor for flag '0x2000'" Product: Mercurial Version: stable branch Hardware: PC OS:

D4370: treemanifest: use visitchildrenset when filtering a manifest to a matcher

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10838. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4370?vs=10836=10838 REVISION DETAIL https://phab.mercurial-scm.org/D4370 AFFECTED FILES mercurial/manifest.py CHANGE DETAILS diff --git

[PATCH 1 of 2] ancestor: add test showing inconsistency between __iter__ and __contains__

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1536371322 -32400 # Sat Sep 08 10:48:42 2018 +0900 # Node ID ebcd7abf0d144fb657b90126a1e30d13eefeb364 # Parent a60dae060bc83e773bdbafb2432bc4cf387ebce2 ancestor: add test showing inconsistency between __iter__ and __contains__ diff --git

Re: [PATCH 2 of 2] ancestor: filter out initial revisions lower than stoprev

2018-09-07 Thread Martin von Zweigbergk via Mercurial-devel
Good catch. However, I think the docstring needs updating. I think it explicitly said that inclusive mode emits the initial revs ignoring stoprev. Will that still be the case after this patch? I'm on mobile right now and too lazy to confirm, but hopefully I'm remembering it right. On Fri, Sep 7,

Re: [PATCH 2 of 2] ancestor: filter out initial revisions lower than stoprev

2018-09-07 Thread Yuya Nishihara
On Fri, 7 Sep 2018 20:49:32 -0700, Martin von Zweigbergk wrote: > Good catch. However, I think the docstring needs updating. I think it > explicitly said that inclusive mode emits the initial revs ignoring > stoprev. That part was for __iter__(), and was rewritten by Boris' patch. The top-level

D4371: treemanifest: use visitchildrenset when doing a walk

2018-09-07 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10839. spectral edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4371?vs=10837=10839 REVISION DETAIL https://phab.mercurial-scm.org/D4371 AFFECTED FILES mercurial/manifest.py

[PATCH 2 of 2] ancestor: filter out initial revisions lower than stoprev

2018-09-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1536371964 -32400 # Sat Sep 08 10:59:24 2018 +0900 # Node ID 4894b3cdd4c03bb5579bb47f4f51a9410716df84 # Parent ebcd7abf0d144fb657b90126a1e30d13eefeb364 ancestor: filter out initial revisions lower than stoprev diff --git

[PATCH 1 of 2] tests: conditionalize an error message about unlinking a non empty directory

2018-09-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1536377989 14400 # Fri Sep 07 23:39:49 2018 -0400 # Node ID cf6130dd324b0eed4c902b45df503be429fe413f # Parent a60dae060bc83e773bdbafb2432bc4cf387ebce2 tests: conditionalize an error message about unlinking a non empty directory The message

[PATCH 2 of 2] tests: disable test-nointerrupt on Windows

2018-09-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1536378882 14400 # Fri Sep 07 23:54:42 2018 -0400 # Node ID 348ed11ba7406045a33d2e99834a341dfad6f57a # Parent cf6130dd324b0eed4c902b45df503be429fe413f tests: disable test-nointerrupt on Windows Per the followup discussion[1].