##// END OF EJS Templates
bundle2: rename b2x:error:unknownpart to b2x:error:unsupportedcontent...
Pierre-Yves David -
r21619:292331e9 default
parent child Browse files
Show More
@@ -828,9 +828,9 b' def handlereplycaps(op, inpart):'
828 """Used to transmit abort error over the wire"""
828 """Used to transmit abort error over the wire"""
829 raise util.Abort(inpart.params['message'], hint=inpart.params.get('hint'))
829 raise util.Abort(inpart.params['message'], hint=inpart.params.get('hint'))
830
830
831 @parthandler('b2x:error:unknownpart')
831 @parthandler('b2x:error:unsupportedcontent')
832 def handlereplycaps(op, inpart):
832 def handlereplycaps(op, inpart):
833 """Used to transmit unknown part error over the wire"""
833 """Used to transmit unknown content error over the wire"""
834 raise error.BundleValueError(inpart.params['parttype'])
834 raise error.BundleValueError(inpart.params['parttype'])
835
835
836 @parthandler('b2x:error:pushraced')
836 @parthandler('b2x:error:pushraced')
@@ -805,7 +805,8 b' def unbundle(repo, proto, heads):'
805 os.unlink(tempname)
805 os.unlink(tempname)
806 except error.BundleValueError, exc:
806 except error.BundleValueError, exc:
807 bundler = bundle2.bundle20(repo.ui)
807 bundler = bundle2.bundle20(repo.ui)
808 bundler.newpart('B2X:ERROR:UNKNOWNPART', [('parttype', str(exc))])
808 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT')
809 errpart.addparam('parttype', str(exc))
809 return streamres(bundler.getchunks())
810 return streamres(bundler.getchunks())
810 except util.Abort, inst:
811 except util.Abort, inst:
811 # The old code we moved used sys.stderr directly.
812 # The old code we moved used sys.stderr directly.
General Comments 0
You need to be logged in to leave comments. Login now