branch | stable |
changeset 44759 | e58422afbc74 |
parent 44452 | 9d2b2df2c2ba |
child 45072 | a56ba57c837d |
--- a/mercurial/patch.py Thu Apr 23 09:59:38 2020 +0200 +++ b/mercurial/patch.py Thu Apr 30 15:10:05 2020 +0200 @@ -2558,7 +2558,7 @@ fctx2 is not None ), b'fctx2 unexpectly None in diff hunks filtering' hunks = hunksfilterfn(fctx2, hunks) - text = b''.join(sum((list(hlines) for hrange, hlines in hunks), [])) + text = b''.join(b''.join(hlines) for hrange, hlines in hunks) if hdr and (text or len(hdr) > 1): yield b'\n'.join(hdr) + b'\n' if text: