Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discovery: directly merge the 'obsdiscovery' exthelper in top level extensions
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Tue, 07 Mar 2017 15:49:22 +0100
changeset 2063 fd8a7e10b7b3
parent 2062 91f56a7ee4b2
child 2064 1f318a1674fd
discovery: directly merge the 'obsdiscovery' exthelper in top level extensions There is no reason to proxy it through the 'obsexchange' submodule.
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions
hgext3rd/evolve/obsexchange.py file | annotate | diff | comparison | revisions
hgext3rd/evolve/serveronly.py file | annotate | diff | comparison | revisions 
--- 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
--- 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
 
--- 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
evolve