equal
deleted
inserted
replaced
804 fp.close() |
804 fp.close() |
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 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT') |
808 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT') |
809 errpart.addparam('parttype', exc.parttype) |
809 if exc.parttype is not None: |
|
810 errpart.addparam('parttype', exc.parttype) |
810 if exc.params: |
811 if exc.params: |
811 errpart.addparam('params', '\0'.join(exc.params)) |
812 errpart.addparam('params', '\0'.join(exc.params)) |
812 return streamres(bundler.getchunks()) |
813 return streamres(bundler.getchunks()) |
813 except util.Abort, inst: |
814 except util.Abort, inst: |
814 # The old code we moved used sys.stderr directly. |
815 # The old code we moved used sys.stderr directly. |