Re: [PATCH] match: adding non-recursive directory matching

Hi guys - any comments on the preferred way forward? (I do have a follow-up patch for optimizing visitdir accordingly, but don't want to send it until this one is agreed upon) On Thu, Nov 17, 2016 at 1:19 PM, Rodrigo Damazio wrote: > > > On Thu, Nov 17, 2016 at 7:52 AM,

Re: [PATCH 1 of 2] dispatch: move part of callcatch to scmutil

That's an interesting idea. I happened to be interested in the diff algorithm recently and think they are related. A fundamental problem of the diff algorithm is, it does not track line moves. As long as our diff algorithm cannot do that, I won't do the merge thing manually. Will that kind of

Re: [PATCH 1 of 2] dispatch: move part of callcatch to scmutil

fwiw, it is possible to keep blame for this if you really wanted to. The approach is: 7ef2ebf5cdf91192a66b461ff56f653a65e65dd7->x x: copy scmutil.py -> scmutil_.py 7ef2ebf5cdf91192a66b461ff56f653a65e65dd7->y y: copy dispatch.py-> scmutil_.py delete lines from scmutil_.py x+y->z z: resolve

Re: [PATCH 7 of 8] crecord: change help text for the space key dynamically

Jun Wu wrote: > +_('space: unselect') if selected else _('space: select'), I favor deselect (13million) over unselect (2.5million) -- numbers from Google. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

Re: [PATCH 6 of 8] crecord: rewrite status line text (BC)

Jun Wu wrote: > Select hunks to apply. [x]=selected **=collapsed c: confirm q: abort That's pretty good, but could we use a pipe* before ` [x]`? Possibly omitting the `.`, either as: Select hunks to apply | [x]=selected **=collapsed c: confirm q: abort or Select hunks to apply. |

Re: [PATCH evolve-ext] evolve: improve error message if unstable changes are disallowed

Mateusz Kwapich wrote: > Pulkit wrote: >> +raise error.Abort(_("cannot prune in the middle of a stack\n"\ >> +"new unstable changesets are not allowed")) > This error doesn't have hint - maybe we could use it for that purpose. I should spend some time

Re: [PATCH 01 of 10 layering] dirstateguard: move to new module so I can break some layering violations

Yuya Nishihara wrote: > Is copy-and-remove a preferred way for this kind of refactoring? I have > an unsent patch that splits revset.py, so I want to know which is better. Augie Fackler wrote: > I'd prefer it slightly, because it makes the blame history a little bit more > intact in the long

Re: [PATCH 2 of 2] worker: use os._exit for posix worker in all cases

The previous version is at https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087058.html It's 3 months ago so I didn't mark the current one as V2. I changed the title a bit so whatever automation would handle this correctly. Excerpts from Jun Wu's message of 2016-11-24 01:17:50

[PATCH 2 of 2] worker: use os._exit for posix worker in all cases

# HG changeset patch # User Jun Wu # Date 1479950134 0 # Thu Nov 24 01:15:34 2016 + # Node ID 6c8735bfbf00b224e3f158242e1078d0fe667a42 # Parent c76f0d4bdee6bfbd7bda771d5c05939d1d4cb132 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[Bug 5432] New: record/hunk selector help mention "record" instead of the operation name.

https://bz.mercurial-scm.org/show_bug.cgi?id=5432 Bug ID: 5432 Summary: record/hunk selector help mention "record" instead of the operation name. Product: Mercurial Version: default branch Hardware: PC OS:

Re: [PATCH RESEND] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

On 11/23/2016 04:01 PM, Jun Wu wrote: Excerpts from Martin von Zweigbergk's message of 2016-11-14 15:57:30 -0800: Pierre-Yves reached out and reminded me that he actually frequently uses "hg revert -i -r .~1" to undo changes since that commit. Also, I still personally feel that the people who

Re: [PATCH RESEND] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

On 11/15/2016 09:24 AM, Denis Laxalde wrote: Pierre-Yves David a écrit : We can extract two main points in the section you reply to and I'm not sure which one you address in your reply. I'm going to re-emit them in a simplified/modified form to clarify First important point

[PATCH 7 of 8] crecord: change help text for the space key dynamically

# HG changeset patch # User Jun Wu # Date 1479941166 0 # Wed Nov 23 22:46:06 2016 + # Node ID 18b6dea42fcdf5922926d6a0ab84f09c0cf5bd1a # Parent 9e7850a8ae79f7ccf1855a489d42d66dc1d949db # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 8 of 8] crecord: change the verb according to the operation

# HG changeset patch # User Jun Wu # Date 1479942213 0 # Wed Nov 23 23:03:33 2016 + # Node ID a25fb0c50bc0ad20511621d15e1cc7c6478528c1 # Parent 18b6dea42fcdf5922926d6a0ab84f09c0cf5bd1a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 5 of 8] crecord: make _getstatuslines update numstatuslines

# HG changeset patch # User Jun Wu # Date 1479939795 0 # Wed Nov 23 22:23:15 2016 + # Node ID d84ab5920899a914a225319130937befc6402d8a # Parent 5894c146af1e3154f7b327dce54a779bb419811a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 6 of 8] crecord: rewrite status line text (BC)

# HG changeset patch # User Jun Wu # Date 1479940063 0 # Wed Nov 23 22:27:43 2016 + # Node ID 9e7850a8ae79f7ccf1855a489d42d66dc1d949db # Parent d84ab5920899a914a225319130937befc6402d8a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 2 of 8] revert: pass operation to crecord

# HG changeset patch # User Jun Wu # Date 1479927804 0 # Wed Nov 23 19:03:24 2016 + # Node ID d4c7651935165820d8bfe363c8cae95e0192af1f # Parent c1aa248a8bc0fac647a1f849ed25c31291edce64 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 3 of 8] crecord: filter text via i18n

# HG changeset patch # User Jun Wu # Date 1479924791 0 # Wed Nov 23 18:13:11 2016 + # Node ID ed629f77d3616013c8216d99e90e02c47eccdb4f # Parent d4c7651935165820d8bfe363c8cae95e0192af1f # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH] posix: _really_ make sure .hg/cache/checklink points at a real file

On 11/24/2016 12:15 AM, Mads Kiilerich wrote: On 11/23/2016 11:24 PM, Pierre-Yves David wrote: On 11/23/2016 11:09 PM, Mads Kiilerich wrote: # HG changeset patch # User Mads Kiilerich # Date 1479938505 -3600 # Wed Nov 23 23:01:45 2016 +0100 # Node ID

Re: [PATCH] posix: _really_ make sure .hg/cache/checklink points at a real file

On 11/23/2016 11:24 PM, Pierre-Yves David wrote: On 11/23/2016 11:09 PM, Mads Kiilerich wrote: # HG changeset patch # User Mads Kiilerich # Date 1479938505 -3600 # Wed Nov 23 23:01:45 2016 +0100 # Node ID 2841e0a6f97ba09dff5ffe7f42ac8c6e1b23338f # Parent

[PATCH shelve-ext v2] shelve: make --keep option survive user intevention (issue5431)

# HG changeset patch # User Kostia Balytskyi # Date 1479941932 28800 # Wed Nov 23 14:58:52 2016 -0800 # Node ID 00a022e44b62cb9340dfac94096b14f77407cefb # Parent db897ddf3a8ebb8df9556ce97de11f6380a9ef0b shelve: make --keep option survive user intevention (issue5431)

[PATCH] merge: use original file extension for temporary files

# HG changeset patch # User Mads Kiilerich # Date 1479941258 -3600 # Wed Nov 23 23:47:38 2016 +0100 # Node ID 9cee175ec5a6e2530190a120244c0d210c469dd8 # Parent b3808b2f2e8758f5c763344ce4b81dcf723028ae merge: use original file extension for temporary files Some merge

Re: [PATCH shelve-ext] shelve: make --keep option survive user intevention (issue5431)

One less footgun in unshelve. Nice! Excerpts from Kostia Balytskyi's message of 2016-11-23 10:51:47 -0800: > diff --git a/hgext/shelve.py b/hgext/shelve.py > --- a/hgext/shelve.py > +++ b/hgext/shelve.py > @@ -782,6 +787,7 @@ def _dounshelve(ui, repo, *shelved, **op > > try: >

[PATCH shelve-ext] shelve: make --keep option survive user intevention (issue5431)

# HG changeset patch # User Kostia Balytskyi # Date 1479926825 28800 # Wed Nov 23 10:47:05 2016 -0800 # Node ID 90b1e0d3e7daaf489428e0b9028cd7b32f37ea70 # Parent db897ddf3a8ebb8df9556ce97de11f6380a9ef0b shelve: make --keep option survive user intevention (issue5431)

Re: [PATCH 08 of 10] repair: migrate revlogs during upgrade

> On Nov 23, 2016, at 10:36 AM, Pierre-Yves David > wrote: > > Silly idea: We could add a "requirement" to the repository while doing this. > So that reading client would just be rejected (in most case) with a proper > message while this happens. I like it.

[PATCH v2] censor: flag internal documentation

# HG changeset patch # User Remi Chaintron # Date 1479922595 0 # Wed Nov 23 17:36:35 2016 + # Branch stable # Node ID 24bcb76c5e6633e740f7dcec8f1ca96b06bcc536 # Parent 819f96b82fa4c4c6d07840a2b180d112b524103f censor: flag internal documentation diff --git

[PATCH 5 of 5 v4] changegroup3: enable on 'lfs' repo requirements

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID b421c16161aed491fec20b600df5f1278b07bc1a # Parent 75ee4746c198f039a39400e855e9335afc34f1dd changegroup3: enable on 'lfs' repo requirements `changegroup3`

[PATCH 1 of 5 v4] revlog: merge hash checking subfunctions

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID e908dd63d485424df4c4a4482b742d82652e2893 # Parent 24bcb76c5e6633e740f7dcec8f1ca96b06bcc536 revlog: merge hash checking subfunctions This patch factors the

[PATCH 2 of 5 v4] revlog: add flagprocessor

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID eb24cc60a279d614b3181a84464200bbcf5f6bb4 # Parent e908dd63d485424df4c4a4482b742d82652e2893 revlog: add flagprocessor Add a mechanism for

[PATCH 4 of 5 v4] revlog: REVIDX_ISLARGEFILE flag

# HG changeset patch # User Remi Chaintron # Date 1479922644 0 # Wed Nov 23 17:37:24 2016 + # Branch stable # Node ID 75ee4746c198f039a39400e855e9335afc34f1dd # Parent da91f91e979d6bf807912e956cf2f29573ede56f revlog: REVIDX_ISLARGEFILE flag Add the REVIDX_ISLARGEFILE flag

Re: [PATCH 8 of 8 chgtocore] chgserver: make it a core module and drop extension flags

On 11/23/2016 04:33 PM, Jun Wu wrote: This series look good to me. Thanks for the clean up! I'll continue my chg work on top of this. This looks great, I've pushed it. Thanks Jun for the review, this significantly lowered the latency of my review. Cheers, Excerpts from Yuya

Re: [PATCH] censor: flag internal documentation

On 11/23/2016 04:43 PM, Remi Chaintron wrote: # HG changeset patch # User Remi Chaintron # Date 1479915779 0 # Wed Nov 23 15:42:59 2016 + # Branch stable # Node ID f9ec5cd22586138cdcf5cfebc88f1bcba41a2a20 # Parent 819f96b82fa4c4c6d07840a2b180d112b524103f censor: flag

Re: [PATCH 1 of 2] debugcommands: introduce standalone module for debug commands

On 11/10/2016 06:50 PM, Gregory Szorc wrote: I started this series a few months ago, told Pierre-Yves about it, and he encouraged me to start patchbombing. While I haven't completed the work, the remainder of what I've started can be pulled from

Re: Fixing .hg file open ordering

Yep, your reasoning here makes sense. While I'm glad that you discovered after some investigation that we're doing the right thing already, it's a little troubling that this wasn't easy to understand from reading the code, and that (from my interpretation of what you wrote) you had to think and

Re: [PATCH 03 of 10] commands: stub for debugupgraderepo command

On 11/22/2016 06:15 AM, Gregory Szorc wrote: On Mon, Nov 21, 2016 at 6:05 PM, Pierre-Yves David > wrote: On 11/06/2016 05:40 AM, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc

[PATCH 3 of 5 v3] revlog: pass flags to addrevision

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID 2b21a1071ab3003f9ce145620e0e888d41742b80 # Parent f45a31268675da806e7f9569b569aec8fefb29d5 revlog: pass flags to addrevision Add the ability to pass known

[PATCH 5 of 5 v3] changegroup3: enable on 'lfs' repo requirements

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID ee76def8400e7003daca04dd0985af77cc925348 # Parent 1d0b60b267fabedc683bd53a880abc0b8e75badb changegroup3: enable on 'lfs' repo requirements `changegroup3`

[PATCH 4 of 5 v3] revlog: REVIDX_ISLARGEFILE flag

# HG changeset patch # User Remi Chaintron # Date 1479917845 0 # Wed Nov 23 16:17:25 2016 + # Branch stable # Node ID 1d0b60b267fabedc683bd53a880abc0b8e75badb # Parent 2b21a1071ab3003f9ce145620e0e888d41742b80 revlog: REVIDX_ISLARGEFILE flag Add the REVIDX_ISLARGEFILE flag

[PATCH 2 of 5 v3] revlog: add flagprocessor

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID f45a31268675da806e7f9569b569aec8fefb29d5 # Parent fe4fefc6aba95f613dba4ebff3abd38205fdd74f revlog: add flagprocessor Add a mechanism for

[PATCH 1 of 5 v3] revlog: merge hash checking subfunctions

# HG changeset patch # User Remi Chaintron # Date 1479916365 0 # Wed Nov 23 15:52:45 2016 + # Branch stable # Node ID fe4fefc6aba95f613dba4ebff3abd38205fdd74f # Parent f9ec5cd22586138cdcf5cfebc88f1bcba41a2a20 revlog: merge hash checking subfunctions This patch factors the

Re: [PATCH evolve-ext] evolve: improve error message if unstable changes are disallowed

Excerpts from Pulkit Goyal's message of 2016-11-23 21:06:29 +0530: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1479915042 -19800 > # Wed Nov 23 21:00:42 2016 +0530 > # Node ID 32083f1f0c67341e5b4c22e880b70ccc4e0fc088 > # Parent

Re: [PATCH 01 of 10 layering] dirstateguard: move to new module so I can break some layering violations

> On Nov 22, 2016, at 09:09, Yuya Nishihara wrote: > > On Mon, 21 Nov 2016 22:05:16 -0500, Augie Fackler wrote: >> # HG changeset patch >> # User Augie Fackler >> # Date 1479781772 18000 >> # Mon Nov 21 21:29:32 2016 -0500 >> # Node ID

Re: Can we automatically recognize when we should be fulfilling our deprecation promsie?

> On Nov 22, 2016, at 23:35, timeless wrote: > > Augie Fackler wrote: >> We said we'd delete this after 3.8. It's time. >> -ui.deprecwarn("missing attribute '%s', use @command decorator " >> - "to register '%s'" % (attr, cmd), '3.8') > > It

Re: [PATCH 04 of 10] repair: identify repository deficiencies

On 11/22/2016 07:02 AM, Gregory Szorc wrote: On Mon, Nov 21, 2016 at 6:14 PM, Pierre-Yves David > wrote: On 11/06/2016 05:40 AM, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc

Re: [PATCH 2 of 2 V2] rebase: calculate ancestors for --base separately (issue5420)

On 11/19/2016 02:40 AM, Augie Fackler wrote: On Thu, Nov 17, 2016 at 11:49:58PM +, Jun Wu wrote: # HG changeset patch # User Jun Wu # Date 1479426495 0 # Thu Nov 17 23:48:15 2016 + # Node ID e5451a607d1ca53b2446ab049375e5dd5a055bb8 # Parent

Re: [PATCH 10 of 10] repair: clean up stale lock file from store backup

On 11/22/2016 04:09 AM, Augie Fackler wrote: On Nov 21, 2016, at 9:27 PM, Pierre-Yves David wrote: On 11/06/2016 05:40 AM, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1478392394 25200 # Sat Nov 05

[PATCH] censor: flag internal documentation

# HG changeset patch # User Remi Chaintron # Date 1479915779 0 # Wed Nov 23 15:42:59 2016 + # Branch stable # Node ID f9ec5cd22586138cdcf5cfebc88f1bcba41a2a20 # Parent 819f96b82fa4c4c6d07840a2b180d112b524103f censor: flag internal documentation diff --git

Re: [PATCH] help: clarify contents of revlog index

On 11/23/2016 03:13 AM, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1479867182 28800 # Tue Nov 22 18:13:02 2016 -0800 # Node ID 96679cda009dfad247dc50013165d08093dc2737 # Parent 01d8600955ccbc8cd53db2c1613ec7c3f7913ee2 help: clarify

[PATCH evolve-ext] evolve: improve error message if unstable changes are disallowed

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1479915042 -19800 # Wed Nov 23 21:00:42 2016 +0530 # Node ID 32083f1f0c67341e5b4c22e880b70ccc4e0fc088 # Parent cb2bac3253fbd52894ffcb4719a148fe6a3da38b evolve: improve error message if unstable changes are disallowed I

Re: [PATCH 08 of 10] repair: migrate revlogs during upgrade

On 11/06/2016 05:40 AM, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1478393405 25200 # Sat Nov 05 17:50:05 2016 -0700 # Node ID d2261c558ca9639fb81c182de15d75151cbad0f9 # Parent 958bcf2577608bbb6d8ae078cde0ca451f3ab31a repair: migrate

Re: [PATCH 8 of 8 chgtocore] chgserver: make it a core module and drop extension flags

This series look good to me. Thanks for the clean up! I'll continue my chg work on top of this. Excerpts from Yuya Nishihara's message of 2016-11-23 01:00:01 +0900: > # HG changeset patch > # User Yuya Nishihara > # Date 1476509416 -32400 > # Sat Oct 15 14:30:16 2016 +0900 >

Re: [PATCH 1 of 3 V2] cmdutil: add support for evolution "troubles" display in changeset_printer

On 11/16/2016 03:42 PM, Kevin Bullock wrote: On Nov 10, 2016, at 09:47, Pierre-Yves David wrote: On 11/08/2016 04:07 PM, Augie Fackler wrote: I'm -0 on the word "troubles": it feels wrong in a way I'm having trouble describing. It definitely feels odd to

Re: [PATCH 1 of 3 V2] cmdutil: add support for evolution "troubles" display in changeset_printer

On 11/14/2016 09:10 AM, Denis Laxalde wrote: Pierre-Yves David a écrit : How about "stability"? If it feels strange to only have it displayed when there are "troubles", we may also insert it in the debug section as `stability: stable`. I do not think it is suitable, stability does not

Re: [PATCH RESEND] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

Excerpts from Martin von Zweigbergk's message of 2016-11-14 15:57:30 -0800: > Pierre-Yves reached out and reminded me that he actually frequently > uses "hg revert -i -r .~1" to undo changes since that commit. Also, I > still personally feel that the people who want to undo changes since a >