[Updated] D8880: mergeresult: implement a len() function and use it

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Sat Aug 8 16:23:42 UTC 2020


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

INLINE COMMENTS

> merge.py:1423
>  
> -    numupdates = len(mresult.actions) - len(
> -        mresult._actionmapping[mergestatemod.ACTION_KEEP]
> -    )
> +    numupdates = mresult.len() - mresult.len((mergestatemod.ACTION_KEEP,))
>      progress = repo.ui.makeprogress(

I should read your full series before leaving comments that are addressed in the next patch :)

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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


More information about the Mercurial-patches mailing list