[Updated] D8875: merge: pass mergeresult obj instead of actions in _checkcollision() (API)

[indygreg (Gregory Szorc)]

This revision is now accepted and ready to land.
indygreg added inline comments.
indygreg accepted this revision.

INLINE COMMENTS

> merge.py:299
>          pmmf = set(wmf.walk(narrowmatch))
> -        if actions:
> -            narrowactions = {}
> -            for m, actionsfortype in pycompat.iteritems(actions):
> -                narrowactions[m] = []
> -                for (f, args, msg) in actionsfortype:
> -                    if narrowmatch(f):
> -                        narrowactions[m].append((f, args, msg))
> -            actions = narrowactions
> +        if mresult:
> +            for f, actionsfortype in pycompat.iteritems(mresult.actions):

I initially wrote a comment that `mresult` is likely always defined but see that `None` can be passed in. Do you think it makes more sense to pass in an empty merge result instance instead of `None`? That seems to be the pattern elsewhere in this merge code refactor.

(This could be done as a follow-up, of course.)

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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