Mercurial > evolve

diff hgext3rd/topic/discovery.py @ 3920:202413cab59f mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:53:01 +0200
parents ca7f02c9fa57
children 119fced5a891
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py	Tue Jul 31 12:54:46 2018 +0200
+++ b/hgext3rd/topic/discovery.py	Thu Aug 02 01:53:01 2018 +0200
@@ -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):