This is an archive of the discontinued Mercurial Phabricator instance.

merge: introduce 'commitinfo' in mergeresult
ClosedPublic

Authored by pulkit on Jul 14 2020, 8:31 AM.

Details

Summary

commitinfo will be used to pass information which is required on commit phase
from the merge phase.

One common example is, merge chooses filenode from second parent and we need to
tell commit to choose that. Right now this one and related cases are not very
neatly implement and there is no clear line on how to pass on such information.
Upcoming patches will try to work on in this area and make things easier.

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 14 2020, 8:31 AM
marmoute requested changes to this revision.Jul 20 2020, 3:41 PM
marmoute added a subscriber: marmoute.

This is mostly a test of phab eating comment

This revision now requires changes to proceed.Jul 20 2020, 3:41 PM

I can confirm phab eat my comment.

marmoute resigned from this revision.Jul 20 2020, 5:00 PM

More serious question: Maybe we should stop passing around tuple of dictionnary and return an object holding all that data with a better API. What do you think ?

This revision now requires review to proceed.Jul 20 2020, 5:00 PM
pulkit retitled this revision from merge: return 'commitinfo' from manifestmerge() and calculateupdates() (API) to merge: introduce 'commitinfo' in mergeresult.
pulkit edited the summary of this revision. (Show Details)
pulkit updated this revision to Diff 22063.

More serious question: Maybe we should stop passing around tuple of dictionnary and return an object holding all that data with a better API. What do you think ?

Added a parent revision which starts returning a object. It's very basic as of now.

pulkit updated this revision to Diff 22097.Jul 25 2020, 5:57 AM
indygreg accepted this revision.Aug 2 2020, 12:48 PM
This revision is now accepted and ready to land.Aug 2 2020, 12:48 PM
This revision was automatically updated to reflect the committed changes.