( )⚙ D378 contrib: make simplemerge script pass context-like objects

This is an archive of the discontinued Mercurial Phabricator instance.

contrib: make simplemerge script pass context-like objects
ClosedPublic

Authored by phillco on Aug 14 2017, 2:15 AM.

Details

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
API.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Aug 14 2017, 2:15 AM
phillco updated this revision to Diff 1038.Aug 17 2017, 2:29 PM
phillco added inline comments.
contrib/simplemerge
52–71

As @martinvonz noted this could probably be combined with the arbitraryfilectx I made in https://bitbucket.org/phillco/hg-imm/commits/0cc65baa328bbba84629aeb4708ee2fa765a50f0.

phillco updated this revision to Diff 1277.Aug 25 2017, 12:32 AM
This revision was automatically updated to reflect the committed changes.