##// END OF EJS Templates
bundles: turn nbchanges int into a bytestr using pycompat.bytestr...
Augie Fackler -
r34218:8e035802 default
parent child Browse files
Show More
@@ -1444,7 +1444,7 b' def _addpartsfromopts(ui, repo, bundler,'
1444 part = bundler.newpart('changegroup', data=cg.getchunks())
1444 part = bundler.newpart('changegroup', data=cg.getchunks())
1445 part.addparam('version', cg.version)
1445 part.addparam('version', cg.version)
1446 if 'clcount' in cg.extras:
1446 if 'clcount' in cg.extras:
1447 part.addparam('nbchanges', str(cg.extras['clcount']),
1447 part.addparam('nbchanges', '%d' % cg.extras['clcount'],
1448 mandatory=False)
1448 mandatory=False)
1449 if opts.get('phases') and repo.revs('%ln and secret()',
1449 if opts.get('phases') and repo.revs('%ln and secret()',
1450 outgoing.missingheads):
1450 outgoing.missingheads):
@@ -1520,7 +1520,7 b' def writebundle(ui, cg, filename, bundle'
1520 part = bundle.newpart('changegroup', data=cg.getchunks())
1520 part = bundle.newpart('changegroup', data=cg.getchunks())
1521 part.addparam('version', cg.version)
1521 part.addparam('version', cg.version)
1522 if 'clcount' in cg.extras:
1522 if 'clcount' in cg.extras:
1523 part.addparam('nbchanges', str(cg.extras['clcount']),
1523 part.addparam('nbchanges', '%d' % cg.extras['clcount'],
1524 mandatory=False)
1524 mandatory=False)
1525 chunkiter = bundle.getchunks()
1525 chunkiter = bundle.getchunks()
1526 else:
1526 else:
@@ -1640,7 +1640,8 b' def _getbundlechangegrouppart(bundler, r'
1640 part = bundler.newpart('changegroup', data=cgstream)
1640 part = bundler.newpart('changegroup', data=cgstream)
1641 if cgversions:
1641 if cgversions:
1642 part.addparam('version', version)
1642 part.addparam('version', version)
1643 part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False)
1643 part.addparam('nbchanges', '%d' % len(outgoing.missing),
1644 mandatory=False)
1644 if 'treemanifest' in repo.requirements:
1645 if 'treemanifest' in repo.requirements:
1645 part.addparam('treemanifest', '1')
1646 part.addparam('treemanifest', '1')
1646
1647
General Comments 0
You need to be logged in to leave comments. Login now