D378: contrib: make simplemerge script pass context-like objects

This revision was automatically updated to reflect the committed changes. Closed by commit rHGed6f64173121: contrib: make simplemerge script pass context-like objects (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=1277=1284

D378: contrib: make simplemerge script pass context-like objects

phillco updated this revision to Diff 1277. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=1038=1277 REVISION DETAIL https://phab.mercurial-scm.org/D378 AFFECTED FILES contrib/simplemerge CHANGE DETAILS diff --git a/contrib/simplemerge

D378: contrib: make simplemerge script pass context-like objects

phillco added a subscriber: martinvonz. phillco added inline comments. INLINE COMMENTS > simplemerge:44-63 > +class filebackedctx(object): > +"""simplemerge requires context-like objects""" > +def __init__(self, path): > +self._path = path > + > +def decodeddata(self): > +

D378: contrib: make simplemerge script pass context-like objects

phillco updated this revision to Diff 1038. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=859=1038 REVISION DETAIL https://phab.mercurial-scm.org/D378 AFFECTED FILES contrib/simplemerge CHANGE DETAILS diff --git a/contrib/simplemerge

D378: contrib: make simplemerge script pass context-like objects

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `simplemerge()` will soon require context-like objects to work. Create a simple context-like object that wraps the requested files and can be passed to the new