D5536: testrunner: avoid capturing a regex group we don't care about

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5536 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D5535: tests: support passing testcase after .t paths that have path separators

2019-01-08 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8ddc5d8bea25: tests: support passing testcase after .t paths that have path separators (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5535: tests: support passing testcase after .t paths that have path separators

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision. martinvonz added a comment. This revision is now accepted and ready to land. Thanks for fixing! I have run into this many times but never spent time trying to understand what the problem was. REPOSITORY rHG Mercurial REVISION DETAIL

D5535: tests: support passing testcase after .t paths that have path separators

2019-01-08 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This probably could have been implemented by changing the regex above this bit of code, but I wasn't sure if it would end up handling various OSes correctly,

D5534: merge: make local file storage in the .hg/merge directory extensible

2019-01-08 Thread dploch (Daniel Ploch)
dploch created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is similar to remotefilelog's 'getlocalkey' method, which must be overridden by systems which rely on full path names for access control purposes. REPOSITORY

D5533: remotefilelog: add newlines to ui.log() invocations

2019-01-08 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The comment at the top of ui.log() says that the message should be a newline-terminated string. When using the blackbox logger, if the string does not end in a

D5532: context: schedule file prefetch before comparing for cleanliness

2019-01-08 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When using a system like remotefilelog, we can occasionally run into scenarios where the local content cache does not have the data we need to perform

Re: Sprint 5.0 (Asia, Spring 2019)

2019-01-08 Thread Kyle Lippincott
I've started https://www.mercurial-scm.org/wiki/5.0sprint, please fill it in with your interest/availability, or if there's other places that can host! On Tue, Oct 16, 2018 at 9:59 AM Gregory Szorc wrote: > On Sun, Oct 14, 2018 at 12:30 PM Kyle Lippincott > wrote: > >> Per the recent

D5526: progress: document progress.debug config option

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG785a75f0ddcb: progress: document progress.debug config option (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

4.9-rc0 coming up - prepare accordingly

2019-01-08 Thread Pulkit Goyal
Hey everyone! As per our time based release plan, we have a major release i.e. hg-4.9 coming 1st Feb. 4.9rc0 will be released on upcoming 16th or 17th. So if you want something to be included in upcoming major release, now is a good time to send patches. If you need help getting something landed

D5531: progress: deprecate ui.progress()

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13082. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5531?vs=13081=13082 REVISION DETAIL https://phab.mercurial-scm.org/D5531 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff --git a/mercurial/ui.py

D5531: progress: deprecate ui.progress()

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It is now just a weird wrapper for ui.makeprogress(). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5531 AFFECTED FILES

D5530: progress: check what type of progress bar to use only once per topic

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This seems to have sped up `hg perfprogress` from 1.78 s to 1.41 s. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5530 AFFECTED

D5527: progress: write ui.progress() in terms of ui.makeprogress()

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think ui.makeprogress() should be the preferred interface and we should deprecate ui.progress(). All in-core callers already use ui.makeprogress(). Moving

D5529: progress: split up _print() method in bar-updating and debug-printing

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I just thought this was clearer, but it turned out to also simplify the next patch. This seems to have sped up `hg perfprogress` from 1.85 s to 1.78 s.

D5528: progress: move cached debug flag from progress.progbar to scmutil.progress

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's simpler this way. One possible drawback (and a possisble advantage) is that we now check the debug flag once per topic, so processes that generate new

D5526: progress: document progress.debug config option

2019-01-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think it was not spotted by test-check-config.t that we had not documented it because no caller refers to the ui object simply as "ui" (it was either

D5514: test: change test's diff generation to use mdiff for nicer output

2019-01-08 Thread pulkit (Pulkit Goyal)
pulkit added a comment. > If you couldn't follow those steps, you can simply check the diffs here: > > test's diff: https://pastebin.com/Z4LRg4vx > diff used by hg diff: https://pastebin.com/qanQEsiA Can you make the diffs a part of commit message since pastebin's pastes can be

D5514: test: change test's diff generation to use mdiff for nicer output

2019-01-08 Thread durin42 (Augie Fackler)
durin42 requested changes to this revision. durin42 added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > run-tests.py:72 > import xml.dom.minidom as minidom > +from mercurial import mdiff, patch > This will fail if Mercurial isn't already globally installed

D5525: xdiff: don't attempt to use fuzzer inputs larger than 100k

2019-01-08 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 recommended approach from [0], and limiting the input was suggested in https://github.com/google/oss-fuzz/issues/2076 when discussing our broken

Re: [PATCH 4 of 4] mmapindex: set default to 1MB

2019-01-08 Thread Yuya Nishihara
On Mon, 7 Jan 2019 09:45:32 +0100, Boris FELD wrote: > On 03/01/2019 09:58, Yuya Nishihara wrote: > > On Wed, 2 Jan 2019 23:40:11 +0100, Boris FELD wrote: > >> On 04/12/2018 12:09, Yuya Nishihara wrote: > >>> On Sun, 02 Dec 2018 17:17:43 +0100, Boris Feld wrote: > # HG changeset patch >

D5522: tests: migrate test-wireproto-serverreactor.py to our internal CBOR

2019-01-08 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa181a1c8af1d: tests: migrate test-wireproto-serverreactor.py to our internal CBOR (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5518: state: update comment about use of CBOR

2019-01-08 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG050ea8eb42a5: state: update comment about use of CBOR (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5518?vs=13065=13073

Re: [PATCH 4 of 4] mmapindex: set default to 1MB

2019-01-08 Thread Pulkit Goyal
On Thu, Jan 3, 2019 at 2:37 PM Yuya Nishihara wrote: > On Wed, 2 Jan 2019 23:40:11 +0100, Boris FELD wrote: > > On 04/12/2018 12:09, Yuya Nishihara wrote: > > > On Sun, 02 Dec 2018 17:17:43 +0100, Boris Feld wrote: > > >> # HG changeset patch > > >> # User Boris Feld > > >> # Date 1542949784

D5495: revset: add "branch" positional arguments to the merge revset

2019-01-08 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D5495#81562, @yuja wrote: > > +@predicate('merge(*withbranch)', safe=True) > > > > def merge(repo, subset, x): > > > > - """Changeset is a merge changeset. +"""Changeset is a merge changeset + +All merge