Mercurial > evolve
changeset 2063:fd8a7e10b7b3
discovery: directly merge the 'obsdiscovery' exthelper in top level extensions
There is no reason to proxy it through the 'obsexchange' submodule.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 07 Mar 2017 15:49:22 +0100 |
| parents | 91f56a7ee4b2 |
| children | 1f318a1674fd |
| files | hgext3rd/evolve/__init__.py hgext3rd/evolve/obsexchange.py hgext3rd/evolve/serveronly.py |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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