comparison hgext3rd/topic/discovery.py @ 3917:ca7f02c9fa57 stable

compat: improve detection of Mercurial 4.6 fixed case where AttributeError can be thrown when importing wireproto
author Andrew Fischer <andrew@apastron.co>
date Tue, 31 Jul 2018 07:38:37 -0500
parents 415c872d3308
children 119fced5a891
comparison
equal deleted inserted replaced
3916:b103685a082b 3917:ca7f02c9fa57
14 ) 14 )
15 15
16 try: 16 try:
17 from mercurial import wireproto 17 from mercurial import wireproto
18 wireproto.branchmap 18 wireproto.branchmap
19 except ImportError: # <= hg-4.5 19 except (AttributeError, ImportError): # <= hg-4.5
20 from mercurial import wireprotov1server as wireproto 20 from mercurial import wireprotov1server as wireproto
21 21
22 def _headssummary(orig, pushop, *args, **kwargs): 22 def _headssummary(orig, pushop, *args, **kwargs):
23 # In mercurial > 4.3, we receive the pushop as arguments 23 # In mercurial > 4.3, we receive the pushop as arguments
24 repo = pushop.repo.unfiltered() 24 repo = pushop.repo.unfiltered()