# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1488898162 -3600
# Node ID fd8a7e10b7b3e9b072e8c92fe9c39e0819e55672
# Parent  91f56a7ee4b29279a470ef701e1d7c0580ed9e4a
discovery: directly merge the 'obsdiscovery' exthelper in top level extensions

There is no reason to proxy it through the 'obsexchange' submodule.

diff -r 91f56a7ee4b2 -r fd8a7e10b7b3 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Tue Mar 07 15:47:09 2017 +0100
+++ b/hgext3rd/evolve/__init__.py	Tue Mar 07 15:49:22 2017 +0100
@@ -111,6 +111,7 @@
 from mercurial.node import nullid
 
 from . import (
+    obsdiscovery,
     obsexchange,
     exthelper,
     metadata,
@@ -148,6 +149,7 @@
 
 
 eh = exthelper.exthelper()
+eh.merge(obsdiscovery.eh)
 eh.merge(obsexchange.eh)
 uisetup = eh.final_uisetup
 extsetup = eh.final_extsetup
diff -r 91f56a7ee4b2 -r fd8a7e10b7b3 hgext3rd/evolve/obsexchange.py
--- a/hgext3rd/evolve/obsexchange.py	Tue Mar 07 15:47:09 2017 +0100
+++ b/hgext3rd/evolve/obsexchange.py	Tue Mar 07 15:49:22 2017 +0100
@@ -41,7 +41,6 @@
 )
 
 eh = exthelper.exthelper()
-eh.merge(obsdiscovery.eh)
 obsexcmsg = utility.obsexcmsg
 obsexcprg = utility.obsexcprg
 
diff -r 91f56a7ee4b2 -r fd8a7e10b7b3 hgext3rd/evolve/serveronly.py
--- a/hgext3rd/evolve/serveronly.py	Tue Mar 07 15:47:09 2017 +0100
+++ b/hgext3rd/evolve/serveronly.py	Tue Mar 07 15:49:22 2017 +0100
@@ -17,6 +17,7 @@
     from . import (
         exthelper,
         metadata,
+        obsdiscovery,
         obsexchange,
     )
 except ValueError as exc:
@@ -27,6 +28,7 @@
     from evolve import (
         exthelper,
         metadata,
+        obsdiscovery,
         obsexchange,
     )
 
@@ -36,6 +38,7 @@
 buglink = metadata.buglink
 
 eh = exthelper.exthelper()
+eh.merge(obsdiscovery.eh)
 eh.merge(obsexchange.eh)
 uisetup = eh.final_uisetup
 extsetup = eh.final_extsetup