Mercurial > hg
diff mercurial/wireprotoframing.py @ 51700:7f0cb9ee0534
Backout accidental publication of a large range of revisions
I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 23 Jul 2024 10:02:46 +0200 |
parents | 493034cc3265 |
children | ca7bde5dbafb |
line wrap: on
line diff
--- a/mercurial/wireprotoframing.py Mon Jul 22 16:49:38 2024 +0200 +++ b/mercurial/wireprotoframing.py Tue Jul 23 10:02:46 2024 +0200 @@ -546,7 +546,7 @@ """ atomdicts = [] - for formatting, args, labels in atoms: + for (formatting, args, labels) in atoms: # TODO look for localstr, other types here? if not isinstance(formatting, bytes): @@ -1198,6 +1198,7 @@ b'%s' % stringutil.forcebytestr(e), errtype=b'server', ): + yield frame break @@ -1258,6 +1259,7 @@ for chunk in cborutil.streamencodebytestringfromiter( o.chunks ): + for frame in emitter.send(chunk): yield frame