# HG changeset patch # User Martin von Zweigbergk # Date 2015-04-07 19:35:07 # Node ID 13a19717ade603d8ef384ecc1a9d26500c796900 # Parent c1cb6523e9681f0c3a426ce360ffe2ec03bdece8 exchange: remove check for 'format' key When the 'kwargs' variable was added in 12f161f08d74 (bundle2: allow pulling changegroups using bundle2, 2014-04-01), it could contain only 'bundlecaps', 'common' and 'heads', so the check for 'format' would always be false. Since then, _pullbundle2extraprepare() has been added for hooks, but it seems unlikely that they would a 'format' key. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -984,8 +984,6 @@ def _pullbundle2(pullop): kwargs['obsmarkers'] = True pullop.stepsdone.add('obsmarkers') _pullbundle2extraprepare(pullop, kwargs) - if kwargs.keys() == ['format']: - return # nothing to pull bundle = pullop.remote.getbundle('pull', **kwargs) try: op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction)