[PATCH 1 of 3] changelog: remove copy of revlog.nodemap()

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534477724 -32400 # Fri Aug 17 12:48:44 2018 +0900 # Node ID 0a01692d0560e11e15b8d9c25d944684cc9cab72 # Parent 8547c8590ac1b49a640d64d1c0878cb5364b3a3b changelog: remove copy of revlog.nodemap() It's been there since 2012, "clfilter:

[PATCH 3 of 3] revlog: obtain the first node at the lowest layer while building pure nodemap

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534478853 -32400 # Fri Aug 17 13:07:33 2018 +0900 # Node ID 862795da77333d388efbda161e012336ff4237bf # Parent a492553fb5277889521c5400d59b51fe238dc4d8 revlog: obtain the first node at the lowest layer while building pure nodemap Just for

[PATCH 2 of 3] revlog: fix pure nodemap to not access missing index entry

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534478090 -32400 # Fri Aug 17 12:54:50 2018 +0900 # Node ID a492553fb5277889521c5400d59b51fe238dc4d8 # Parent 0a01692d0560e11e15b8d9c25d944684cc9cab72 revlog: fix pure nodemap to not access missing index entry This bug was revealed by

[PATCH 2 of 3] branchmap: close cache file properly

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534469139 -32400 # Fri Aug 17 10:25:39 2018 +0900 # Node ID dd1614906a20ea7e189e0461d9d86beec0a52197 # Parent b892df0766e164fca47d3b04cbc9b774db097eb4 branchmap: close cache file properly Follows up 2a4bfbb52111. diff --git

[PATCH 1 of 3] branchmap: strip '\n' read from cache file as before

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534469069 -32400 # Fri Aug 17 10:24:29 2018 +0900 # Node ID b892df0766e164fca47d3b04cbc9b774db097eb4 # Parent 485a3349d5eed5718cd93a5b3d598e11a5fa3673 branchmap: strip '\n' read from cache file as before Follows up 2a4bfbb52111. diff

[PATCH 3 of 3] branchmap: explicitly convert file into iterator

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534470665 -32400 # Fri Aug 17 10:51:05 2018 +0900 # Node ID 8547c8590ac1b49a640d64d1c0878cb5364b3a3b # Parent dd1614906a20ea7e189e0461d9d86beec0a52197 branchmap: explicitly convert file into iterator Follows up 2a4bfbb52111. This is

Re: [PATCH 3 of 6] filemerge: add the function to examine a capability of a internal tool

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 23:21:05 +0900, FUJIWARA Katsunori wrote: > At Thu, 16 Aug 2018 18:51:55 +0900, > Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:35 +0900, FUJIWARA Katsunori wrote: > > > # HG changeset patch > > > # User FUJIWARA Katsunori > > > # Date 1534245351 -32400 > > > # Tue

[PATCH 2 of 2] rebase: do not pass in user option to rollback in-memory merge conflict

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534468885 -32400 # Fri Aug 17 10:21:25 2018 +0900 # Node ID 485a3349d5eed5718cd93a5b3d598e11a5fa3673 # Parent e338a921a0cdc60717e5aebc7dc4bb9ba203478d rebase: do not pass in user option to rollback in-memory merge conflict Nothing passed

[PATCH 1 of 2] rebase: add test for in-memory merge conflicts

2018-08-16 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1534468757 -32400 # Fri Aug 17 10:19:17 2018 +0900 # Node ID e338a921a0cdc60717e5aebc7dc4bb9ba203478d # Parent 06baaf43c9599534ffe3b6ecd3275e68abe68c34 rebase: add test for in-memory merge conflicts diff --git a/tests/test-rebase-inmemory.t

D4313: pycompat: wrap xrange for py2 to provide efficient __contains__

2018-08-16 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The C implementation of xrange in Python 2 provides a O(n) membership test, which is noticable on pull-based clones of large repositories. Avoid this

D4312: New bookflow extension for bookmark-based branching

2018-08-16 Thread idlsoft (Sandu Turcan)
idlsoft 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/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git

D4311: New bookflow extension for bookmark-based branching

2018-08-16 Thread idlsoft (Sandu Turcan)
idlsoft added a comment. This was submitted in error, not sure how to delete it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4311 To: idlsoft, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D4311: New bookflow extension for bookmark-based branching

2018-08-16 Thread idlsoft (Sandu Turcan)
idlsoft 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/D4311 AFFECTED FILES hgext/bookflow.py CHANGE DETAILS diff --git a/hgext/bookflow.py

D4307: dagutil: remove internalize() and internalizeall()

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous commit removed the last consumer. .. api:: removed internalize() and internalizeall() from dagutil Use .rev(node) on storage objects to

D4305: dagutil: remove externalize() and externalizeall()

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY They are unused after the previous commit. .. api:: externalize() and externalizeall() removed from dagutil Use .node() on a storage primitive to

D4303: exchange: don't use dagutil

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We were only using it for simple node -> rev and parent revision lookups. These are exposed via the storage interface and we don't need to go through dagutil.

D4306: setdiscovery: don't use dagutil for node -> rev conversion

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The node -> rev conversion is possible using standard storage APIs and doesn't need to involve the dagutil module. REPOSITORY rHG Mercurial REVISION DETAIL

D4304: setdiscovery: don't use dagutil for rev -> node conversions

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We don't need to use dagutil to perform a simple rev -> node conversion. I haven't measured, but the new code is likely faster, as we avoid extra function

D4309: dagutil: remove nodeset()

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY AFAICT this was unused since the code was introduced by https://phab.mercurial-scm.org/rHGcb98fed5249517b558fa07c7d0414c14cdfe4e4d in 2011! REPOSITORY rHG

D4308: debugcommands: use a revset instead of dagutil

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY All this code was doing was finding the nodes that are heads from the ancestors of an input set. This can easily be expressed with a revset without having to

D4310: setdiscovery: don't use dagutil to compute heads

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a relatively trivial operation to perform. We don't need to use dagutil. This brings us one step closer to eliminating dagutil. We still need

[Bug 5963] New: hg status shows M instead A during merge

2018-08-16 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5963 Bug ID: 5963 Summary: hg status shows M instead A during merge Product: Mercurial Version: 4.6.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

D4302: rebase: call _dorebase() properly

2018-08-16 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG06baaf43c959: rebase: call _dorebase() properly (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4302?vs=10395=10396

D4302: rebase: call _dorebase() properly

2018-08-16 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fixes a regression from https://phab.mercurial-scm.org/rHGe9e742bd0501c02d9a59a7829068117bee8c4674 where we failed to pass all necessary arguments to

[Bug 5962] New: hg update inconsistencies when untracked/ignored files are in the way

2018-08-16 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5962 Bug ID: 5962 Summary: hg update inconsistencies when untracked/ignored files are in the way Product: Mercurial Version: 4.6 Hardware: PC OS: Linux

D4300: context: make sure file is not deleted while checking path conflicts

2018-08-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG873f3a56993f: context: make sure file is not deleted while checking path conflicts (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4298: tests: don't create new repo inside existing repo in test-rebase-inmemory.t

2018-08-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0600d09764df: tests: dont create new repo inside existing repo in test-rebase-inmemory.t (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4299: tests: demonstrate that IMM needs to be smarter with path conflicts

2018-08-16 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG02e80e37fbbc: tests: demonstrate that IMM needs to be smarter with path conflicts (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4301: tests: add a directory 'knownfailures' to check in known failures

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit added a comment. I also think that the 'knowfailures' can serve as a good place for new contributors. I don't want to check-in all the failures and leave them unfixed. It's like I don't know which one I will be able to fix and I have a reproduction which can help others.

D4301: tests: add a directory 'knownfailures' to check in known failures

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There are some things which everyone of us stumble upon and found out that this does not work. Sometimes, we hg developers know

Re: [PATCH 1 of 6] help: describe more detail about capabilities while deciding merge tool

2018-08-16 Thread FUJIWARA Katsunori
At Thu, 16 Aug 2018 19:32:23 +0900, Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:33 +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori > > # Date 1534244736 -32400 > > # Tue Aug 14 20:05:36 2018 +0900 > > # Node ID

Re: [PATCH 6 of 6] filemerge: show actual capabilities of internal merge tools

2018-08-16 Thread FUJIWARA Katsunori
At Thu, 16 Aug 2018 19:13:40 +0900, Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:38 +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori > > # Date 1534252828 -32400 > > # Tue Aug 14 22:20:28 2018 +0900 > > # Node ID

Re: [PATCH 5 of 6] filemerge: add config knob to check capabilities of internal merge tools

2018-08-16 Thread FUJIWARA Katsunori
At Thu, 16 Aug 2018 19:03:30 +0900, Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:37 +0900, FUJIWARA Katsunori wrote: > > +``strict-capability-check`` > > + Whether capabilities of internal merge tools are checked strictly > > + or not, while examining rules to decide merge tool to be

Re: [PATCH 3 of 6] filemerge: add the function to examine a capability of a internal tool

2018-08-16 Thread FUJIWARA Katsunori
At Thu, 16 Aug 2018 18:51:55 +0900, Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:35 +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori > > # Date 1534245351 -32400 > > # Tue Aug 14 20:15:51 2018 +0900 > > # Node ID

D3896: copies: handle case when both merge cset are not descendant of merge base

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D3896#65986, @spectral wrote: > Any updates on this? I'm poking at updating this function in core, and not too excited to have to also modify the copy in evolve that seems to have spawned :/ I am yet to write tests. Feel

D4300: context: make sure file is not deleted while checking path conflicts

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If a file is deleted and a directory of same name is created in the same commit, IMM thinks of that as a file conflict, however the file is deleted and hence the

D4299: tests: demonstrate that IMM needs to be smarter with path conflicts

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When we try to rebase a commit which deletes an existing file and make a directory of the same name, rebase with IMM aborts. It should work fine just like the

D4298: tests: don't create new repo inside existing repo in test-rebase-inmemory.t

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit 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/D4298 AFFECTED FILES tests/test-rebase-inmemory.t CHANGE DETAILS diff --git

[PATCH 09 of 10] sparse-revlog: ensure intermediate snapshot have decreasing size

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1532355718 -7200 # Mon Jul 23 16:21:58 2018 +0200 # Node ID ac0ba18eb49da2b7dc564afb1abec260cd1541d4 # Parent 4577a01129c513b870a70f52c071e1e668e94049 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 01 of 10] debugrevlog: fix for non-manifest object

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534339244 -7200 # Wed Aug 15 15:20:44 2018 +0200 # Node ID 4c025c62ceb8de0f58721f7edd4448b7ef95006d # Parent 46da52f4b820f2668b120fcf93f09fb730065da6 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 02 of 10] revlog: add a method to tells whether rev is stored as a snapshot

2018-08-16 Thread Boris Feld
# HG changeset patch # User Paul Morelle # Date 1532086337 -7200 # Fri Jul 20 13:32:17 2018 +0200 # Node ID ced822e5b2a37bcdaea15366627c035a169a05d3 # Parent 4c025c62ceb8de0f58721f7edd4448b7ef95006d # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 03 of 10] revlog: also detect intermediate snapshots

2018-08-16 Thread Boris Feld
# HG changeset patch # User Paul Morelle # Date 1532086488 -7200 # Fri Jul 20 13:34:48 2018 +0200 # Node ID 44f26261d97dddc70ddcd3a08b0e7597c4179b39 # Parent ced822e5b2a37bcdaea15366627c035a169a05d3 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 07 of 10] sparse-revlog: compute snapshot depth on delta info

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1532089976 -7200 # Fri Jul 20 14:32:56 2018 +0200 # Node ID 7417729eb852c6f88530d9659b0a82e3b450fcd4 # Parent e78ae4e123a35629a1fd25bf264c7be812e1c8e3 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 10 of 10] sparse-revlog: only consider the span of the delta section

2018-08-16 Thread Boris Feld
# HG changeset patch # User Paul Morelle # Date 1532085601 -7200 # Fri Jul 20 13:20:01 2018 +0200 # Node ID 6919d3344c2bb0cb60c97fb3dfef334bfd122517 # Parent ac0ba18eb49da2b7dc564afb1abec260cd1541d4 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 05 of 10] revlog: add a method to retrieve snapshot depth

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534327754 -7200 # Wed Aug 15 12:09:14 2018 +0200 # Node ID 0543f2d7c86af60df21a51b0dc826780400d3a62 # Parent 23af56696ff32b0172570e4430775a7793d9d8f9 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 06 of 10] debugrevlog: display snapshot details per depth

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534329030 -7200 # Wed Aug 15 12:30:30 2018 +0200 # Node ID e78ae4e123a35629a1fd25bf264c7be812e1c8e3 # Parent 0543f2d7c86af60df21a51b0dc826780400d3a62 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 04 of 10] debugrevlog: include information about intermediate snapshots

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1532681563 -7200 # Fri Jul 27 10:52:43 2018 +0200 # Node ID 23af56696ff32b0172570e4430775a7793d9d8f9 # Parent 44f26261d97dddc70ddcd3a08b0e7597c4179b39 # EXP-Topic sparse-snapshot # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

2018-08-16 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG95bd19f60957: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4288: tests: remove test-py3-commands.t

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7c9fedcf7a36: tests: remove test-py3-commands.t (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4288?vs=10366=10387

D4289: tests: update test-check-py3-compat.t output in the py3exe branch

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3201ea44fe09: tests: update test-check-py3-compat.t output in the py3exe branch (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4288: tests: remove test-py3-commands.t

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit accepted this revision. pulkit added a comment. killitwithfire REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4288 To: durin42, #hg-reviewers, pulkit Cc: pulkit, mjpieters,

D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

2018-08-16 Thread pulkit (Pulkit Goyal)
pulkit accepted this revision. pulkit added a comment. Thanks @phillco for the review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4287 To: spectral, phillco, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel ___

Re: [PATCH 1 of 6] help: describe more detail about capabilities while deciding merge tool

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:33 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1534244736 -32400 > # Tue Aug 14 20:05:36 2018 +0900 > # Node ID cffd12b0d927a859e99c8b5e3f451512c85999d1 > # Parent 18cbe2d872d3184c4504094a6fd070ca96f48181 > #

Re: D4281: branchmap: load branchmap as an iterable

2018-08-16 Thread Yuya Nishihara
> def read(repo): > try: > f = repo.cachevfs(_filename(repo)) > -lines = f.read().split('\n') > -f.close() > -except (IOError, OSError): > -return None > - > -try: > -cachekey = lines.pop(0).split(" ", 2) > +cachekey = next(f).split("

Re: [PATCH 2 of 6] filemerge: set actual capabilities of internal merge tools

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:34 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1534244907 -32400 > # Tue Aug 14 20:08:27 2018 +0900 > # Node ID ca968875ed9869cbfa464af05c2a217219f298ed > # Parent cffd12b0d927a859e99c8b5e3f451512c85999d1 > #

D4281: branchmap: load branchmap as an iterable

2018-08-16 Thread yuja (Yuya Nishihara)
yuja added a comment. > def read(repo): > try: > f = repo.cachevfs(_filename(repo)) > > - lines = f.read().split('\n') > - f.close() > - except (IOError, OSError): > - return None - > - try: > - cachekey = lines.pop(0).split(" ", 2) +cachekey =

Re: [PATCH 5 of 6] filemerge: add config knob to check capabilities of internal merge tools

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:37 +0900, FUJIWARA Katsunori wrote: > +``strict-capability-check`` > + Whether capabilities of internal merge tools are checked strictly > + or not, while examining rules to decide merge tool to be used. > + (default: False) > + > ``merge-patterns`` >

Re: [PATCH 4 of 6] filemerge: show warning if chosen tool has no binary files capability

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:36 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1534339478 -32400 > # Wed Aug 15 22:24:38 2018 +0900 > # Node ID 48c9d0cb2afe7692324e1fa7872bc577db6496af > # Parent 1d16378efeb91e435d520b081a7a34b78d7fa7e2 > #

Re: [PATCH 3 of 6] filemerge: add the function to examine a capability of a internal tool

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:35 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1534245351 -32400 > # Tue Aug 14 20:15:51 2018 +0900 > # Node ID 1d16378efeb91e435d520b081a7a34b78d7fa7e2 > # Parent ca968875ed9869cbfa464af05c2a217219f298ed > #

Re: [PATCH 6 of 6] filemerge: show actual capabilities of internal merge tools

2018-08-16 Thread Yuya Nishihara
On Thu, 16 Aug 2018 03:35:38 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1534252828 -32400 > # Tue Aug 14 22:20:28 2018 +0900 > # Node ID f65c2eed9d606cbe7c5c76a8787f2db710abc445 > # Parent 813cc2cf9c0cae1928584518afb4558c443b77b7 > #

D4295: tests: force a stable hostname in patchbomb tests

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1f987f7c832b: tests: force a stable hostname in patchbomb tests (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4296: tests: un-glob patchbomb test lines that were only globbing a hostname

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd7007b807fa2: tests: un-glob patchbomb test lines that were only globbing a hostname (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT

D4293: patchbomb: extract function for generating message-id

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4899c6d22dff: patchbomb: extract function for generating message-id (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4282: rebase: cover restorestatus() by lock to prevent it from being updated

2018-08-16 Thread khanchi97 (Sushil khanchi)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGffb34ee6de9e: rebase: cover restorestatus() by lock to prevent it from being updated (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT

D4294: patchbomb: allow using HGHOSTNAME to force a hostname

2018-08-16 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1415b78869eb: patchbomb: allow using HGHOSTNAME to force a hostname (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH STABLE] sparse-revlog: fix delta validity computation

2018-08-16 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1534337020 -7200 # Wed Aug 15 14:43:40 2018 +0200 # Branch stable # Node ID 1b78bebb7a8793b4b858d335b11f4deaf57dd128 # Parent 7e023ce26c7f5e800c778fb4ff76c6d772b3 # EXP-Topic fix-sparse # Available At

[Bug 5961] New: hgweb broken in 4.7

2018-08-16 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5961 Bug ID: 5961 Summary: hgweb broken in 4.7 Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

D4297: util: improve handling of truncated compressed streams

2018-08-16 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If the compressed stream is over as marked by the reader providing nothing new and the compression engine is not providing data, bail out. This can

D4291: contrib: import the relnotes script from the release-tools repo

2018-08-16 Thread av6 (Anton Shestakov)
av6 added a comment. I've commented on things that can be improved, but they shouldn't stop this from landing. INLINE COMMENTS > relnotes:51 > +r": implement ": -5, > +r"2\.4": -20, > +r": use .* implementation": -20, I assume it's for Python 2.4. Maybe needs more versions we