# HG changeset patch # User Pierre-Yves David # Date 1488288576 -3600 # Node ID f23a97d148958d254c56910ae62ae5af4838cd75 # Parent 545761a5a5b31011c0cf06bf5fc7b952e3a6dbac compat: drop compat for older wireproto implementation We only support Mercurial version with these attributes. diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -87,15 +87,9 @@ from mercurial import util from mercurial import repair -try: - from mercurial import obsolete - if not obsolete._enabled: - obsolete._enabled = True - from mercurial import wireproto - gboptslist = getattr(wireproto, 'gboptslist', None) - gboptsmap = getattr(wireproto, 'gboptsmap', None) -except (ImportError, AttributeError): - gboptslist = gboptsmap = None +from mercurial import obsolete +if not obsolete._enabled: + obsolete._enabled = True # Flags for enabling optional parts of evolve commandopt = 'allnewcommands' @@ -3684,7 +3678,7 @@ @eh.uisetup def addgetbundleargs(self): - gboptsmap['evo_obscommon'] = 'nodes' + wireproto.gboptsmap['evo_obscommon'] = 'nodes' @eh.wrapfunction(exchange, '_pullbundle2extraprepare') def _addobscommontob2pull(orig, pullop, kwargs):