This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2101

infinitepush: remove wrapping around bundle2._addpartsfromopts()
ClosedPublic

Authored by pulkit on Feb 9 2018, 6:46 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe702ca152b33: infinitepush: remove wrapping around bundle2._addpartsfromopts()
Summary

This wrapping around bundle2._addpartsfromopts() was added by me while hacking
on an alternate way to mark a push as infinitepush or not. However the wrapping
is wrong as the push command does not go through the code path which was wrapped
on the client side.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 9 2018, 6:46 AM
indygreg accepted this revision.Feb 9 2018, 10:05 PM
This revision is now accepted and ready to land.Feb 9 2018, 10:05 PM
Closed by commit rHGe702ca152b33: infinitepush: remove wrapping around bundle2._addpartsfromopts() (authored by pulkit). · Explain WhyMar 30 2018, 3:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/__init__.py (24 lines)

Diff 7416

hgext/infinitepush/__init__.py

default='', default='',
) )
configitem('infinitepush', 'storeallparts', configitem('infinitepush', 'storeallparts',
default=False, default=False,
) )
configitem('infinitepush', 'reponame', configitem('infinitepush', 'reponame',
default='', default='',
) )
configitem('infinitepush', 'bundle-stream',
default=False,
)
configitem('scratchbranch', 'storepath', configitem('scratchbranch', 'storepath',
default='', default='',
) )
configitem('infinitepush', 'branchpattern', configitem('infinitepush', 'branchpattern',
default='', default='',
) )
configitem('infinitepush', 'metadatafilelimit', configitem('infinitepush', 'metadatafilelimit',
default=100, default=100,
bookcmd[1].append( bookcmd[1].append(
('', 'remote-path', '', ('', 'remote-path', '',
'name of the remote path to list the bookmarks')) 'name of the remote path to list the bookmarks'))
extensions.wrapcommand(commands.table, 'pull', _pull) extensions.wrapcommand(commands.table, 'pull', _pull)
extensions.wrapcommand(commands.table, 'update', _update) extensions.wrapcommand(commands.table, 'update', _update)
extensions.wrapfunction(discovery, 'checkheads', _checkheads) extensions.wrapfunction(discovery, 'checkheads', _checkheads)
extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts)
wireproto.wirepeer.listkeyspatterns = listkeyspatterns wireproto.wirepeer.listkeyspatterns = listkeyspatterns
partorder = exchange.b2partsgenorder partorder = exchange.b2partsgenorder
index = partorder.index('changeset') index = partorder.index('changeset')
partorder.insert( partorder.insert(
index, partorder.pop(partorder.index(scratchbranchparttype))) index, partorder.pop(partorder.index(scratchbranchparttype)))
else: else:
return orig(ui, repo, *names, **opts) return orig(ui, repo, *names, **opts)
def _checkheads(orig, pushop): def _checkheads(orig, pushop):
if pushop.ui.configbool(experimental, configscratchpush, False): if pushop.ui.configbool(experimental, configscratchpush, False):
return return
return orig(pushop) return orig(pushop)
def _addpartsfromopts(orig, ui, repo, bundler, *args, **kwargs):
""" adds a stream level part to bundle2 storing whether this is an
infinitepush bundle or not
This functionality is hidden behind a config option:
[infinitepush]
bundle-stream = True
"""
if ui.configbool('infinitepush', 'bundle-stream', False):
bundler.addparam('infinitepush', True)
return orig(ui, repo, bundler, *args, **kwargs)
def wireprotolistkeyspatterns(repo, proto, namespace, patterns): def wireprotolistkeyspatterns(repo, proto, namespace, patterns):
patterns = wireproto.decodelist(patterns) patterns = wireproto.decodelist(patterns)
d = repo.listkeys(encoding.tolocal(namespace), patterns).iteritems() d = repo.listkeys(encoding.tolocal(namespace), patterns).iteritems()
return pushkey.encodekeys(d) return pushkey.encodekeys(d)
def localrepolistkeys(orig, self, namespace, patterns=None): def localrepolistkeys(orig, self, namespace, patterns=None):
if namespace == 'bookmarks' and patterns: if namespace == 'bookmarks' and patterns:
index = self.bundlestore.index index = self.bundlestore.index
log(scratchbranchparttype, eventtype='failure', log(scratchbranchparttype, eventtype='failure',
elapsedms=(time.time() - parthandlerstart) * 1000, elapsedms=(time.time() - parthandlerstart) * 1000,
errormsg=str(e)) errormsg=str(e))
raise raise
finally: finally:
if bundle: if bundle:
bundle.close() bundle.close()
@bundle2.b2streamparamhandler('infinitepush')
def processinfinitepush(unbundler, param, value):
""" process the bundle2 stream level parameter containing whether this push
is an infinitepush or not. """
if value and unbundler.ui.configbool('infinitepush',
'bundle-stream', False):
pass
@bundle2.parthandler(scratchbranchparttype, @bundle2.parthandler(scratchbranchparttype,
('bookmark', 'bookprevnode' 'create', 'force', ('bookmark', 'bookprevnode' 'create', 'force',
'pushbackbookmarks', 'cgversion')) 'pushbackbookmarks', 'cgversion'))
def bundle2scratchbranch(op, part): def bundle2scratchbranch(op, part):
'''unbundle a bundle2 part containing a changegroup to store''' '''unbundle a bundle2 part containing a changegroup to store'''
bundler = bundle2.bundle20(op.repo.ui) bundler = bundle2.bundle20(op.repo.ui)
cgversion = part.params.get('cgversion', '01') cgversion = part.params.get('cgversion', '01')