Page MenuHomePhabricator

mergestate: move commit() from base class to on-disk subclass
ClosedPublic

Authored by martinvonz on Sep 18 2020, 2:20 AM.

Details

Summary

The commit message doesn't do anything in the in-memory case, and it's
_makerecords() is also not needed in that case, so let's move it
down to the on-disk subclass (i.e. the mergestate class). Sorry I
missed this earlier.

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

martinvonz created this revision.Sep 18 2020, 2:20 AM
pulkit added a subscriber: pulkit.Sep 18 2020, 2:53 AM
pulkit added inline comments.
mercurial/mergestate.py
816

Removal of mergedriver seems like an unrelated change here.

martinvonz updated this revision to Diff 22712.Sep 18 2020, 2:56 AM
martinvonz added inline comments.Sep 18 2020, 2:56 AM
mercurial/mergestate.py
816

Removal of mergedriver seems like an unrelated change here.

Indeed. Fixed.

pulkit accepted this revision.Sep 18 2020, 2:57 AM
This revision is now accepted and ready to land.Sep 18 2020, 2:57 AM