Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.py @ 21600:5e08f3b65510

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: update all ``addpart`` callers to ``newpart`` The new method is what we want in all current cases.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 23 May 2014 15:59:19 -0700
parents 9f3652e851f8
children 0cfda08afd24
comparison
equal deleted inserted replaced
21599:57cd844d7a5b 21600:5e08f3b65510
803 finally: 803 finally:
804 fp.close() 804 fp.close()
805 os.unlink(tempname) 805 os.unlink(tempname)
806 except bundle2.UnknownPartError, exc: 806 except bundle2.UnknownPartError, exc:
807 bundler = bundle2.bundle20(repo.ui) 807 bundler = bundle2.bundle20(repo.ui)
808 part = bundle2.bundlepart('B2X:ERROR:UNKNOWNPART', 808 bundler.newpart('B2X:ERROR:UNKNOWNPART', [('parttype', str(exc))])
809 [('parttype', str(exc))])
810 bundler.addpart(part)
811 return streamres(bundler.getchunks()) 809 return streamres(bundler.getchunks())
812 except util.Abort, inst: 810 except util.Abort, inst:
813 # The old code we moved used sys.stderr directly. 811 # The old code we moved used sys.stderr directly.
814 # We did not change it to minimise code change. 812 # We did not change it to minimise code change.
815 # This need to be moved to something proper. 813 # This need to be moved to something proper.
827 sys.stderr.write("abort: %s\n" % inst) 825 sys.stderr.write("abort: %s\n" % inst)
828 return pushres(0) 826 return pushres(0)
829 except error.PushRaced, exc: 827 except error.PushRaced, exc:
830 if getattr(exc, 'duringunbundle2', False): 828 if getattr(exc, 'duringunbundle2', False):
831 bundler = bundle2.bundle20(repo.ui) 829 bundler = bundle2.bundle20(repo.ui)
832 part = bundle2.bundlepart('B2X:ERROR:PUSHRACED', 830 bundler.newpart('B2X:ERROR:PUSHRACED', [('message', str(exc))])
833 [('message', str(exc))])
834 bundler.addpart(part)
835 return streamres(bundler.getchunks()) 831 return streamres(bundler.getchunks())
836 else: 832 else:
837 return pusherr(str(exc)) 833 return pusherr(str(exc))