comparison mercurial/exchange.py @ 25640:39f0064a3079

bundle2.getunbundler: rename "header" to "magicstring" This is more consistent with the name used in the bundler class. Thanks goes to Martin von Zweigbergk for pointing this out.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 07 Apr 2015 14:14:27 -0700
parents 521c1a3139c9
children 328739ea70c3
comparison
equal deleted inserted replaced
25639:7125225a5287 25640:39f0064a3079
34 if version == '10': 34 if version == '10':
35 if alg is None: 35 if alg is None:
36 alg = changegroup.readexactly(fh, 2) 36 alg = changegroup.readexactly(fh, 2)
37 return changegroup.cg1unpacker(fh, alg) 37 return changegroup.cg1unpacker(fh, alg)
38 elif version.startswith('2'): 38 elif version.startswith('2'):
39 return bundle2.getunbundler(ui, fh, header=magic + version) 39 return bundle2.getunbundler(ui, fh, magicstring=magic + version)
40 else: 40 else:
41 raise util.Abort(_('%s: unknown bundle version %s') % (fname, version)) 41 raise util.Abort(_('%s: unknown bundle version %s') % (fname, version))
42 42
43 def buildobsmarkerspart(bundler, markers): 43 def buildobsmarkerspart(bundler, markers):
44 """add an obsmarker part to the bundler with <markers> 44 """add an obsmarker part to the bundler with <markers>