##// END OF EJS Templates
exchange: advertise if a clone bundle was attempted...
Gregory Szorc -
r26690:704818fb default
parent child Browse files
Show More
@@ -1179,6 +1179,16 def _pullbundle2(pullop):
1179 # make sure to always includes bookmark data when migrating
1179 # make sure to always includes bookmark data when migrating
1180 # `hg incoming --bundle` to using this function.
1180 # `hg incoming --bundle` to using this function.
1181 kwargs['listkeys'].append('bookmarks')
1181 kwargs['listkeys'].append('bookmarks')
1182
1183 # If this is a full pull / clone and the server supports the clone bundles
1184 # feature, tell the server whether we attempted a clone bundle. The
1185 # presence of this flag indicates the client supports clone bundles. This
1186 # will enable the server to treat clients that support clone bundles
1187 # differently from those that don't.
1188 if (pullop.remote.capable('clonebundles')
1189 and pullop.heads is None and list(pullop.common) == [nullid]):
1190 kwargs['cbattempted'] = pullop.clonebundleattempted
1191
1182 if streaming:
1192 if streaming:
1183 pullop.repo.ui.status(_('streaming all changes\n'))
1193 pullop.repo.ui.status(_('streaming all changes\n'))
1184 elif not pullop.fetch:
1194 elif not pullop.fetch:
@@ -160,7 +160,8 gboptsmap = {'heads': 'nodes',
160 'obsmarkers': 'boolean',
160 'obsmarkers': 'boolean',
161 'bundlecaps': 'scsv',
161 'bundlecaps': 'scsv',
162 'listkeys': 'csv',
162 'listkeys': 'csv',
163 'cg': 'boolean'}
163 'cg': 'boolean',
164 'cbattempted': 'boolean'}
164
165
165 # client side
166 # client side
166
167
General Comments 0
You need to be logged in to leave comments. Login now