diff hgext3rd/topic/discovery.py @ 3678:d725fe3e3989

topic: handle wireproto module change from b4d85bc122bd This module have been scattered in other place, so we need to detect and handle this for 4.6+
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 19 Apr 2018 10:50:24 +0200
parents 9d9ff55d1bb1
children 415c872d3308
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py	Wed Apr 18 22:36:54 2018 -0700
+++ b/hgext3rd/topic/discovery.py	Thu Apr 19 10:50:24 2018 +0200
@@ -11,9 +11,14 @@
     exchange,
     extensions,
     util,
-    wireproto,
 )
 
+try:
+    from mercurial import wireproto
+    wireproto.branchmap
+except ImportError: # <= hg-4.5
+    from mercurial import wireprotov1server as wireproto
+
 def _headssummary(orig, *args):
     # In mercurial < 4.2, we receive repo, remote and outgoing as arguments
     pushop = None