[Updated] D8550: mergestate: split out merge state handling code from main merge module

[indygreg (Gregory Szorc)]

This revision is now accepted and ready to land.
indygreg added a comment.
indygreg accepted this revision.


  `merge.py` has been way too long for years and I welcome splitting it.
  
  While I'm accepting this, I have a concern that some of the references to constants might be in tight loops and warrant aliasing to a local to avoid an extra attribute lookup. But presumably our performance regression tooling will identify any issues and these can be corrected with follow-ups easily enough.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8550/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8550

To: durin42, martinvonz, #hg-reviewers, indygreg
Cc: indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200521/5bbf08a4/attachment-0002.html>