Re: [PATCH 2 of 2] setdiscovery: stop limiting the number of local head we initially send

2019-04-16 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Apr 16, 2019 at 8:59 PM Martin von Zweigbergk wrote: > > > On Tue, Apr 16, 2019 at 11:41 AM Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > >> # HG changeset patch >> # User Pierre-Yves David >> # Date 1555428398 -7200 >> # Tue Apr 16 17:26:38 2019 +0200 >> # Node ID

Re: [PATCH 2 of 2] setdiscovery: stop limiting the number of local head we initially send

2019-04-16 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Apr 16, 2019 at 11:41 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1555428398 -7200 > # Tue Apr 16 17:26:38 2019 +0200 > # Node ID ffaa98def33a903f132ec4177d36823a741b6ef6 > # Parent

Re: [PATCH 4 of 4] verify: also check full manifest validity during verify runs

2019-04-16 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Apr 16, 2019, 16:46 Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551881213 -3600 > # Wed Mar 06 15:06:53 2019 +0100 > # Node ID ed796867a06764cd78a57b2ed0249353f5809319 > # Parent

[PATCH 1 of 3] rust-filepatterns: add a Rust implementation of pattern-related utils

2019-04-16 Thread Raphaël Gomès
# HG changeset patch # User Raphaël Gomès # Date 1555442271 -7200 # Tue Apr 16 21:17:51 2019 +0200 # Node ID ad489b44ef16ae39eb2c692fc5ccf3268a140a65 # Parent a362b0b95e42c8f7d46d7e3a0eb4cc531fa5f2d6 # EXP-Topic rust-filepatterns rust-filepatterns: add a Rust implementation of

[PATCH 3 of 3] rust-filepatterns: call new Rust implementations from Python

2019-04-16 Thread Raphaël Gomès
# HG changeset patch # User Raphaël Gomès # Date 1555442904 -7200 # Tue Apr 16 21:28:24 2019 +0200 # Node ID ba9a1dd508c6c167d0c920ece643854c5bc6b6e7 # Parent 8586c2273ee3f0c4dd08bf69474fa33bb19de405 # EXP-Topic rust-filepatterns rust-filepatterns: call new Rust implementations from Python

[PATCH 2 of 3] rust-filepatterns: add `rust-cpython` bindings for `filepatterns`

2019-04-16 Thread Raphaël Gomès
# HG changeset patch # User Raphaël Gomès # Date 1555442867 -7200 # Tue Apr 16 21:27:47 2019 +0200 # Node ID 8586c2273ee3f0c4dd08bf69474fa33bb19de405 # Parent ad489b44ef16ae39eb2c692fc5ccf3268a140a65 # EXP-Topic rust-filepatterns rust-filepatterns: add `rust-cpython` bindings for

D6258: packaging: coerce paths to strings

2019-04-16 Thread durin42 (Augie Fackler)
durin42 added a comment. Argh. This change appears to be wrong (!) so I'm going to drop it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6258 To: durin42, #hg-reviewers, pulkit Cc: mercurial-devel ___

[PATCH 1 of 4] recover: add a --[no-]verify flag

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555454220 -7200 # Wed Apr 17 00:37:00 2019 +0200 # Node ID f233cb63bc077267d8571378350d9563cbabcf3d # Parent eebf78724d94649de84f921ff5bd39cbc0f48cb6 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 3 of 4] verify: introduce an experimental --full flag

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555456269 -7200 # Wed Apr 17 01:11:09 2019 +0200 # Node ID 9bec7491e9b4cabdfa4d264e5213b1f416ec2607 # Parent 55bd98999c25b10e220477fd4cc446a7c9c1f8ca # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 4 of 4] verify: also check full manifest validity during verify runs

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1551881213 -3600 # Wed Mar 06 15:06:53 2019 +0100 # Node ID ed796867a06764cd78a57b2ed0249353f5809319 # Parent 9bec7491e9b4cabdfa4d264e5213b1f416ec2607 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 2 of 4] verify: introduce a notion of "level"

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555456341 -7200 # Wed Apr 17 01:12:21 2019 +0200 # Node ID 55bd98999c25b10e220477fd4cc446a7c9c1f8ca # Parent f233cb63bc077267d8571378350d9563cbabcf3d # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

Re: Changing the wdir() {rev} and {node} output

2019-04-16 Thread Yuya Nishihara
On Tue, 16 Apr 2019 10:14:53 -0400, Jordi Gutiérrez Hermoso wrote: > While I think it might be okay to keep the iternal values, > > https://www.mercurial-scm.org/repo/hg/file/967c098eed33/mercurial/node.py#l39 > > I think it's far too confusing to expose them in the user interface. > > A

D6183: copies: add config option for writing copy metadata to file and/or changset

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0fdf45cb3dc6: copies: add config option for writing copy metadata to file and/or changset (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6186: changelog: parse copy metadata if available in extras

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0cfd1f9fb02b: changelog: parse copy metadata if available in extras (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6238: branchcache: don't verify while creating a copy

2019-04-16 Thread yuja (Yuya Nishihara)
yuja added a comment. > def copy(self): > """return an deep copy of the branchcache object""" > > - self._verifyall() return type(self)( self._entries, self.tipnode, self.tiprev, self.filteredhash, self._closednodes) Looks good, but it's probably better to copy the

D6207: branchcache: add functions to validate changelog nodes

2019-04-16 Thread yuja (Yuya Nishihara)
yuja added a comment. > The motivation behind iteritems() change (https://phab.mercurial-scm.org/D6236) is optimizing https://www.mercurial-scm.org/repo/hg-committed/file/70b71421fd33/mercurial/commands.py#l1128. Okay, got that, thanks. > Maybe we can iterate over verified

Re: D6238: branchcache: don't verify while creating a copy

2019-04-16 Thread Yuya Nishihara
> def copy(self): > """return an deep copy of the branchcache object""" > -self._verifyall() > return type(self)( > self._entries, self.tipnode, self.tiprev, self.filteredhash, > self._closednodes) Looks good, but it's probably better to

Re: D6207: branchcache: add functions to validate changelog nodes

2019-04-16 Thread Yuya Nishihara
> The motivation behind iteritems() change > (https://phab.mercurial-scm.org/D6236) is optimizing > https://www.mercurial-scm.org/repo/hg-committed/file/70b71421fd33/mercurial/commands.py#l1128. Okay, got that, thanks. > Maybe we can iterate over verified nodes first, and then iterate over

Re: [PATCH 2 of 2] setdiscovery: stop limiting the number of local head we initially send

2019-04-16 Thread Pierre-Yves David
(email sent on Pulkit Goyal suggestion) It would help us (Octobus) if this patch can make it into 5.0. This is a small code change that remove an embarrassing slow down in case where they would expect Mercurial to be snappy. That kind of discovery performance boosts make a significant

Re: [PATCH 1 of 3 V2] repoview: move subsettable in a dedicated module

2019-04-16 Thread Pierre-Yves David
On 4/17/19 12:14 AM, Pulkit Goyal wrote: On Tue, Apr 16, 2019 at 11:56 PM Pierre-Yves David mailto:pierre-yves.da...@ens-lyon.org>> wrote: # HG changeset patch # User Pierre-Yves David mailto:pierre-yves.da...@octobus.net>> # Date 1555076492 -7200 #      Fri Apr 12

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

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1554565579 -7200 # Sat Apr 06 17:46:19 2019 +0200 # Node ID 86eac5d2d7a1386dca5970126506d07201058200 # Parent eebf78724d94649de84f921ff5bd39cbc0f48cb6 # EXP-Topic repoview # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D6258: packaging: coerce paths to strings

2019-04-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG69b4426d288b: packaging: coerce paths to strings (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6258?vs=14788=14790

D6259: revset: on-disk cache for children queries

2019-04-16 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a proof of concept for further discussion. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6259 AFFECTED FILES

Re: [PATCH] revsetbenchmark: add some simpler revset for heads and roots

2019-04-16 Thread Pulkit Goyal
On Wed, Apr 17, 2019 at 3:37 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1554378409 -7200 > # Thu Apr 04 13:46:49 2019 +0200 > # Node ID 264dd70fbad7f44f9d6b131b8e40d09b554879e2 > # Parent

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. From Pierre-Yves: > Can you give that a shot with the two revisions we use in the benchmark > suite, this is a pair expensive with the current algorithm. > > 1daa622bbe42 76caed42cf7c Sure, it takes about 29 seconds with or without this patch. It

Re: [PATCH 1 of 3 V2] repoview: move subsettable in a dedicated module

2019-04-16 Thread Pulkit Goyal
On Tue, Apr 16, 2019 at 11:56 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1555076492 -7200 > # Fri Apr 12 15:41:32 2019 +0200 > # Node ID 56e2557a9401a3b3c60956b86860c84fb2e1330a > # Parent

[PATCH] revsetbenchmark: add some simpler revset for heads and roots

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1554378409 -7200 # Thu Apr 04 13:46:49 2019 +0200 # Node ID 264dd70fbad7f44f9d6b131b8e40d09b554879e2 # Parent a362b0b95e42c8f7d46d7e3a0eb4cc531fa5f2d6 # EXP-Topic extra-revset # Available At https://bitbucket.org/octobus/mercurial-devel/

D6258: packaging: coerce paths to strings

2019-04-16 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Experimentally passing the pathlib.Path to zipfile.ZipFile fails on at least some Python versions. I've gotten frustrated enough I'd rather just force them to

D6257: rust-discovery: core implementation for take_quick_sample()

2019-04-16 Thread gracinet (Georges Racinet)
gracinet created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes in particular `rand` no longer a testing dependency. We keep a seedable random generator on the `PartialDiscovery` object

Re: D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread Pierre-Yves David
On 4/16/19 11:08 PM, martinvonz (Martin von Zweigbergk) wrote: martinvonz added a comment. In https://phab.mercurial-scm.org/D6255#91019, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6255#91015, @marmoute wrote: > > > I did a first path through it, the new code

Re: [PATCH 1 of 2] rust: published the three extension crates to crates.io

2019-04-16 Thread Georges Racinet
Hi, On 4/16/19 9:26 PM, Georges Racinet wrote: > # HG changeset patch > # User Georges Racinet > # Date 1555441784 -7200 > # Tue Apr 16 21:09:44 2019 +0200 > # Node ID 410396d5eca793a1b8cf9ee8ba7bce466e9be3c0 > # Parent a362b0b95e42c8f7d46d7e3a0eb4cc531fa5f2d6 > # EXP-Topic rust-crates.io

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6255#91019, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6255#91015, @marmoute wrote: > > > I did a first path through it, the new code seems reasonable and easier > > to read than the previous one. Some

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. Replying to just a few things now. Will reply to the rest later. In https://phab.mercurial-scm.org/D6255#91019, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6255#91015, @marmoute wrote: > > > I did a first path through it, the new code seems

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6255#91019, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6255#91015, @marmoute wrote: > > > I did a first path through it, the new code seems reasonable and easier > > to read than the previous one. Some

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6255#91015, @marmoute wrote: > I did a first path through it, the new code seems reasonable and easier > to read than the previous one. Some comments and questions below. The rest somehow didn't make it here, so

D6182: bundle2: handle compression in _forwardchunks

2019-04-16 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger added inline comments. INLINE COMMENTS > durin42 wrote in bundle2.py:846 > so...what's going on with oparams here? should it be outparams? > > (is there more to this series that would get this code covered by tests?) Yes, left-over from earlier rename round. I think the code

D6182: bundle2: handle compression in _forwardchunks

2019-04-16 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger updated this revision to Diff 14786. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6182?vs=14622=14786 REVISION DETAIL https://phab.mercurial-scm.org/D6182 AFFECTED FILES mercurial/bundle2.py tests/test-pull-bundle.t CHANGE

[PATCH 1 of 2] rust: published the three extension crates to crates.io

2019-04-16 Thread Georges Racinet
# HG changeset patch # User Georges Racinet # Date 1555441784 -7200 # Tue Apr 16 21:09:44 2019 +0200 # Node ID 410396d5eca793a1b8cf9ee8ba7bce466e9be3c0 # Parent a362b0b95e42c8f7d46d7e3a0eb4cc531fa5f2d6 # EXP-Topic rust-crates.io rust: published the three extension crates to crates.io These

[PATCH 2 of 2] rust: getting back to versions 0.1.0

2019-04-16 Thread Georges Racinet
# HG changeset patch # User Georges Racinet # Date 1555442327 -7200 # Tue Apr 16 21:18:47 2019 +0200 # Node ID 9f79564faefa97d9221bd59f913691cf9df9ff64 # Parent 410396d5eca793a1b8cf9ee8ba7bce466e9be3c0 # EXP-Topic rust-crates.io rust: getting back to versions 0.1.0 This ensures that

Re: D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread Pierre-Yves David
On 4/16/19 9:02 PM, marmoute (Pierre-Yves David) wrote: marmoute added a comment. I did a first path through it, the new code seems reasonable and easier to read than the previous one. Some comments and questions below. The actual comments are visible here:

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread marmoute (Pierre-Yves David)
marmoute added a comment. I did a first path through it, the new code seems reasonable and easier to read than the previous one. Some comments and questions below. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6255 To: martinvonz, #hg-reviewers Cc:

Re: D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread Pierre-Yves David
I did a first path through it, the new code seems reasonable and easier to read than the previous one. Some comments and questions below. On 4/16/19 7:19 PM, martinvonz (Martin von Zweigbergk) wrote: martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald

[PATCH 2 of 3 V2] repoview: introduce a `experimental.extra-filter-revs` config

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1554565579 -7200 # Sat Apr 06 17:46:19 2019 +0200 # Node ID 898753ab5830bed2a7e16639a746376fa447577f # Parent 56e2557a9401a3b3c60956b86860c84fb2e1330a # EXP-Topic repoview # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 3 V2] repoview: move subsettable in a dedicated module

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555076492 -7200 # Fri Apr 12 15:41:32 2019 +0200 # Node ID 56e2557a9401a3b3c60956b86860c84fb2e1330a # Parent 2003f0bffcb197699b6665939e21a681f9c73570 # EXP-Topic repoview # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 3 of 3 V2] repoview: flag `server.view` as experimental

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555079159 -7200 # Fri Apr 12 16:25:59 2019 +0200 # Node ID 87d373ff578d10b2c2e99205add8c4c960102a94 # Parent 898753ab5830bed2a7e16639a746376fa447577f # EXP-Topic repoview # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 2] debugdiscovery: include the number of heads in all sets

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555422620 -7200 # Tue Apr 16 15:50:20 2019 +0200 # Node ID 017778a4463a8e6ecb4b17cacf46a3ab27bdb239 # Parent 967c098eed3398d991cbd7f0d48636b575beb711 # EXP-Topic discovery-speedup # Available At

[PATCH 2 of 2] setdiscovery: stop limiting the number of local head we initially send

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555428398 -7200 # Tue Apr 16 17:26:38 2019 +0200 # Node ID ffaa98def33a903f132ec4177d36823a741b6ef6 # Parent 017778a4463a8e6ecb4b17cacf46a3ab27bdb239 # EXP-Topic discovery-speedup # Available At

D6256: copies: inline _computenonoverlap() in mergecopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 14785. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6256?vs=14784=14785 REVISION DETAIL https://phab.mercurial-scm.org/D6256 AFFECTED FILES

D6249: copies: delete debug message about search limit

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm about to rewrite mergecopies() and this message will no longer be emitted then. Let's remove the message now to remove a distraction from that patch.

[PATCH] chistedit: use context manager to set verbose ui

2019-04-16 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1555434741 14400 # Tue Apr 16 13:12:21 2019 -0400 # Node ID f64bbdc70aaa1ca8c504c2d909f6012927a27cb8 # Parent a362b0b95e42c8f7d46d7e3a0eb4cc531fa5f2d6 chistedit: use context manager to set verbose ui I'm still not exactly sure why

D6252: tests: make merge conflicts explicit in `hg annotate` tests

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that

D6255: copies: calculate mergecopies() based on pathcopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When copies are stored in changesets, we need a changeset-centric version of mergecopies() just like we have a changeset-centric version of

D6256: copies: inline _computenonoverlap() in mergecopies()

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now call pathcopies() from the base to each of the commits, and that calls _computeforwardmissing(), which does file prefetching (in the remotefilelog

D6254: tests: avoid a rename/delete conflict when updating in test-narrow-update.t

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After the upcoming rewrite of mergecopies(), this test would otherwise (accurately) start warning about "inside/f1 was

D6253: tests: delete unused function in test-rename-merge2.t

2019-04-16 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/D6253 AFFECTED FILES tests/test-rename-merge2.t CHANGE DETAILS diff --git

D6250: copies: delete debug message about changes since common ancestor

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same reasoning as previous patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6250 AFFECTED FILES mercurial/copies.py

D6182: bundle2: handle compression in _forwardchunks

2019-04-16 Thread durin42 (Augie Fackler)
durin42 added a comment. Ugh I'm sorry - I evidently reviewed this and never pushed submit. :( INLINE COMMENTS > bundle2.py:846 > +if k.lower() != 'compression': > +oparams.append(p) > +outparams = ' '.join(outparams) so...what's going on with

D6251: copies: delete debug message about "unmatched files new in both"

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same reasoning as previous patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6251 AFFECTED FILES mercurial/copies.py

D6246: copies: fix up "fullcopy" with missing entries from "copy"

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is just a workaround similar to the previous one. It will make it easier to follow later patches. REPOSITORY rHG Mercurial REVISION DETAIL

D6248: copies: move early return for "no copies" case a little earlier

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We can return before the block that prints debug messages. That block will not be run anyway when there are no copies. REPOSITORY rHG Mercurial REVISION

D6245: merge: remove workaround for issue5020

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As I explained in the previous commit, I think the filtering added there is a better fix for the issue, so the workaround from

D6247: copies: fix up "fullcopy" with missing entries from "diverge"

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Similar to the previous patch, but this doesn't even affect tests. It does affect tests if you change them to turn on debug logging. I'm fixing it here so

D6244: copies: don't include copies that are not in source in directory move

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I've been working on a rewrite of mergecopies(). I compared the output of the rewritten version with the current version. I noticed that between

D6243: tests: split out separate test for issue5020

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test was added to the existing setup in https://phab.mercurial-scm.org/rHG41f6af50c0d8824600b1112da932dcdf399e8d5d (merge: fix crash on criss cross merge

D6242: tests: add test for issue5343 (grafting with copies)

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It seems that issue5353 resulted in a lot of tests in test-graft.t, but the bug actually reported in that issue didn't get a test case. This patch adds one

D6241: narrow: drop unrequired if conditionals

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2003f0bffcb1: narrow: drop unrequired if conditionals (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6241?vs=14768=14769

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

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in narrowbundle2.py:152 > I'd drop these checks Sent https://phab.mercurial-scm.org/D6241. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6218 To: pulkit, durin42, martinvonz, #hg-reviewers Cc:

Re: [PATCH 3 of 3 "V4] upgrade: support upgrade to/from zstd storage (issue6088)

2019-04-16 Thread Pulkit Goyal
I see that Augie has already queued this series. :) On Tue, Apr 16, 2019 at 7:53 PM Gregory Szorc wrote: > I would also like to get this in the RC. Makes it more accessible sooner, > etc. > > > On Apr 16, 2019, at 18:03, Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > > > > > > >

D6241: narrow: drop unrequired if conditionals

2019-04-16 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6241 AFFECTED FILES

Re: [PATCH 3 of 3 "V4] upgrade: support upgrade to/from zstd storage (issue6088)

2019-04-16 Thread Gregory Szorc
I would also like to get this in the RC. Makes it more accessible sooner, etc. > On Apr 16, 2019, at 18:03, Pierre-Yves David > wrote: > > > >> On 4/16/19 4:31 PM, Augie Fackler wrote: >>> On Tue, Apr 16, 2019 at 03:26:07PM +0200, Pierre-Yves David wrote: >>> # HG changeset patch >>> # User

Re: [PATCH 3 of 3 "V4] upgrade: support upgrade to/from zstd storage (issue6088)

2019-04-16 Thread Pierre-Yves David
On 4/16/19 4:31 PM, Augie Fackler wrote: On Tue, Apr 16, 2019 at 03:26:07PM +0200, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1549032662 -3600 # Fri Feb 01 15:51:02 2019 +0100 # Node ID 821f57c6dda8f3a0499717684d617d0c3a83e9e2 # Parent

D6183: copies: add config option for writing copy metadata to file and/or changset

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 14766. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6183?vs=14738=14766 REVISION DETAIL https://phab.mercurial-scm.org/D6183 AFFECTED FILES mercurial/changelog.py mercurial/configitems.py

D6186: changelog: parse copy metadata if available in extras

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 14767. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6186?vs=14739=14767 REVISION DETAIL https://phab.mercurial-scm.org/D6186 AFFECTED FILES mercurial/changelog.py mercurial/context.py mercurial/copies.py

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

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8a37c9b6cf0a: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019) (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6183: copies: add config option for writing copy metadata to file and/or changset

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6183#90738, @yuja wrote: > > > > > extras field. Almost all extras data are texts, and IIRC we regret that > > > > > transplant sources are stored in binary form. > > > > > > > > Why not? I picked \0

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

2019-04-16 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > narrowbundle2.py:152 > +inc, exc = data.split('\0') > +if inc: > +includepats |= set(inc.splitlines()) I'd drop these checks > exchange.py:2218 > +data = '' > if include: > +data +=

mercurial@42130: 5 new changesets

2019-04-16 Thread Mercurial Commits
5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ef0e3cc684b3 changeset: 42126:ef0e3cc684b3 user:Pierre-Yves David date:Mon May 21 17:28:35 2018 +0200 summary: repoview: introduce a filter for serving hidden changesets

D6240: branchcache: only iterate over branches which needs to be verified

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG75e8e16ca107: branchcache: only iterate over branches which needs to be verified (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6236: branchcache: lazily validate nodes in iteritems()

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf0203c3406e7: branchcache: lazily validate nodes in iteritems() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6239: branchcache: fix the docstring of _verifybranch()

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd9dc0896e1d3: branchcache: fix the docstring of _verifybranch() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6238: branchcache: don't verify while creating a copy

2019-04-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb26455ffa7fa: branchcache: dont verify while creating a copy (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH 3 of 3 "V4] upgrade: support upgrade to/from zstd storage (issue6088)

2019-04-16 Thread Augie Fackler
On Tue, Apr 16, 2019 at 03:26:07PM +0200, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1549032662 -3600 > # Fri Feb 01 15:51:02 2019 +0100 > # Node ID 821f57c6dda8f3a0499717684d617d0c3a83e9e2 > # Parent cbc090e88191176d0d7708e069a98596df78c2c5 > #

mercurial@42125: 7 new changesets

2019-04-16 Thread Mercurial Commits
7 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/2d428b859282 changeset: 42119:2d428b859282 user:Kyle Lippincott date:Mon Apr 15 14:32:47 2019 -0700 summary: readline: provide styled prompt to readline (issue6070)

Changing the wdir() {rev} and {node} output

2019-04-16 Thread Jordi Gutiérrez Hermoso
While I think it might be okay to keep the iternal values, https://www.mercurial-scm.org/repo/hg/file/967c098eed33/mercurial/node.py#l39 I think it's far too confusing to expose them in the user interface. A particular inconsistency I see is that we already have a way to show wdir(), for

[PATCH 3 of 3 "V4] upgrade: support upgrade to/from zstd storage (issue6088)

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1549032662 -3600 # Fri Feb 01 15:51:02 2019 +0100 # Node ID 821f57c6dda8f3a0499717684d617d0c3a83e9e2 # Parent cbc090e88191176d0d7708e069a98596df78c2c5 # EXP-Topic zstd-revlog # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 2 of 3 "V4] compression: introduce an official `zstd-revlog` requirement

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1553707623 -3600 # Wed Mar 27 18:27:03 2019 +0100 # Node ID cbc090e88191176d0d7708e069a98596df78c2c5 # Parent 32be9488a4f86228802c523512b29a17b420b3ea # EXP-Topic zstd-revlog # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 3 "V4] compression: only declare revlog support for available engine

2019-04-16 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1555420216 -7200 # Tue Apr 16 15:10:16 2019 +0200 # Node ID 32be9488a4f86228802c523512b29a17b420b3ea # Parent 967c098eed3398d991cbd7f0d48636b575beb711 # EXP-Topic zstd-revlog # Available At https://bitbucket.org/octobus/mercurial-devel/ #

Re: [PATCH 1 of 2 "V3] compression: introduce an official `zstd-revlog` requirement

2019-04-16 Thread Pierre-Yves David
On 4/16/19 12:28 PM, Gregory Szorc wrote: On Mon, Apr 15, 2019 at 8:34 AM Augie Fackler > wrote: Greg: ping on these? I'm aware you had some unease on this topic, and I'd like to figure out if we should ship this. Thanks! I've been enjoying my holiday away

Re: [PATCH 04 of 14 "] pull: deal with locally filtered changeset passed into --rev

2019-04-16 Thread Pulkit Goyal
On Tue, Apr 16, 2019 at 3:37 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 4/16/19 12:56 PM, Gregory Szorc wrote: > > On Tue, Apr 16, 2019 at 4:54 AM Gregory Szorc > > wrote: > > > > On Sat, Apr 13, 2019 at 5:56 PM Pierre-Yves David >

D6237: absorb: aborting if another operation is in progress

2019-04-16 Thread rdamazio (Rodrigo Damazio Bovendorp)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG537a8aeb9977: absorb: aborting if another operation is in progress (authored by rdamazio, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6207: branchcache: add functions to validate changelog nodes

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D6207#90778, @yuja wrote: > Queued, thanks. > > > +def _verifybranch(self, branch): > > +""" verify head nodes for the given branch. If branch is None, verify > > +for all the branches """ > > "If

D6236: branchcache: lazily validate nodes in iteritems()

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14759. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6236?vs=14743=14759 REVISION DETAIL https://phab.mercurial-scm.org/D6236 AFFECTED FILES mercurial/branchmap.py CHANGE DETAILS diff --git

Re: [PATCH 04 of 14 "] pull: deal with locally filtered changeset passed into --rev

2019-04-16 Thread Pierre-Yves David
On 4/16/19 12:56 PM, Gregory Szorc wrote: On Tue, Apr 16, 2019 at 4:54 AM Gregory Szorc > wrote: On Sat, Apr 13, 2019 at 5:56 PM Pierre-Yves David mailto:pierre-yves.da...@ens-lyon.org>> wrote: # HG changeset patch # User Pierre-Yves

D6240: branchcache: only iterate over branches which needs to be verified

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise we loop over all the branches and call _verifybranch() even if not required. REPOSITORY rHG Mercurial REVISION DETAIL

D6239: branchcache: fix the docstring of _verifybranch()

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Initially the function was designed to support verifying all branches but later I decided to have a separate function. I forget to remove the doc related to

D6238: branchcache: don't verify while creating a copy

2019-04-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The copy will not be mark as verified, so there is no need to verify nodes. Thanks to Yuya who spotted this while reviewing. REPOSITORY rHG Mercurial REVISION

Re: [PATCH 04 of 14 "] pull: deal with locally filtered changeset passed into --rev

2019-04-16 Thread Gregory Szorc
On Tue, Apr 16, 2019 at 4:54 AM Gregory Szorc wrote: > On Sat, Apr 13, 2019 at 5:56 PM Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > >> # HG changeset patch >> # User Pierre-Yves David >> # Date 1554472565 -7200 >> # Fri Apr 05 15:56:05 2019 +0200 >> # Node ID

Re: [PATCH 04 of 14 "] pull: deal with locally filtered changeset passed into --rev

2019-04-16 Thread Gregory Szorc
On Sat, Apr 13, 2019 at 5:56 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1554472565 -7200 > # Fri Apr 05 15:56:05 2019 +0200 > # Node ID 0adcfded9b03fff84190594ef29e37110967419f > # Parent

Re: [PATCH 01 of 14 "] repoview: fix conditional around unserved changesets

2019-04-16 Thread Gregory Szorc
On Sat, Apr 13, 2019 at 5:49 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1555181870 -7200 > # Sat Apr 13 20:57:50 2019 +0200 > # Node ID 5ce5915a48297de3f7464e8f149629799da5ca6f > # Parent

Re: [PATCH 1 of 2 "V3] compression: introduce an official `zstd-revlog` requirement

2019-04-16 Thread Gregory Szorc
On Mon, Apr 15, 2019 at 8:34 AM Augie Fackler wrote: > Greg: ping on these? I'm aware you had some unease on this topic, and > I'd like to figure out if we should ship this. Thanks! > I've been enjoying my holiday away from the computer. I met with Pierre-Yves and Georges yesterday and agreed

  1   2   >