mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
merge with stable
This commit is contained in:
commit
ba031d2d3b
@ -619,9 +619,15 @@ def debugwireargs(repo, proto, one, two, others):
|
|||||||
opts = options('debugwireargs', ['three', 'four'], others)
|
opts = options('debugwireargs', ['three', 'four'], others)
|
||||||
return repo.debugwireargs(one, two, **opts)
|
return repo.debugwireargs(one, two, **opts)
|
||||||
|
|
||||||
|
# List of options accepted by getbundle.
|
||||||
|
#
|
||||||
|
# Meant to be extended by extensions. It is the extension's responsibility to
|
||||||
|
# ensure such options are properly processed in exchange.getbundle.
|
||||||
|
gboptslist = ['heads', 'common', 'bundlecaps']
|
||||||
|
|
||||||
@wireprotocommand('getbundle', '*')
|
@wireprotocommand('getbundle', '*')
|
||||||
def getbundle(repo, proto, others):
|
def getbundle(repo, proto, others):
|
||||||
opts = options('getbundle', ['heads', 'common', 'bundlecaps'], others)
|
opts = options('getbundle', gboptslist, others)
|
||||||
for k, v in opts.iteritems():
|
for k, v in opts.iteritems():
|
||||||
if k in ('heads', 'common'):
|
if k in ('heads', 'common'):
|
||||||
opts[k] = decodelist(v)
|
opts[k] = decodelist(v)
|
||||||
|
Loading…
Reference in New Issue
Block a user