Re: [PATCH 2 of 2 STABLE] registrar: host "dynamicdefault" constant by configitem object

2017-10-23 Thread Boris Feld
On Sat, 2017-10-21 at 14:16 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1508559200 -32400 > #  Sat Oct 21 13:13:20 2017 +0900 > # Branch stable > # Node ID dc05c59e3f1714c4faceb4c1eed66a5afe0ec000 > # Parent  3600f7eaed2124e575af498043c6401233b8b2ba > r

Re: [PATCH 01 of 15] pull: store binary node in pullop.remotebookmarks

2017-10-23 Thread Boris Feld
On Wed, 2017-10-18 at 19:25 +0200, Gregory Szorc wrote: > On Wed, Oct 18, 2017 at 6:09 PM, Boris Feld > wrote: > > # HG changeset patch > > # User Boris Feld > > # Date 1508230905 -7200 > > #      Tue Oct 17 11:01:45 2017 +0200 > > # Node ID a450dc69ef95073af4d4ece34e251ed0bb5b808f > > # Parent 

D868: changelog: use attrs instead of namedtuple

2017-10-23 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. We detected a small performance regression on this changeset thanks to our ASV instance: http://perf.octobus.net/#regressions?sort=3&dir=desc (look for https://phab.mercurial-scm.org/rHGe51c8ffa1ffa3524e01cd1d1f60c79fc5ef02e43). It seems to have slow down eno

D868: changelog: use attrs instead of namedtuple

2017-10-23 Thread durin42 (Augie Fackler)
durin42 added a comment. @lothiraldan you very much buried the lede here (lots of data about things that didn't change, but no inline data on what didn't). The regressions appear to be: basic_commands.TimeTestSuite.time_id_current('mercurial-2017') 43.922ms -> 46.190ms basic_commands.

D868: changelog: use attrs instead of namedtuple

2017-10-23 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. The perf difference is not big, but I'm not sure if it's due to the import time of attrs because basic_commands.TimeTestSuite.time_version didn't change much. I have the impression that we pay a cost the first time an attrs-based class is instantiated. I've

[PATCH] commands: be more uniform in an "hg update" error message

2017-10-23 Thread muxator via Mercurial-devel
# HG changeset patch # User muxator # Date 1508791524 -7200 # Mon Oct 23 22:45:24 2017 +0200 # Branch stable # Node ID a0d216dad0347ceb0d29a3506b4c63a0a37df8b9 # Parent 83a8eaeba37151821781becdf285501ebf065695 commands: be more uniform in an "hg update" error message "can only specify one o

[PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread muxator via Mercurial-devel
# HG changeset patch # User muxator # Date 1507152154 -7200 # Wed Oct 04 23:22:34 2017 +0200 # Branch stable # Node ID 83a8eaeba37151821781becdf285501ebf065695 # Parent 780d13a58b332b3d18595af698eed1190fbe971e update: in the description update() in merge.py, mention the long options explici

Re: [PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread Kevin Bullock
> On Oct 23, 2017, at 16:07, muxator via Mercurial-devel > wrote: > > # HG changeset patch > # User muxator > # Date 1507152154 -7200 > # Wed Oct 04 23:22:34 2017 +0200 > # Branch stable > # Node ID 83a8eaeba37151821781becdf285501ebf065695 > # Parent 780d13a58b332b3d18595af698eed1190fbe97

Re: [PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread muxator via Mercurial-devel
no problem at all! On 10/23/2017 11:56 PM, Kevin Bullock wrote: On Oct 23, 2017, at 16:07, muxator via Mercurial-devel wrote: # HG changeset patch # User muxator # Date 1507152154 -7200 # Wed Oct 04 23:22:34 2017 +0200 # Branch stable # Node ID 83a8eaeba37151821781becdf285501ebf065695

[Bug 5716] New: severe perf regression in hg update because of path conflict checking code

2017-10-23 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5716 Bug ID: 5716 Summary: severe perf regression in hg update because of path conflict checking code Product: Mercurial Version: 4.4-rc Hardware: All OS: All

D1223: merge: disable path conflict checking by default (issue5716)

2017-10-23 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We shouldn't ship a severe perf regression in hg update for 4.4. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES m

D1222: merge: add a config option to disable path conflict checking

2017-10-23 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We've found a severe perf regression in `hg update` caused by the path conflict checking code. The next patch will disable this by default. REPOSITORY rHG Mercuri

[Bug 5717] New: static-http test fails on Windows with dirstatemap

2017-10-23 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5717 Bug ID: 5717 Summary: static-http test fails on Windows with dirstatemap Product: Mercurial Version: 4.4-rc Hardware: PC OS: Windows Status: UNCONFIRMED Se

[Bug 5718] New: Filemerge crashes with an external Windows tool

2017-10-23 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5718 Bug ID: 5718 Summary: Filemerge crashes with an external Windows tool Product: Mercurial Version: 4.4-rc Hardware: PC OS: Windows Status: UNCONFIRMED Sever

D1223: merge: disable path conflict checking by default (issue5716)

2017-10-23 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 3075. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1223?vs=3074&id=3075 REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES mercurial/configitems.py tests/test-audit-path.t tests/test-commandser

[PATCH 2 of 2 STABLE] setup: filter out devel-warn messages from system hg

2017-10-23 Thread Kevin Bullock
# HG changeset patch # User Kevin Bullock # Date 1508814839 18000 # Mon Oct 23 22:13:59 2017 -0500 # Branch stable # Node ID adc50614340e952d8e98f5948d35b7bf632c2232 # Parent f13a8d056d6ebf490e65096391fdcd5916197f48 setup: filter out devel-warn messages from system hg If we're going to use

[PATCH 1 of 2 STABLE] setup: remove duplicate assignment of HGRCPATH

2017-10-23 Thread Kevin Bullock
# HG changeset patch # User Kevin Bullock # Date 1508812259 18000 # Mon Oct 23 21:30:59 2017 -0500 # Branch stable # Node ID f13a8d056d6ebf490e65096391fdcd5916197f48 # Parent 27481162780894fb82e4b2f679f967a3a86cbc3b setup: remove duplicate assignment of HGRCPATH HGRCPATH is already set in l

[PATCH STABLE] packaging: update book URL in Mac and Windows READMEs

2017-10-23 Thread Kevin Bullock
# HG changeset patch # User Kevin Bullock # Date 1508525691 18000 # Fri Oct 20 13:54:51 2017 -0500 # Branch stable # Node ID a1573e7daf038763fcd96669b797be72ad4447b0 # Parent 27481162780894fb82e4b2f679f967a3a86cbc3b packaging: update book URL in Mac and Windows READMEs diff --git a/contrib/

Re: [PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread Kevin Bullock
> On Oct 23, 2017, at 17:03, muxator wrote: > >> On 10/23/2017 11:56 PM, Kevin Bullock wrote: >>> On Oct 23, 2017, at 16:07, muxator via Mercurial-devel >>> wrote: >>> >>> # HG changeset patch >>> # User muxator >>> # Date 1507152154 -7200 >>> # Wed Oct 04 23:22:34 2017 +0200 >>> # Branc

Re: [PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread Kevin Bullock
> On Oct 23, 2017, at 22:26, Kevin Bullock > wrote: > >> On Oct 23, 2017, at 17:03, muxator wrote: >> >>> On 10/23/2017 11:56 PM, Kevin Bullock wrote: On Oct 23, 2017, at 16:07, muxator via Mercurial-devel wrote: # HG changeset patch # User muxator # Date 1507

Re: [PATCH] commands: be more uniform in an "hg update" error message

2017-10-23 Thread Kevin Bullock
> On Oct 23, 2017, at 16:07, muxator via Mercurial-devel > wrote: > > # HG changeset patch > # User muxator > # Date 1508791524 -7200 > # Mon Oct 23 22:45:24 2017 +0200 > # Branch stable > # Node ID a0d216dad0347ceb0d29a3506b4c63a0a37df8b9 > # Parent 83a8eaeba37151821781becdf285501ebf0656

Re: [PATCH 2 of 2 STABLE] setup: filter out devel-warn messages from system hg

2017-10-23 Thread Augie Fackler
queued these > On Oct 23, 2017, at 23:19, Kevin Bullock > wrote: > > # HG changeset patch > # User Kevin Bullock > # Date 1508814839 18000 > # Mon Oct 23 22:13:59 2017 -0500 > # Branch stable > # Node ID adc50614340e952d8e98f5948d35b7bf632c2232 > # Parent f13a8d056d6ebf490e65096391fdcd59

Re: [PATCH STABLE] packaging: update book URL in Mac and Windows READMEs

2017-10-23 Thread Augie Fackler
queued > On Oct 23, 2017, at 23:21, Kevin Bullock > wrote: > > # HG changeset patch > # User Kevin Bullock > # Date 1508525691 18000 > # Fri Oct 20 13:54:51 2017 -0500 > # Branch stable > # Node ID a1573e7daf038763fcd96669b797be72ad4447b0 > # Parent 27481162780894fb82e4b2f679f967a3a86cbc

D1223: merge: disable path conflict checking by default (issue5716)

2017-10-23 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 3076. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1223?vs=3075&id=3076 REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES mercurial/configitems.py tests/test-audit-path.t tests/test-commandser

Re: [PATCH] update: in the description update() in merge.py, mention the long options explicitly

2017-10-23 Thread muxator via Mercurial-devel
Oh, thanks again. I did not know those checks existed. I'll use them in the future, so much better. On 10/24/2017 05:33 AM, Kevin Bullock wrote: On Oct 23, 2017, at 22:26, Kevin Bullock wrote: On Oct 23, 2017, at 17:03, muxator wrote: On 10/23/2017 11:56 PM, Kevin Bullock wrote: On Oc