This is an archive of the discontinued Mercurial Phabricator instance.

merge: introduce mergeresult.addfile() and use it
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:00 AM.

Details

Summary

We want to use mergeresult object at more and more places instead of this
actions dict to simplify code and further add new APIs to mergeresult object.

This patch introduces addfile() which adds a new file to the internal actions
dict for now.

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

pulkit created this revision.Jul 25 2020, 6:00 AM
indygreg accepted this revision.Aug 2 2020, 12:59 PM
indygreg added a subscriber: indygreg.

Oh, yay - no more indirect mutation of an internal attribute. I really like where this is going...

This revision is now accepted and ready to land.Aug 2 2020, 12:59 PM
This revision was automatically updated to reflect the committed changes.