Mercurial > evolve

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py	Tue Jul 31 13:06:20 2018 +0200
+++ b/hgext3rd/topic/discovery.py	Tue Jul 31 07:38:37 2018 -0500
@@ -16,7 +16,7 @@
 try:
     from mercurial import wireproto
     wireproto.branchmap
-except ImportError: # <= hg-4.5
+except (AttributeError, ImportError): # <= hg-4.5
     from mercurial import wireprotov1server as wireproto
 
 def _headssummary(orig, pushop, *args, **kwargs):