[Updated] D8879: merge: replace use of actions dict with mergeresult object

[indygreg (Gregory Szorc)]

This revision is now accepted and ready to land.
indygreg added a comment.
indygreg accepted this revision.
indygreg added subscribers: durin42, indygreg.


  The introduction of sorting here is interesting. I guess we never sorted filenames before performing working directory modifications before? But surely there is sorting happening elsewhere because anything with ui output would need to be sorted to ensure determinism. And surely tests would have caught that.
  
  Also, I remember there being an interplay between parallel workers and filesystem performance. Something about how file I/O is scheduled with respect to discrete directories. @durin42 might know more. (I remember mpm mentioning this when I was poking around with parallel workers and working directory operations several years ago.)

INLINE COMMENTS

> merge.py:1413
> +    numupdates = len(mresult.actions) - len(
> +        mresult._actionmapping[mergestatemod.ACTION_KEEP]
>      )

The private attribute access here isn't great. But whatever.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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