Mercurial > public > mercurial-scm > hg
diff tests/test-bundle2.t @ 20892:6fe95448596d
bundle2: read the whole bundle from stream on abort
When the bundle processing abort on unknown mandatory parts, we now makes sure
all the bundle content is read. This avoid leaving the communication channel in
an unrecoverable state.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 24 Mar 2014 17:20:15 -0700 |
| parents | 1c6cd23fc221 |
| children | e910336539f7 |
line wrap: on
line diff
--- a/tests/test-bundle2.t Mon Mar 24 13:02:02 2014 -0700 +++ b/tests/test-bundle2.t Mon Mar 24 17:20:15 2014 -0700 @@ -72,9 +72,13 @@ > def cmdunbundle2(ui, repo): > """process a bundle2 stream from stdin on the current repo""" > try: - > bundle2.processbundle(repo, sys.stdin) - > except KeyError, exc: - > raise util.Abort('missing support for %s' % exc) + > try: + > bundle2.processbundle(repo, sys.stdin) + > except KeyError, exc: + > raise util.Abort('missing support for %s' % exc) + > finally: + > remains = sys.stdin.read() + > ui.write('%i unread bytes\n' % len(remains)) > > @command('statbundle2', [], '') > def cmdstatbundle2(ui, repo): @@ -385,6 +389,7 @@ ignoring unknown advisory part 'test:math' part header size: 0 end of bundle2 stream + 0 unread bytes $ hg bundle2 --parts --unknown ../unknown.hg2 @@ -394,5 +399,6 @@ Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko. + 0 unread bytes abort: missing support for 'test:unknown' [255]