Re: [PATCH 10 of 13 V3] config: list environment variables in debug output

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Mar 22, 2017 at 10:23 AM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489455351 25200 > # Mon Mar 13 18:35:51 2017 -0700 > # Node ID fa6d527d03e29efc75591e1721ddcbd6b72e4a76 > # Parent 6c04717d3b4958800a39fdf6e2c28e2caf6629bd > #

Re: [PATCH 09 of 13 V3] ui: use scmutil.rccomponents to load configs (BC)

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Mar 22, 2017 at 10:23 AM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489462886 25200 > # Mon Mar 13 20:41:26 2017 -0700 > # Node ID 6c04717d3b4958800a39fdf6e2c28e2caf6629bd > # Parent c537d04829a8dc0b88fe03ec41e95a85638c696b > #

Re: [PATCH 07 of 13 V3] scmutil: extract rc.d listing function from rccomponents

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Mar 22, 2017 at 10:23 AM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1490201429 25200 > # Wed Mar 22 09:50:29 2017 -0700 > # Node ID d604e5baed4ac2f5470860bff89728c282d71e3a > # Parent 44c865487bfd2f081bfb322b1fb1b700d57f7adf > #

Re: [PATCH 01 of 13 V3] scmutil: add a method to convert environment variables to config items

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Mar 22, 2017 at 10:23 AM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489449998 25200 > # Mon Mar 13 17:06:38 2017 -0700 > # Node ID 04259bd73d263306f16e25bd4e6bc53faf80911c > # Parent 55c6788c54e2faf80ec14f2b0844bfe429012bc3 > #

[PATCH] help: format ``commands`` heading correctly

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1490225813 25200 # Wed Mar 22 16:36:53 2017 -0700 # Node ID cd99f61579194767aaa958a29d8de88e639d1578 # Parent 55c6788c54e2faf80ec14f2b0844bfe429012bc3 help: format ``commands`` heading correctly The number of

mercurial@31573: 9 new changesets

2017-03-22 Thread Mercurial Commits
9 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/553ad16b274f changeset: 31565:553ad16b274f user:Augie Fackler date:Sun Mar 19 01:03:53 2017 -0400 summary: revsetlang: portably turn int into bytestring

Re: [PATCH 4 of 4 V2] obsolete: allow cycles

2017-03-22 Thread Sean Farley
Jun Wu writes: > Excerpts from Sean Farley's message of 2017-03-22 13:18:29 -0700: >> Heh, yes, that made me chuckle. I understand that *you* need this. > > I'd argue *most people* wants this. See below. > >> But that's the thing. I'm not taking "inhibit" into consideration >>

Re: [PATCH 4 of 4 V2] obsolete: allow cycles

2017-03-22 Thread Jun Wu
Excerpts from Sean Farley's message of 2017-03-22 13:18:29 -0700: > Heh, yes, that made me chuckle. I understand that *you* need this. I'd argue *most people* wants this. See below. > But that's the thing. I'm not taking "inhibit" into consideration > because inhibit isn't a common workflow.

Re: [PATCH] convert: Fix the handling of empty changlist descriptions in P4

2017-03-22 Thread Sean Farley
David Soria Parra writes: > # HG changeset patch > # User David Soria Parra > # Date 1490209978 18000 > # Wed Mar 22 14:12:58 2017 -0500 > # Node ID ff24a4168c2f05fd367b0b126e52559ef89af77f > # Parent 102f291807c92864a2231e5e925d6cd64783bb59 > convert: Fix

Re: [PATCH V2] merge: add `internal:dumpjson` tool to `resolve`, which outputs conflict state

2017-03-22 Thread Phillip Cohen
> It doesn't make sense to use the formatter to dump a single object. Perhaps > formatter._jsonifyobj() can be a public utility function. That's a good idea. If there are no objections I'll send that out, either as the first change in the next version or a isolated change (probably the former so

[PATCH] convert: Fix the handling of empty changlist descriptions in P4

2017-03-22 Thread David Soria Parra
# HG changeset patch # User David Soria Parra # Date 1490209978 18000 # Wed Mar 22 14:12:58 2017 -0500 # Node ID ff24a4168c2f05fd367b0b126e52559ef89af77f # Parent 102f291807c92864a2231e5e925d6cd64783bb59 convert: Fix the handling of empty changlist descriptions in P4 Empty

[PATCH 10 of 13 V3] config: list environment variables in debug output

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489455351 25200 # Mon Mar 13 18:35:51 2017 -0700 # Node ID fa6d527d03e29efc75591e1721ddcbd6b72e4a76 # Parent 6c04717d3b4958800a39fdf6e2c28e2caf6629bd # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 09 of 13 V3] ui: use scmutil.rccomponents to load configs (BC)

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489462886 25200 # Mon Mar 13 20:41:26 2017 -0700 # Node ID 6c04717d3b4958800a39fdf6e2c28e2caf6629bd # Parent c537d04829a8dc0b88fe03ec41e95a85638c696b # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 08 of 13 V3] run-tests: drop environment variables affecting configs

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489455061 25200 # Mon Mar 13 18:31:01 2017 -0700 # Node ID c537d04829a8dc0b88fe03ec41e95a85638c696b # Parent d604e5baed4ac2f5470860bff89728c282d71e3a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 02 of 13 V3] scmutil: define a list of configs overriding system rc, but not users

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489450537 25200 # Mon Mar 13 17:15:37 2017 -0700 # Node ID 61757ff29df4a35351fd31568a14e0880dd5c2d4 # Parent 04259bd73d263306f16e25bd4e6bc53faf80911c # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 06 of 13 V3] scmutil: implement rccomponents to return multiple config sources

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1490201209 25200 # Wed Mar 22 09:46:49 2017 -0700 # Node ID 44c865487bfd2f081bfb322b1fb1b700d57f7adf # Parent 0e0f8914507fc0030d66844bde77854266259603 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 01 of 13 V3] scmutil: add a method to convert environment variables to config items

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489449998 25200 # Mon Mar 13 17:06:38 2017 -0700 # Node ID 04259bd73d263306f16e25bd4e6bc53faf80911c # Parent 55c6788c54e2faf80ec14f2b0844bfe429012bc3 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH] doc: fix short underline which causes make -C doc to fail

2017-03-22 Thread Ryan McElroy
On 3/22/17 3:59 PM, Kostia Balytskyi wrote: # HG changeset patch # User Kostia Balytskyi # Date 1490198110 25200 # Wed Mar 22 08:55:10 2017 -0700 # Node ID 86383b66465bd7122bb5380047c6e87c888d8227 # Parent f808c796dfd2c6e4e6990c73a838320512aafeca doc: fix short underline

Re: [PATCH] checkheads: extract obsolete post processing in its own function

2017-03-22 Thread Pierre-Yves David
On 03/22/2017 11:04 AM, Ryan McElroy wrote: On 3/21/17 10:42 PM, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1490135413 -3600 # Tue Mar 21 23:30:13 2017 +0100 # Node ID 787354f0d60eccda66ba0de4db8e6e47897acc7c # Parent

[PATCH] doc: fix short underline which causes make -C doc to fail

2017-03-22 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1490198110 25200 # Wed Mar 22 08:55:10 2017 -0700 # Node ID 86383b66465bd7122bb5380047c6e87c888d8227 # Parent f808c796dfd2c6e4e6990c73a838320512aafeca doc: fix short underline which causes make -C doc to fail

Re: [PATCH 01 of 11 V2] scmutil: add a method to convert environment variables to config items

2017-03-22 Thread Jun Wu
Excerpts from Ryan McElroy's message of 2017-03-22 11:16:40 +: > This function is fine, but scmutil feels like the wrong place for it. > Why is it not in config.py? > > This same question applies to patches 2-5 as well. I seems like most of > this should be living in config.py. > > We can

Re: [PATCH 1 of 2] update: ignore commands.update.requiredest if HGPLAIN=1

2017-03-22 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Mar 22, 2017 at 8:33 AM, Martin von Zweigbergk wrote: > On Wed, Mar 22, 2017 at 6:09 AM, Yuya Nishihara wrote: >> On Tue, 21 Mar 2017 21:27:20 -0700, Martin von Zweigbergk via >> Mercurial-devel wrote: >>> # HG changeset patch >>> # User Martin von

Re: [PATCH 2 of 2 V2] show: new extension for displaying various repository data

2017-03-22 Thread Yuya Nishihara
On Tue, 21 Mar 2017 23:52:42 -0700, Gregory Szorc wrote: > On Tue, Mar 21, 2017 at 11:49 PM, Gregory Szorc > wrote: > > > # HG changeset patch > > # User Gregory Szorc > > # Date 1490165337 25200 > > # Tue Mar 21 23:48:57 2017 -0700 > > #

Re: [PATCH 1 of 2 V2] formatter: reserve _ prefixed keys as internal and don't render

2017-03-22 Thread Yuya Nishihara
On Tue, 21 Mar 2017 23:49:25 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1490164306 25200 > # Tue Mar 21 23:31:46 2017 -0700 > # Node ID ae796e23fd42b036352b298f570af8949c2db2d9 > # Parent

[PATCH] findrenames: sort files not by object id but by path for stable result

2017-03-22 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1426413536 -32400 # Sun Mar 15 18:58:56 2015 +0900 # Node ID 425379e72e817b6c79e955173b015b9a0fe090e9 # Parent 102f291807c92864a2231e5e925d6cd64783bb59 findrenames: sort files not by object id but by path for stable result It

Re: [PATCH] show: new extension for displaying various repository data

2017-03-22 Thread Ryan McElroy
On 3/22/17 7:29 AM, Sean Farley wrote: Yuya Nishihara writes: On Sun, 12 Mar 2017 21:38:00 -0700, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1489378362 25200 # Sun Mar 12 21:12:42 2017 -0700 # Node ID

Re: [PATCH 11 of 11 V2] pager: do not read from environment variable

2017-03-22 Thread Ryan McElroy
On 3/22/17 7:51 AM, Jun Wu wrote: # HG changeset patch # User Jun Wu # Date 1489456112 25200 # Mon Mar 13 18:48:32 2017 -0700 # Node ID d2b34be3b64a6ca60644576b806e5b7172d524cc # Parent 713d562d0a2426c8658675a66158e6c412ae9dcc pager: do not read from environment variable

Re: [PATCH 08 of 11 V2] config: list environment variables in debug output

2017-03-22 Thread Ryan McElroy
On 3/22/17 7:50 AM, Jun Wu wrote: # HG changeset patch # User Jun Wu # Date 1489455351 25200 # Mon Mar 13 18:35:51 2017 -0700 # Node ID 23b2b1ed59763e5e676f06a4ac4f6bf567874220 # Parent add83f47bf3a51edbd58aa0fb6e571d186bdae6e # Available At

Re: [PATCH 01 of 11 V2] scmutil: add a method to convert environment variables to config items

2017-03-22 Thread Ryan McElroy
On 3/22/17 7:50 AM, Jun Wu wrote: # HG changeset patch # User Jun Wu # Date 1489449998 25200 # Mon Mar 13 17:06:38 2017 -0700 # Node ID fa1618118c0603dafd8b7afbeab0e95f3e4307b0 # Parent 102f291807c92864a2231e5e925d6cd64783bb59 # Available At

Re: [PATCH] fancyopts: making config defaults actually override defaults

2017-03-22 Thread Ryan McElroy
Rodrigo: for some reason, patchwork thinks you are Martin. Any idea why? https://patchwork.mercurial-scm.org/patch/19133/ On 3/14/17 10:16 PM, Rodrigo Damazio via Mercurial-devel wrote: On Tue, Mar 14, 2017 at 12:50 PM, David Soria Parra

[PATCH 7 of 7 V3] hgweb: expose a followlines UI in filerevision view (RFC)

2017-03-22 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1489594320 -3600 # Wed Mar 15 17:12:00 2017 +0100 # Node ID cb742fcfe0edb2d393b59674c4eebcf8775ecfe1 # Parent 9e3ae74c1ca558f0584067c62835bec82034c245 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 4 of 7 V3] hgweb: handle a "linerange" request parameter in filelog command

2017-03-22 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1484844060 -3600 # Thu Jan 19 17:41:00 2017 +0100 # Node ID 1fb2e7f3ed38dc79379cccb04133e745fd5825fa # Parent b93ba42f47ac861922b483ce9870fbe6a5cc412c # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 6 of 7 V3] hgweb: filter diff hunks when 'linerange' and 'patch' are specified in filelog

2017-03-22 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1489414640 -3600 # Mon Mar 13 15:17:20 2017 +0100 # Node ID 9e3ae74c1ca558f0584067c62835bec82034c245 # Parent 18d413236b1670c476584c4a6d6e103639ae7996 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 5 of 7 V3] hgweb: add a 'linerange' parameter to webutil.diffs()

2017-03-22 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1489414549 -3600 # Mon Mar 13 15:15:49 2017 +0100 # Node ID 18d413236b1670c476584c4a6d6e103639ae7996 # Parent 1fb2e7f3ed38dc79379cccb04133e745fd5825fa # Available At http://hg.logilab.org/users/dlaxalde/hg #

Re: [PATCH 7 of 7] tests: add a test case verifying that mq respects --no-git option

2017-03-22 Thread Ryan McElroy
FYI, there's a discussion going on about the "correct" behavior on the issue tracker: https://bz.mercurial-scm.org/show_bug.cgi?id=5510 On 3/21/17 8:30 PM, Ryan McElroy wrote: Overall this series looks good to me, except for this last patch. See inline comments. For now, I'd take the rest of

Re: [PATCH] checkheads: extract obsolete post processing in its own function

2017-03-22 Thread Ryan McElroy
On 3/21/17 10:42 PM, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1490135413 -3600 # Tue Mar 21 23:30:13 2017 +0100 # Node ID 787354f0d60eccda66ba0de4db8e6e47897acc7c # Parent 66c3ae6d886cae0e3a3cff6a0058e2d2a866fd9d #

[PATCH 10 of 11 V2] ui: simplify geteditor

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489456194 25200 # Mon Mar 13 18:49:54 2017 -0700 # Node ID 713d562d0a2426c8658675a66158e6c412ae9dcc # Parent 9f90c479585c75ece920043c220093058d968b97 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 08 of 11 V2] config: list environment variables in debug output

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489455351 25200 # Mon Mar 13 18:35:51 2017 -0700 # Node ID 23b2b1ed59763e5e676f06a4ac4f6bf567874220 # Parent add83f47bf3a51edbd58aa0fb6e571d186bdae6e # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 06 of 11 V2] run-tests: drop environment variables affecting configs

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489455061 25200 # Mon Mar 13 18:31:01 2017 -0700 # Node ID df768455486ff51b4047fd3a8dfbef158516d2aa # Parent c18d9f3e0dac6d1676bd58617477c64953be96a3 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 03 of 11 V2] scmutil: split osrcpath to return default.d paths

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1490165660 25200 # Tue Mar 21 23:54:20 2017 -0700 # Node ID 7775943a59cfaaae77e2143cbfa0bf0d8d95a447 # Parent 5de0f85888f87c705bcbc38d3e92e97b7e23d1d9 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 04 of 11 V2] scmutil: add a rcpath-like method to return multiple config sources

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489452890 25200 # Mon Mar 13 17:54:50 2017 -0700 # Node ID 75f661b31640a914dd513d42b2ce1389c9b61c0a # Parent 7775943a59cfaaae77e2143cbfa0bf0d8d95a447 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 01 of 11 V2] scmutil: add a method to convert environment variables to config items

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489449998 25200 # Mon Mar 13 17:06:38 2017 -0700 # Node ID fa1618118c0603dafd8b7afbeab0e95f3e4307b0 # Parent 102f291807c92864a2231e5e925d6cd64783bb59 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 02 of 11 V2] scmutil: define a list of configs overriding system rc, but not users

2017-03-22 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489450537 25200 # Mon Mar 13 17:15:37 2017 -0700 # Node ID 5de0f85888f87c705bcbc38d3e92e97b7e23d1d9 # Parent fa1618118c0603dafd8b7afbeab0e95f3e4307b0 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH 2 of 2 V2] show: new extension for displaying various repository data

2017-03-22 Thread Gregory Szorc
On Tue, Mar 21, 2017 at 11:49 PM, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1490165337 25200 > # Tue Mar 21 23:48:57 2017 -0700 > # Node ID 80ca2bee4a06887f918e3328b3f005e4c1cb1ab1 > # Parent

[PATCH 2 of 2 V2] show: new extension for displaying various repository data

2017-03-22 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1490165337 25200 # Tue Mar 21 23:48:57 2017 -0700 # Node ID 80ca2bee4a06887f918e3328b3f005e4c1cb1ab1 # Parent ae796e23fd42b036352b298f570af8949c2db2d9 show: new extension for displaying various repository data

[PATCH 1 of 2 V2] formatter: reserve _ prefixed keys as internal and don't render

2017-03-22 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1490164306 25200 # Tue Mar 21 23:31:46 2017 -0700 # Node ID ae796e23fd42b036352b298f570af8949c2db2d9 # Parent 102f291807c92864a2231e5e925d6cd64783bb59 formatter: reserve _ prefixed keys as internal and don't render

Re: [PATCH] show: new extension for displaying various repository data

2017-03-22 Thread Gregory Szorc
On Mon, Mar 13, 2017 at 7:21 PM, Yuya Nishihara wrote: > On Sun, 12 Mar 2017 21:38:00 -0700, Gregory Szorc wrote: > > # HG changeset patch > > # User Gregory Szorc > > # Date 1489378362 25200 > > # Sun Mar 12 21:12:42 2017 -0700 > > # Node ID

Re: [PATCH 4 of 4 V2] obsolete: allow cycles

2017-03-22 Thread Jun Wu
Excerpts from Jun Wu's message of 2017-03-21 22:42:11 -0700: > The key here is the order of operation 2 and 3. If 2 happens after 3, then B > gets hidden as expected. Currently, this cycle will get both B and C hidden, > which I don't think is a sane behavior. Sorry. It should be "Currently, 3 is

Re: [PATCH 3 of 4 py3 V2] pycompat: custom implementation of urllib.parse.quote()

2017-03-22 Thread Gregory Szorc
On Tue, Mar 14, 2017 at 1:43 AM, Yuya Nishihara wrote: > On Mon, 13 Mar 2017 13:08:51 -0700, Gregory Szorc wrote: > > # HG changeset patch > > # User Gregory Szorc > > # Date 1489432607 25200 > > # Mon Mar 13 12:16:47 2017 -0700 > > # Node ID