Submitter | Pierre-Yves David |
---|---|
Date | May 28, 2015, 4:53 p.m. |
Message ID | <894b5a04697d5f129ff1.1432831998@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/9330/ |
State | Accepted |
Headers | show |
Comments
On Thu, May 28, 2015 at 09:53:18AM -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David <pierre-yves.david@fb.com> > # Date 1432711349 25200 > # Wed May 27 00:22:29 2015 -0700 > # Node ID 894b5a04697d5f129ff1b73cd2ca689169b8e497 > # Parent 4cd5a7c810b47ed664d868a80bff4fdb9b3c6a60 > bundle2: add generic debug output regarding generated interruption These all look fine. Queued. > > If we are about to hide the detailed debug output, we need some generic debug > message to replace it in a concise way. > > diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py > --- a/mercurial/bundle2.py > +++ b/mercurial/bundle2.py > @@ -802,10 +802,12 @@ class bundlepart(object): > outdebug(ui, 'payload chunk size: %i' % len(chunk)) > yield _pack(_fpayloadsize, len(chunk)) > yield chunk > except BaseException, exc: > # backup exception data for later > + ui.debug('bundle2-input-stream-interrupt: encoding exception %s' > + % exc) > exc_info = sys.exc_info() > msg = 'unexpected error: %s' % exc > interpart = bundlepart('error:abort', [('message', msg)], > mandatory=False) > interpart.id = 0 > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -802,10 +802,12 @@ class bundlepart(object): outdebug(ui, 'payload chunk size: %i' % len(chunk)) yield _pack(_fpayloadsize, len(chunk)) yield chunk except BaseException, exc: # backup exception data for later + ui.debug('bundle2-input-stream-interrupt: encoding exception %s' + % exc) exc_info = sys.exc_info() msg = 'unexpected error: %s' % exc interpart = bundlepart('error:abort', [('message', msg)], mandatory=False) interpart.id = 0