Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.py @ 21620:6eaa71b2a3cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: introduce a parttype attribute to BundleValueError We will use the Exception for more that just unknown part type.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 28 May 2014 15:51:19 -0700
parents 292331e906d7
children 457492741007
comparison
equal deleted inserted replaced
21619:292331e906d7 21620:6eaa71b2a3cc
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', str(exc)) 809 errpart.addparam('parttype', exc.parttype)
810 return streamres(bundler.getchunks()) 810 return streamres(bundler.getchunks())
811 except util.Abort, inst: 811 except util.Abort, inst:
812 # The old code we moved used sys.stderr directly. 812 # The old code we moved used sys.stderr directly.
813 # We did not change it to minimise code change. 813 # We did not change it to minimise code change.
814 # This need to be moved to something proper. 814 # This need to be moved to something proper.