D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-31 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG65ae54582713: merge: move some of the logic in batchget() to workingfilectx (authored by phillco). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D444?vs=1478&id=1516#toc REPOSITORY rHG Merc

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-31 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > martinvonz wrote in context.py:1967-1968 > I'll drop the the parenthesis in flight Thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D444 To: phillco, #hg-reviewers Cc: martinvonz, mercurial-devel _

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-31 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > context.py:1967-1968 > +def clearunknown(self): > +"""Removes conflicting items in the working directory (and creates > any > +missing parent directories) so that ``write()`` can be called > +successfully. I'll drop

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-31 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1478. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1459&id=1478 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git a/m

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-31 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > context.py:1971-1973 > +if self._repo.wvfs.isdir(self._path) and not self._repo.wvfs.islink( > +self._path): > +self._repo.wvfs.removedirs(self._path) self.repo.wvfs gets repeated often enough that it's proba

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-30 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1459. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1309&id=1459 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git a/m

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-25 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1309. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1226&id=1309 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git a/m

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-23 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1226. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1073&id=1226 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git a/m

D444: merge: move some of the logic in batchget() to workingfilectx

2017-08-18 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We will use this logic in two places with in-memory merge. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercu