##// END OF EJS Templates
bundle: condition the changegroup part when creating a new bundle...
Boris Feld -
r37023:66c0ff38 default
parent child Browse files
Show More
@@ -1577,7 +1577,9 b' def _addpartsfromopts(ui, repo, bundler,'
1577 # different right now. So we keep them separated for now for the sake of
1577 # different right now. So we keep them separated for now for the sake of
1578 # simplicity.
1578 # simplicity.
1579
1579
1580 # we always want a changegroup in such bundle
1580 # we might not always want a changegroup in such bundle, for example in
1581 # stream bundles
1582 if opts.get('changegroup', True):
1581 cgversion = opts.get('cg.version')
1583 cgversion = opts.get('cg.version')
1582 if cgversion is None:
1584 if cgversion is None:
1583 cgversion = changegroup.safeversion(repo)
1585 cgversion = changegroup.safeversion(repo)
@@ -1263,7 +1263,7 b' def bundle(ui, repo, fname, dest=None, *'
1263 compopts['level'] = complevel
1263 compopts['level'] = complevel
1264
1264
1265
1265
1266 contentopts = {'cg.version': cgversion}
1266 contentopts = {'cg.version': cgversion, 'changegroup': True}
1267 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1267 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1268 contentopts['obsolescence'] = True
1268 contentopts['obsolescence'] = True
1269 if repo.ui.configbool('experimental', 'bundle-phases'):
1269 if repo.ui.configbool('experimental', 'bundle-phases'):
General Comments 0
You need to be logged in to leave comments. Login now