( )⚙ D8743 merge: pass commitinfo to applyupdates() and get it stored in mergestate

This is an archive of the discontinued Mercurial Phabricator instance.

merge: pass commitinfo to applyupdates() and get it stored in mergestate
ClosedPublic

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

Details

Summary

This patch passes the commitinfo calulcated in manifestmerge() to applyupdates()
so that it can be read there and stored in mergestate. On commit, we can read
mergestate for such information and act accordingly.

This patch also makes ACTION_GET_OTHER_AND_STORE not required anymore. Next
patch will remove the messy code surrounding it.

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.