diff -r d2fff292c265 -r 290f9c150f70 mercurial/patch.py --- a/mercurial/patch.py Mon Dec 13 19:34:06 2021 -0500 +++ b/mercurial/patch.py Mon Dec 13 20:19:09 2021 -0500 @@ -109,7 +109,9 @@ def mimesplit(stream, cur): def msgfp(m): fp = stringio() + # pytype: disable=wrong-arg-types g = mail.Generator(fp, mangle_from_=False) + # pytype: enable=wrong-arg-types g.flatten(m) fp.seek(0) return fp