D616: context: add overlayworkingcontext and overlayworkingfilectx

phillco updated this revision to Diff 1707. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D616?vs=1706=1707 REVISION DETAIL https://phab.mercurial-scm.org/D616 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D627: filemerge: flush if using deferred writes when running a merge tool

phillco updated this revision to Diff 1700. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D627?vs=1671=1700 REVISION DETAIL https://phab.mercurial-scm.org/D627 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D672: merge: add `ondisk` to merge.update and pass it in largefiles

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If set to false, parts of the merge might be performed in memory. Largefiles isn't a good candidate for in-memory merge (it uses a custom dirstate, matcher,

D673: merge: flush any deferred writes just before recordupdates()

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY ``recordupdates`` calls into the dirstate which requires the files to be there, so this is the last possible moment we can flush anything. REPOSITORY rHG

D628: merge: flush any deferred writes before, and after, running any workers

phillco updated this revision to Diff 1701. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D628?vs=1672=1701 REVISION DETAIL https://phab.mercurial-scm.org/D628 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D628: merge: flush any deferred writes before, and after, running any workers

phillco added a comment. (Done on both) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D628 To: phillco, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D674: filemerge: use arbitraryfilectx for backup files

phillco 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/D674 AFFECTED FILES mercurial/context.py mercurial/filemerge.py tests/test-dirstate-race.t CHANGE

D616: context: add overlayworkingcontext and overlayworkingfilectx

phillco updated this revision to Diff 1705. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D616?vs=1699=1705 REVISION DETAIL https://phab.mercurial-scm.org/D616 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D616: context: add overlayworkingcontext and overlayworkingfilectx

phillco updated this revision to Diff 1708. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D616?vs=1707=1708 REVISION DETAIL https://phab.mercurial-scm.org/D616 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D544: releasenotes: update docstrings with information on additional flags

rishabhmadan96 updated this revision to Diff 1690. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D544?vs=1368=1690 REVISION DETAIL https://phab.mercurial-scm.org/D544 AFFECTED FILES hgext/releasenotes.py CHANGE DETAILS diff --git

[PATCH evolve-ext STABLE] topic: check availability of obsutil.getmarkers() for portability

# HG changeset patch # User FUJIWARA Katsunori # Date 1505049726 -32400 # Sun Sep 10 22:22:06 2017 +0900 # Branch stable # Node ID 12654c26c4ed79e83661c92473d3f42bb4de5134 # Parent 0d16c89aa18584443d08fd07c587d4cb14677c4a # Available At

D544: releasenotes: update docstrings with information on additional flags

rishabhmadan96 added inline comments. INLINE COMMENTS > dsp wrote in releasenotes.py:554 > I think we usually don't address "you" directly. Maybe something like > > The -c/--check option checks the commit message for invalid admonitions. In > case of an invalid admonition, the flag returns

[PATCH] extensions: fix wrapcommand/function of class instance

# HG changeset patch # User Yuya Nishihara # Date 1505054234 -32400 # Sun Sep 10 23:37:14 2017 +0900 # Node ID 283ecec363f4901ec8948dbdc7dba564296d8582 # Parent a763c891f36e55f4869f443c220227d1da747d18 extensions: fix wrapcommand/function of class instance 5361771f9714

D663: dirstate: perform transactions with _map using single call, where possible

phillco accepted this revision. phillco added a comment. These look good to me. INLINE COMMENTS > dirstate.py:585-587 > # if there is a merge going on and the file was either > # in state 'm' (-1) or coming from other parent (-2) before > # being

D669: changegroup: replace getchangegroup with makechangegroup

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of reducing the number of changegroup creation APIs, let's replace getchangegroup with calls to makechangegroup. This is mostly a drop in replacement,

D665: changegroup: replace changegroupsubset with makechangegroup

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of getting rid of all the permutations of changegroup creation, let's remove changegroupsubset and call makechangegroup instead. This moves the

D668: changegroup: replace changegroup with makechangegroup

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of reducing the number of changegroup creation APIs, let's replace the changegroup function with makechangegroup. This pushes the responsibility of

D664: changegroup: replace getsubset with makechangegroup

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The current changegroup APIs are a bit of a mess. Currently you can use getsubsetraw, getsubset, changegroupsubset, getlocalchangegroupraw, getchangegroup, and

D671: changegroup: rename getsubsetraw to makestream

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that nothing uses getsubsetraw except makestream, let's move the functionality into the makestream. This removes the last remaining excess changegroup

D667: changegroup: delete getlocalchangegroup

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of reducing the number of changegroup creation APIs, let's go ahead and delete this unused function. It appears to have been deprecated in the last

D666: changegroup: replace getlocalchangegroupraw with makestream

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of reducing the number of changegroup creation apis, let's replace calls to getlocalchangegroupraw with calls to makestream. Aside from one case of

D670: changegroup: remove external uses of getbundler

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that makestream and makechangegroup are the primary creation methods for changegroups, let's get rid of this rogue use of getbundler and getsubsetraw.

[PATCH 1 of 2 stable] mq: test coverage of how [diff] configuration influence can break mq patches

# HG changeset patch # User Mads Kiilerich # Date 1505083342 -7200 # Mon Sep 11 00:42:22 2017 +0200 # Branch stable # Node ID e05e50fbdeaf7eb52a2936e1dfe98643d68c334e # Parent 3c3066367d72344935aabf9606a5b40e9950b5e7 mq: test coverage of how [diff] configuration

[PATCH 2 of 2 stable] mq: create non-lossy patches, also with custom global diff configuration

# HG changeset patch # User Mads Kiilerich # Date 1505083344 -7200 # Mon Sep 11 00:42:24 2017 +0200 # Branch stable # Node ID 987a85c42b08ab2a82cce39b004e00b708320d0e # Parent e05e50fbdeaf7eb52a2936e1dfe98643d68c334e mq: create non-lossy patches, also with custom global

Re: [PATCH] extensions: fix wrapcommand/function of class instance

LGTM. Thanks! Excerpts from Yuya Nishihara's message of 2017-09-10 23:47:02 +0900: > # HG changeset patch > # User Yuya Nishihara > # Date 1505054234 -32400 > # Sun Sep 10 23:37:14 2017 +0900 > # Node ID 283ecec363f4901ec8948dbdc7dba564296d8582 > # Parent