Re: [PATCH 6 of 6 v2] paths: allow util.finddirs touse os.path.sep

2017-09-29 Thread Matt Harbison
On Sat, 23 Sep 2017 00:20:35 -0400, Matt Harbison wrote: Kostia- I'll try to look deeper at this series this weekend. But does the suggestion in the 2012 thread above seem reasonable, about just tweaking the open function instead of (I assume) trying to pass full

D845: perf: remove fallbacks to ancient versions of dirstate.walk()

2017-09-29 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. I have confirmed that we only need to support changes introduced after Nov 2008. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D845 To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel

Re: [PATCH 5 of 5] py3: work around bytes/unicode divergence in parsedate()

2017-09-29 Thread Pulkit Goyal
On Wed, Sep 27, 2017 at 6:04 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1506508061 -32400 > # Wed Sep 27 19:27:41 2017 +0900 > # Node ID 3908ba8ca01db2bbb6104946cb1e86e514ea4b8d > # Parent

[Bug 5691] New: Memory use when cloning large repositories

2017-09-29 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5691 Bug ID: 5691 Summary: Memory use when cloning large repositories Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED

D803: extdiff: allow pager to be used

2017-09-29 Thread yuja (Yuya Nishihara)
yuja added a comment. > The difference between core commands and extdiff commands here is core commands have > `pager.attend-*` set to True by default. But extdiff commands have `attend-*` set to > `False` to not cause surprises. That's only true for page-able commands. You can't

[Bug 5690] New: Support branch descriminators

2017-09-29 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5690 Bug ID: 5690 Summary: Support branch descriminators Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

mercurial@34339: 25 new changesets

2017-09-29 Thread Mercurial Commits
25 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/98b359216915 changeset: 34315:98b359216915 user:Jun Wu date:Thu Sep 28 10:37:53 2017 -0700 summary: test-patchbomb: fix the test https://www.mercurial-scm.org/repo/hg/rev/12b355964de8

D847: dirstate: use keyword arguments to clarify status()'s callers

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The arguments are especially non-obvious because the order is different from dirstate.walk(). REPOSITORY rHG Mercurial REVISION DETAIL

D846: dirstate: use keyword arguments to clarify walk()'s callers

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The arguments are especially non-obvious because the order is different from dirstate.status(). REPOSITORY rHG Mercurial REVISION DETAIL

D845: perf: remove fallbacks to ancient versions of dirstate.walk()

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If the call to dirstate.walk() failed, we would try to fall back to older versions. These were removed in

D803: extdiff: allow pager to be used

2017-09-29 Thread quark (Jun Wu)
quark added a comment. In https://phab.mercurial-scm.org/D803#14125, @yuja wrote: > It seems confusing to support the global pager.attend-* option only in extdiff context. > Instead, maybe we can use the .gui flag of merge-tools (plus another boolean for > vimdiff-like tools.)

D843: progress: back out changeset a667f0ca1d5f

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz abandoned this revision. martinvonz added a comment. Superseded by https://phab.mercurial-scm.org/D844 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D843 To: martinvonz, #hg-reviewers, quark Cc: durin42, quark, mercurial-devel

D752: dirstate: create new dirstatemap class

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > dirstate.py:1345 > + > +class dirstatemap(object): > +def __init__(self): I was wondering if all this delegation would be noticeably costly, but I couldn't think of a case where it is (no significant change in "hg files -0 | xargs -0

D844: test-patchbomb: use mocktime

2017-09-29 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb4dbebdaf9e0: test-patchbomb: use mocktime (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D844?vs=2163=2164 REVISION DETAIL

D759: dirstate: move parents source of truth to dirstatemap

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5fabba9b3d9c: dirstate: move parents source of truth to dirstatemap (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D754: dirstate: move filefoldmap to dirstatemap

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG19a5ad535cb1: dirstate: move filefoldmap to dirstatemap (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D754?vs=2078=2157

D758: dirstate: move parent reading to the dirstatemap class

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG949276a8cd76: dirstate: move parent reading to the dirstatemap class (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D752: dirstate: create new dirstatemap class

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG42b68c9c2742: dirstate: create new dirstatemap class (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D752?vs=1947=2155

D757: dirstate: move opendirstatefile to dirstatemap

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0407c611b7be: dirstate: move opendirstatefile to dirstatemap (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D757?vs=2081=2160

D756: dirstate: move _copymap to dirstatemap

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG894cd88815ca: dirstate: move _copymap to dirstatemap (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D756?vs=2080=2159

D753: dirstate: move nonnormalentries to dirstatemap

2017-09-29 Thread durham (Durham Goode)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG362ed91ca00c: dirstate: move nonnormalentries to dirstatemap (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D753?vs=1948=2156

D843: progress: back out changeset a667f0ca1d5f

2017-09-29 Thread quark (Jun Wu)
quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. I think it's passing on gcc112: [quark@gcc2-power8 hg-committed]$ hg id b1243afb61c9 tip [quark@gcc2-power8 hg-committed]$ make local python setup.py \

D843: Backed out changeset a667f0ca1d5f

2017-09-29 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Tests were failing on some combination of platform and library versions (at least on my Linux machine and some Solaris machine), and the proposed fix by Jun

D842: style: always use `x is not None` instead of `not x is None`

2017-09-29 Thread alex_gaynor (Alex Gaynor)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb1243afb61c9: style: always use `x is not None` instead of `not x is None` (authored by alex_gaynor, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D842: style: always use `x is not None` instead of `not x is None`

2017-09-29 Thread alex_gaynor (Alex Gaynor)
alex_gaynor created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH style-fixes (bookmark) on default (branch) REVISION DETAIL https://phab.mercurial-scm.org/D842 AFFECTED FILES mercurial/keepalive.py

D787: tests: add test for path conflicts during merge

2017-09-29 Thread swhitaker (Simon Whitaker)
swhitaker accepted this revision. swhitaker added a comment. _like_ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D787 To: mbthomas, #hg-reviewers, swhitaker Cc: swhitaker, mercurial-devel

D821: unamend: move fb extension unamend to core

2017-09-29 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > durham wrote in uncommit.py:260 > This should be in a with statement probably? Can we just have it be as part > of the top level lock with statement? Test test REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D821

D786: tests: add test for path conflicts during update

2017-09-29 Thread swhitaker (Simon Whitaker)
swhitaker accepted this revision. swhitaker added a comment. goodjob REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D786 To: mbthomas, #hg-reviewers, swhitaker Cc: swhitaker, mercurial-devel

D821: unamend: move fb extension unamend to core

2017-09-29 Thread pulkit (Pulkit Goyal)
pulkit planned changes to this revision. pulkit added a comment. In https://phab.mercurial-scm.org/D821#14116, @singhsrb wrote: > I just wanted to mention that unamend command does not track copytrace information properly. That's a pretty good catch. Thanks a lot. REPOSITORY

Re: [PATCH] test-patchbomb: fix the test

2017-09-29 Thread Yuya Nishihara
On Thu, 28 Sep 2017 10:41:05 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1506620273 25200 > # Thu Sep 28 10:37:53 2017 -0700 > # Node ID c2099c462f1c0ed939e521ef767caa669fc78354 > # Parent f428c347d32b2f110856c6fb7fec00a5f4cc0c0d > test-patchbomb: fix

Re: [PATCH 7 of 8] templatekw: add new-style template expansion to {manifest}

2017-09-29 Thread Augie Fackler
On Sun, Sep 24, 2017 at 09:21:56PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1461490883 -32400 > # Sun Apr 24 18:41:23 2016 +0900 > # Node ID a0047461f18c7d3d341bcecda6975bb58b53651b > # Parent

mercurial@34314: 3 new changesets

2017-09-29 Thread Mercurial Commits
3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d64c2c050b54 changeset: 34312:d64c2c050b54 user:Jun Wu date:Tue Sep 26 12:48:15 2017 -0700 summary: progress: demonstrate non-linear progress has a bad ETA experience

Re: [PATCH 7 of 7 bundle2] pull: remove inadequate use of operations records to update stepdone

2017-09-29 Thread Augie Fackler
On Thu, Sep 28, 2017 at 07:08:42AM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1506434101 -7200 > # Tue Sep 26 15:55:01 2017 +0200 > # Node ID 6b46f4991b6af0b5796ec3b084941b306ea635b9 > # Parent

Re: [PATCH] misc: rename README to README.rst

2017-09-29 Thread Augie Fackler
On Tue, Sep 26, 2017 at 08:37:23AM +0200, David Demelier wrote: > # HG changeset patch > # User David Demelier > # Date 1506407837 -7200 > # Tue Sep 26 08:37:17 2017 +0200 > # Node ID 49c0882e2c32ac1a4df10a3f7f51171ab1b677be > # Parent

D803: extdiff: allow pager to be used

2017-09-29 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. It seems confusing to support the global pager.attend-* option only in extdiff context. Instead, maybe we can use the .gui flag of merge-tools (plus another boolean for