mercurial/wireproto.py
changeset 24797 0c4d5e01b31f
parent 24796 61ff209fc01d
child 25128 631766d1f57a
equal deleted inserted replaced
24796:61ff209fc01d 24797:0c4d5e01b31f
   856                 return pushres(0)
   856                 return pushres(0)
   857             except error.PushRaced:
   857             except error.PushRaced:
   858                 return pusherr(str(exc))
   858                 return pusherr(str(exc))
   859 
   859 
   860         bundler = bundle2.bundle20(repo.ui)
   860         bundler = bundle2.bundle20(repo.ui)
       
   861         for out in getattr(exc, '_bundle2salvagedoutput', ()):
       
   862             bundler.addpart(out)
   861         try:
   863         try:
   862             raise
   864             raise
   863         except error.BundleValueError, exc:
   865         except error.BundleValueError, exc:
   864             errpart = bundler.newpart('error:unsupportedcontent')
   866             errpart = bundler.newpart('error:unsupportedcontent')
   865             if exc.parttype is not None:
   867             if exc.parttype is not None: