# HG changeset patch # User Pierre-Yves David # Date 1524127824 -7200 # Node ID d725fe3e39895447f1be2d714fe2418a95dab39a # Parent 60d396d3da80a59d827aa82c872b36540d7e97a2 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+ diff -r 60d396d3da80 -r d725fe3e3989 hgext3rd/topic/discovery.py --- 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