[Updated] D8876: merge: pass mergeresult obj instead of actions in applyupdates() (API)

[indygreg (Gregory Szorc)]

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

INLINE COMMENTS

> sparse.py:278
>              message = _(b'dropping temporarily included sparse files')
> -            actions.append((file, None, message))
> +            mresult.addfile(file, b'r', None, message)
>              dropped.append(file)

Shouldn't we be using the constant for `r` here? But this appeared in the old code, so not a new issue.

> sparse.py:519
>              if repo.wvfs.exists(file):
> -                actions[file] = (b'e', (fl,), b'')
> +                mresult.addfile(file, b'e', (fl,), b'')
>                  lookup.append(file)

More opportunities for constants if you feel so inclined...

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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/ddba0ae4/attachment-0002.html>