comparison mercurial/wireproto.py @ 23591:414374cfb531

bundle2: lowercase part types Since the capitalization no longer carries any meaning (previous diff), this patch normalizes all of the bundle2 part type strings to lower case.
author Eric Sumner <ericsumner@fb.com>
date Wed, 17 Dec 2014 15:11:26 -0800
parents e53f6b72a0e4
children c5456b64eb07
comparison
equal deleted inserted replaced
23590:4440c7cc3728 23591:414374cfb531
835 finally: 835 finally:
836 fp.close() 836 fp.close()
837 os.unlink(tempname) 837 os.unlink(tempname)
838 except error.BundleValueError, exc: 838 except error.BundleValueError, exc:
839 bundler = bundle2.bundle20(repo.ui) 839 bundler = bundle2.bundle20(repo.ui)
840 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT') 840 errpart = bundler.newpart('b2x:error:unsupportedcontent')
841 if exc.parttype is not None: 841 if exc.parttype is not None:
842 errpart.addparam('parttype', exc.parttype) 842 errpart.addparam('parttype', exc.parttype)
843 if exc.params: 843 if exc.params:
844 errpart.addparam('params', '\0'.join(exc.params)) 844 errpart.addparam('params', '\0'.join(exc.params))
845 return streamres(bundler.getchunks()) 845 return streamres(bundler.getchunks())
852 bundler = bundle2.bundle20(repo.ui) 852 bundler = bundle2.bundle20(repo.ui)
853 manargs = [('message', str(inst))] 853 manargs = [('message', str(inst))]
854 advargs = [] 854 advargs = []
855 if inst.hint is not None: 855 if inst.hint is not None:
856 advargs.append(('hint', inst.hint)) 856 advargs.append(('hint', inst.hint))
857 bundler.addpart(bundle2.bundlepart('B2X:ERROR:ABORT', 857 bundler.addpart(bundle2.bundlepart('b2x:error:abort',
858 manargs, advargs)) 858 manargs, advargs))
859 return streamres(bundler.getchunks()) 859 return streamres(bundler.getchunks())
860 else: 860 else:
861 sys.stderr.write("abort: %s\n" % inst) 861 sys.stderr.write("abort: %s\n" % inst)
862 return pushres(0) 862 return pushres(0)
863 except error.PushRaced, exc: 863 except error.PushRaced, exc:
864 if getattr(exc, 'duringunbundle2', False): 864 if getattr(exc, 'duringunbundle2', False):
865 bundler = bundle2.bundle20(repo.ui) 865 bundler = bundle2.bundle20(repo.ui)
866 bundler.newpart('B2X:ERROR:PUSHRACED', [('message', str(exc))]) 866 bundler.newpart('b2x:error:pushraced', [('message', str(exc))])
867 return streamres(bundler.getchunks()) 867 return streamres(bundler.getchunks())
868 else: 868 else:
869 return pusherr(str(exc)) 869 return pusherr(str(exc))