comparison mercurial/exchange.py @ 24638:13a19717ade6

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.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Apr 2015 12:35:07 -0700
parents 3b7088a5c64c
children 60fecc5b14a4
comparison
equal deleted inserted replaced
24637:c1cb6523e968 24638:13a19717ade6
982 remoteversions = bundle2.obsmarkersversion(remotecaps) 982 remoteversions = bundle2.obsmarkersversion(remotecaps)
983 if obsolete.commonversion(remoteversions) is not None: 983 if obsolete.commonversion(remoteversions) is not None:
984 kwargs['obsmarkers'] = True 984 kwargs['obsmarkers'] = True
985 pullop.stepsdone.add('obsmarkers') 985 pullop.stepsdone.add('obsmarkers')
986 _pullbundle2extraprepare(pullop, kwargs) 986 _pullbundle2extraprepare(pullop, kwargs)
987 if kwargs.keys() == ['format']:
988 return # nothing to pull
989 bundle = pullop.remote.getbundle('pull', **kwargs) 987 bundle = pullop.remote.getbundle('pull', **kwargs)
990 try: 988 try:
991 op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction) 989 op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction)
992 except error.BundleValueError, exc: 990 except error.BundleValueError, exc:
993 raise util.Abort('missing support for %s' % exc) 991 raise util.Abort('missing support for %s' % exc)