Show More
@@ -999,10 +999,21 b' def getbundle(repo, source, heads=None, ' | |||||
999 | part.addparam('namespace', namespace) |
|
999 | part.addparam('namespace', namespace) | |
1000 | keys = repo.listkeys(namespace).items() |
|
1000 | keys = repo.listkeys(namespace).items() | |
1001 | part.data = pushkey.encodekeys(keys) |
|
1001 | part.data = pushkey.encodekeys(keys) | |
|
1002 | _getbundleobsmarkerpart(bundler, repo, source, heads=heads, common=common, | |||
|
1003 | bundlecaps=bundlecaps, **kwargs) | |||
1002 | _getbundleextrapart(bundler, repo, source, heads=heads, common=common, |
|
1004 | _getbundleextrapart(bundler, repo, source, heads=heads, common=common, | |
1003 | bundlecaps=bundlecaps, **kwargs) |
|
1005 | bundlecaps=bundlecaps, **kwargs) | |
1004 | return util.chunkbuffer(bundler.getchunks()) |
|
1006 | return util.chunkbuffer(bundler.getchunks()) | |
1005 |
|
1007 | |||
|
1008 | def _getbundleobsmarkerpart(bundler, repo, source, heads=None, common=None, | |||
|
1009 | bundlecaps=None, **kwargs): | |||
|
1010 | if kwargs.get('obsmarkers', False): | |||
|
1011 | if heads is None: | |||
|
1012 | heads = repo.heads() | |||
|
1013 | subset = [c.node() for c in repo.set('::%ln', heads)] | |||
|
1014 | markers = repo.obsstore.relevantmarkers(subset) | |||
|
1015 | buildobsmarkerspart(bundler, markers) | |||
|
1016 | ||||
1006 | def _getbundleextrapart(bundler, repo, source, heads=None, common=None, |
|
1017 | def _getbundleextrapart(bundler, repo, source, heads=None, common=None, | |
1007 | bundlecaps=None, **kwargs): |
|
1018 | bundlecaps=None, **kwargs): | |
1008 | """hook function to let extensions add parts to the requested bundle""" |
|
1019 | """hook function to let extensions add parts to the requested bundle""" |
@@ -202,6 +202,7 b' def unescapearg(escaped):' | |||||
202 | # :plain: string with no transformation needed. |
|
202 | # :plain: string with no transformation needed. | |
203 | gboptsmap = {'heads': 'nodes', |
|
203 | gboptsmap = {'heads': 'nodes', | |
204 | 'common': 'nodes', |
|
204 | 'common': 'nodes', | |
|
205 | 'obsmarkers': 'boolean', | |||
205 | 'bundlecaps': 'csv', |
|
206 | 'bundlecaps': 'csv', | |
206 | 'listkeys': 'csv', |
|
207 | 'listkeys': 'csv', | |
207 | 'cg': 'boolean'} |
|
208 | 'cg': 'boolean'} |
General Comments 0
You need to be logged in to leave comments.
Login now