D6187: wix: fix the package build when not adding features

2019-04-02 Thread durin42 (Augie Fackler)
durin42 created this revision. durin42 added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Should have used ifdef, not if. Sigh. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6187 AFFECT

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Thanks for queuing Yuya. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6169 To: navaneeth.suresh, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-de

[PATCH evolve-ext] uncommit: abort if an explicitly given file cannot be uncommitted (BC)

2019-04-02 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1554259321 14400 # Tue Apr 02 22:42:01 2019 -0400 # Node ID 272e76e20c3c52fcae8a4c2003f73d8db77e566b # Parent e8515ee7a7cc0281d905f762e26e8956ccfd7f74 uncommit: abort if an explicitly given file cannot be uncommitted (BC) This corresponds to

D6177: histedit: narrow the scope of discarded ui output

2019-04-02 Thread rdamazio (Rodrigo Damazio Bovendorp)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG15d2afa31e57: histedit: narrow the scope of discarded ui output (authored by rdamazio, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6177?vs=14614&id=14636#toc REPOSITORY r

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-02 Thread navaneeth.suresh (Navaneeth Suresh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG03f6480bfdda: unshelve: disable unshelve during merge (issue5123) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6169?vs=14616&id=14635#toc REPO

Re: [PATCH V4] uncommit: abort if an explicitly given file cannot be uncommitted

2019-04-02 Thread Yuya Nishihara
On Mon, 01 Apr 2019 23:05:18 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1553910795 14400 > # Fri Mar 29 21:53:15 2019 -0400 > # Node ID 8ced6cadf535d8f7502f61db01ddcb8b2629a17a > # Parent eec20025ada33889233e553c5825aac36b708f6c > uncommit: abort if an

D6186: changelog: parse copy metadata if available in extras

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

mercurial@42036: 14 new changesets

2019-04-02 Thread Mercurial Commits
14 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/bf87d34a675c changeset: 42023:bf87d34a675c user:Gregory Szorc date:Sat Mar 09 16:36:08 2019 -0800 summary: contrib: PowerShell script to install development dependencies https://www.mercurial-scm.org/

[Bug 6110] New: excessive logging to blackbox.log

2019-04-02 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6110 Bug ID: 6110 Summary: excessive logging to blackbox.log Product: Mercurial Version: 4.9 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug

D6180: wix: add functionality to inject additional Features into installer

2019-04-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1711f5813a63: wix: add functionality to inject additional Features into installer (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.

D6179: wix: add support for additional wxs files

2019-04-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG978b03d5f66e: wix: add support for additional wxs files (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6179?vs=14629&id=1463

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG715d3220ac4f: wix: add a hook for a prebuild script to inject extra libraries (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/

D6180: wix: add functionality to inject additional Features into installer

2019-04-02 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 14630. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6180?vs=14618&id=14630 REVISION DETAIL https://phab.mercurial-scm.org/D6180 AFFECTED FILES contrib/packaging/hgpackaging/wix.py contrib/packaging/wix/build.p

D6179: wix: add support for additional wxs files

2019-04-02 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 14629. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6179?vs=14617&id=14629 REVISION DETAIL https://phab.mercurial-scm.org/D6179 AFFECTED FILES contrib/packaging/hgpackaging/wix.py contrib/packaging/wix/build.p

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 14628. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6164?vs=14576&id=14628 REVISION DETAIL https://phab.mercurial-scm.org/D6164 AFFECTED FILES contrib/packaging/hgpackaging/py2exe.py contrib/packaging/hgpackag

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

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This introduces a config option that lets you choose to write copy metadata to the changeset extras instead of to filelog. There's also an option to write it

D6186: changelog: parse copy metadata if available in extras

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This lets read back the copy metadata we just started writing. There are still many places left to teach about getting the copy information from the changeset

D6185: changelog: pass default extras into decodeextra()

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I want to use the function with a different default (empty dict, to be specific) and this enables that. REPOSITORY rHG Mercurial REVISION DETAIL https://p

D6184: changelog: extract a _string_unescape() to mirror _string_escape()

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We use our own _string_escape() to encode the "extras" field. Then we use codecs.escape_decode() to escape it. But there's also a little workaround for dealin

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread indygreg (Gregory Szorc)
indygreg added a comment. In https://phab.mercurial-scm.org/D6164#90074, @durin42 wrote: > In https://phab.mercurial-scm.org/D6164#90073, @indygreg wrote: > > > I would prefer you fix them :) > > > Okay, then what should we call it? `--extra-packages-script` since that's what it

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D6164#90073, @indygreg wrote: > I would prefer you fix them :) Okay, then what should we call it? `--extra-packages-script` since that's what it's for? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-

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

2019-04-02 Thread Gregory Szorc
On Sun, Mar 31, 2019 at 8:39 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Boris Feld > # Date 1549032662 -3600 > # Fri Feb 01 15:51:02 2019 +0100 > # Node ID 7acbe373397d9fb6dfb176b1a69b4ee5f2bf18ba > # Parent 2cfe9983fa92313d58f0420ec62f2341

Re: [PATCH 7 of 8 "] compression: introduce an official `zstd-revlog` requirement

2019-04-02 Thread Gregory Szorc
On Tue, Apr 2, 2019 at 6:57 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 4/2/19 9:52 AM, Josef 'Jeff' Sipek wrote: > > On Sun, Mar 31, 2019 at 17:36:23 +0200, Pierre-Yves David wrote: > >> # HG changeset patch > >> # User Pierre-Yves David > >> # Date 1553707623 -3600 >

Re: [PATCH 6 of 8 "] compression: introduce an official `format.revlog-compression` option

2019-04-02 Thread Gregory Szorc
On Sun, Mar 31, 2019 at 8:39 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1553707614 -3600 > # Wed Mar 27 18:26:54 2019 +0100 > # Node ID 108e26fa0a97fe5342a1ce246cc4e4c185803454 > # Parent 28701199a78bdbab36aa422be

Re: [PATCH 3 of 8 "] compression: introduce a `storage.revlog.zlib.level` configuration

2019-04-02 Thread Gregory Szorc
On Tue, Apr 2, 2019 at 12:29 AM Josef 'Jeff' Sipek wrote: > On Sun, Mar 31, 2019 at 17:36:19 +0200, Pierre-Yves David wrote: > ... > > compression: introduce a `storage.revlog.zlib.level` configuration > > > > This option control the zlib compression level used when compression > revlog > > chunk

Re: [PATCH 5 of 8 "] compression: display compression level in debugformat

2019-04-02 Thread Gregory Szorc
On Sun, Mar 31, 2019 at 8:39 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1553725731 -3600 > # Wed Mar 27 23:28:51 2019 +0100 > # Node ID 28701199a78bdbab36aa422be0b4681941433823 > # Parent bcc4ba4c53b44dc6013b89f8c

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread indygreg (Gregory Szorc)
indygreg added a comment. I would prefer you fix them :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6164 To: durin42, indygreg, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mer

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D6164#90059, @indygreg wrote: > Was a newer version of this patch with the requested changes going to be uploaded? It's weird to see additional patches in the series without this one updated... You had indicated up-thread

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

2019-04-02 Thread arun (Arun Chandrasekaran)
arun marked an inline comment as done. arun added inline comments. INLINE COMMENTS > JordiGH wrote in crecord.py:1471 > We should find a better way to phrase this, since it's not about hunk. Maybe > just "first line" and "last line". Amended the patch. Simply top/bottom seems good as well. Can

Re: [PATCH 4 of 8 "] compression: introduce a `storage.revlog.zstd.level` configuration

2019-04-02 Thread Gregory Szorc
On Sun, Mar 31, 2019 at 8:39 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1553708159 -3600 > # Wed Mar 27 18:35:59 2019 +0100 > # Node ID bcc4ba4c53b44dc6013b89f8c85b0f1967dfaebb > # Parent df7c537a8d07d6c1d4e7aa760

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

2019-04-02 Thread arun (Arun Chandrasekaran)
arun updated this revision to Diff 14623. arun edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6178?vs=14621&id=14623 REVISION DETAIL https://phab.mercurial-scm.org/D6178 AFFECTED FILES mercurial/crecord.py CHANGE

D6182: bundle2: handle compression in _forwardchunks

2019-04-02 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY _forwardchunks is used to compensate for getbundle protocol deficits. Since it transparently decodes the payload, it also needs to remove the correspo

D6164: wix: add a hook for a prebuild script to inject extra libraries

2019-04-02 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. Was a newer version of this patch with the requested changes going to be uploaded? It's weird to see additional patches in the series without this one updated... REPOSITORY

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

2019-04-02 Thread Jordi GutiƩrrez Hermoso
JordiGH added inline comments. INLINE COMMENTS > crecord.py:1471 > + g : go to the first hunk line > + G : go to the last hunk line >f : fold / unfold item, hiding/revealing its children We should find a better way to phrase this,

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

2019-04-02 Thread arun (Arun Chandrasekaran)
arun updated this revision to Diff 14621. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6178?vs=14620&id=14621 REVISION DETAIL https://phab.mercurial-scm.org/D6178 AFFECTED FILES mercurial/crecord.py CHANGE DETAILS diff --git a/mercurial/crecord.py

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

2019-04-02 Thread arun (Arun Chandrasekaran)
arun updated this revision to Diff 14620. arun edited the summary of this revision. arun retitled this revision from "crecord: new keys g & G to navigate to the top and bottom hunks respectively" to "crecord: new keys g & G to navigate to the top and bottom respectively". REPOSITORY rHG Mercur

D6181: localrepo: rename crev in _filecommit() to cnode, since it's a node

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I know we often use "rev" generically, but here's it always a node, so it helps to be specific. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.merc

D6163: copies: extract function for deciding whether to use changeset-centric algos

2019-04-02 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in copies.py:163 > I initially didn't have `use` and found it less clear. I also think "use > changeset-centric" sounds weird. Maybe just `changesetcentric` as you said > then, but that also seems unclear. It feels like we're

Re: [PATCH 1 of 8 "] util: extract compression code in `mercurial.utils.compression`

2019-04-02 Thread Pierre-Yves David
I updated the series to fix the typos you pointed out. It is visible on bitbucket if you are curious. I'll send a V2 when other people had a chance to comment on this. https://bitbucket.org/octobus/mercurial-devel/commits/all?search=1fe6a85%3A%3A3e015ee On 4/2/19 8:48 AM, Josef 'Jeff' Sipek wr

D6180: wix: add functionality to inject additional Features into installer

2019-04-02 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the last bit required to be able to glue extra configs etc into the installer. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.or

D6179: wix: add support for additional wxs files

2019-04-02 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As with my previous change for an --extra-prebuiild-script, I'm assuming this is predominantly useful in an enterprise environment and am only adding this to wix

Re: [PATCH 1 of 8 "] util: extract compression code in `mercurial.utils.compression`

2019-04-02 Thread Pierre-Yves David
On 4/2/19 8:48 AM, Josef 'Jeff' Sipek wrote: On Sun, Mar 31, 2019 at 17:36:17 +0200, Pierre-Yves David wrote: ... diff --git a/mercurial/util.py b/mercurial/utils/compression.py copy from mercurial/util.py copy to mercurial/utils/compression.py --- a/mercurial/util.py +++ b/mercurial/utils/com

Re: [PATCH 7 of 8 "] compression: introduce an official `zstd-revlog` requirement

2019-04-02 Thread Pierre-Yves David
On 4/2/19 9:52 AM, Josef 'Jeff' Sipek wrote: On Sun, Mar 31, 2019 at 17:36:23 +0200, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1553707623 -3600 # Wed Mar 27 18:27:03 2019 +0100 # Node ID 2cfe9983fa92313d58f0420ec62f2341a810343e # Parent 108e26fa0a97fe

Re: [PATCH 6 of 8 "] compression: introduce an official `format.revlog-compression` option

2019-04-02 Thread Pierre-Yves David
On 4/2/19 9:42 AM, Josef 'Jeff' Sipek wrote: On Sun, Mar 31, 2019 at 17:36:22 +0200, Pierre-Yves David wrote: ... compression: introduce an official `format.revlog-compression` option This option superseed the `experiment.format.compression` option. The value s/superseed/supersedes/ :) cu

Re: [PATCH 3 of 8 "] compression: introduce a `storage.revlog.zlib.level` configuration

2019-04-02 Thread Pierre-Yves David
On 4/2/19 9:29 AM, Josef 'Jeff' Sipek wrote: On Sun, Mar 31, 2019 at 17:36:19 +0200, Pierre-Yves David wrote: ... compression: introduce a `storage.revlog.zlib.level` configuration This option control the zlib compression level used when compression revlog chunk. This is also a good excuse t

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-02 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14616. navaneeth.suresh edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6169?vs=14592&id=14616 REVISION DETAIL https://phab.mercurial-scm.org/D6169 AFFECTED FILES hgext

Re: [PATCH 7 of 8 "] compression: introduce an official `zstd-revlog` requirement

2019-04-02 Thread Josef 'Jeff' Sipek
On Sun, Mar 31, 2019 at 17:36:23 +0200, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1553707623 -3600 > # Wed Mar 27 18:27:03 2019 +0100 > # Node ID 2cfe9983fa92313d58f0420ec62f2341a810343e > # Parent 108e26fa0a97fe5342a1ce246cc4e4c185803454 > # EXP-Top

Re: [PATCH 6 of 8 "] compression: introduce an official `format.revlog-compression` option

2019-04-02 Thread Josef 'Jeff' Sipek
On Sun, Mar 31, 2019 at 17:36:22 +0200, Pierre-Yves David wrote: ... > compression: introduce an official `format.revlog-compression` option > > This option superseed the `experiment.format.compression` option. The value s/superseed/supersedes/ :) > currently supported are zlib (default) and zst

Re: [PATCH 3 of 8 "] compression: introduce a `storage.revlog.zlib.level` configuration

2019-04-02 Thread Josef 'Jeff' Sipek
On Sun, Mar 31, 2019 at 17:36:19 +0200, Pierre-Yves David wrote: ... > compression: introduce a `storage.revlog.zlib.level` configuration > > This option control the zlib compression level used when compression revlog > chunk. > > This is also a good excuse to pave the way for a similar configura