Re: Deploying registrar configs in a BC safe way

2017-10-24 Thread Gregory Szorc
> On Oct 24, 2017, at 10:25, Durham Goode wrote: > > I've been trying to update our extensions to support the new registrar class, > and one thing I've noticed is that it's not really possible to have code that > works with old versions of mercurial and new versions of

Re: [PATCH remotenames] configs: update configs to use registrar

2017-10-24 Thread Durham Goode
I didn't fill in the commit message on this one. V2 incoming On 10/24/17 2:15 PM, Durham Goode wrote: # HG changeset patch # User Durham Goode # Date 1508879615 25200 # Tue Oct 24 14:13:35 2017 -0700 # Node ID 9ead5c33dd22a9a66cea009bcf76ffd801d5677e # Parent

[PATCH remotenames V2] configs: update configs to use registrar

2017-10-24 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1508879721 25200 # Tue Oct 24 14:15:21 2017 -0700 # Node ID c8d9ee2123baadd3ca1b571b3e7acf86ca1e6783 # Parent 5fb97b6b3d46fcd4dc1b3cb6be137762eb9e60e7 configs: update configs to use registrar Upstream now gives devel warnings

[PATCH remotenames] configs: update configs to use registrar

2017-10-24 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1508879615 25200 # Tue Oct 24 14:13:35 2017 -0700 # Node ID 9ead5c33dd22a9a66cea009bcf76ffd801d5677e # Parent 5fb97b6b3d46fcd4dc1b3cb6be137762eb9e60e7 configs: update configs to use registrar diff --git a/remotenames.py

[Bug 5720] New: Interrupted evolve loses phase

2017-10-24 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5720 Bug ID: 5720 Summary: Interrupted evolve loses phase Product: Mercurial Version: 4.4-rc Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

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

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

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

2017-10-24 Thread sid0 (Siddharth Agarwal)
sid0 added a comment. > The debug section doesn't seem to exists, could we use 'experimental' instead while we fix the performance regression? Good idea! Done, thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1222 To: sid0, #hg-reviewers Cc:

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

2017-10-24 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 3081. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1222?vs=3073=3081 REVISION DETAIL https://phab.mercurial-scm.org/D1222 AFFECTED FILES mercurial/configitems.py mercurial/merge.py CHANGE DETAILS diff --git

[Bug 5719] New: ctrl-c during `hg push` managed to leave abandoned transaction on a remote repo (possibly bitbucket specific)

2017-10-24 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5719 Bug ID: 5719 Summary: ctrl-c during `hg push` managed to leave abandoned transaction on a remote repo (possibly bitbucket specific) Product: Mercurial Version:

D1224: merge: cache unknown dir checks (issue5716)

2017-10-24 Thread sid0 (Siddharth Agarwal)
sid0 added a comment. Could you make this a class with unknowndircache and missingdircache being private members? How much do you think writing some of this code in native code (e.g. Rust) would help? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224

D1224: merge: cache unknown dir checks (issue5716)

2017-10-24 Thread mbthomas (Mark Thomas)
mbthomas added a comment. There is still some cost to doing the check, so it's not a complete reversal of issue5716, but it helps a lot. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224 To: mbthomas, #hg-reviewers Cc: krbullock, mercurial-devel

D1226: merge: check created file dirs for path conflicts only once

2017-10-24 Thread mbthomas (Mark Thomas)
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In large repositories, updates involving the creation of many files check the same directories repeatedly. Move these checks out to a separate loop to avoid

Deploying registrar configs in a BC safe way

2017-10-24 Thread Durham Goode
I've been trying to update our extensions to support the new registrar class, and one thing I've noticed is that it's not really possible to have code that works with old versions of mercurial and new versions of mercurial at the same time, without having devel warnings. I can easily stub out

D1224: merge: cache unknown dir checks

2017-10-24 Thread krbullock (Kevin Bullock)
krbullock added a comment. Code LGTM, but I haven't done any performance testing on this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224 To: mbthomas, #hg-reviewers Cc: krbullock, mercurial-devel ___

D1224: merge: cache unknown dir checks

2017-10-24 Thread krbullock (Kevin Bullock)
krbullock added a comment. If this mitigates or fixes issue5716, please mention it in the summary line. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224 To: mbthomas, #hg-reviewers Cc: krbullock, mercurial-devel

D1224: merge: cache unknown dir checks

2017-10-24 Thread mbthomas (Mark Thomas)
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As mentioned in https://phab.mercurial-scm.org/D1222, the recent pathconflicts change regresses update performance in large repositories when many files are

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

2017-10-24 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. The `debug` section doesn't seem to exists, could we use 'experimental' instead while we fix the performance regression? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1222 To: sid0, #hg-reviewers Cc: lothiraldan, mercurial-devel

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

2017-10-24 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: