Mercurial > hg > evolve
changeset 1904:202ac6c94b7f
hgext3rd: move 'simple4server' as 'evolve.serveronly'
We also more the server only extension into hgext3rd. We makes it a python
sub-module of evolve for two reasons:
* less polution in the hgext3rd namespace,
* this make it possible to share the code between 'evolve' and
'evolve.serveronly' instead of duplicating it.
note that we now install the extension too
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 01 Nov 2016 16:07:28 +0100 |
| parents | a53efee7d8b0 |
| children | 7edd4ceefce0 |
| files | MANIFEST.in hgext/simple4server.py hgext3rd/evolve/serveronly.py setup.py tests/test-simple4server-bundle2.t tests/test-simple4server.t |
| diffstat | 5 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/MANIFEST.in +++ b/MANIFEST.in @@ -15,9 +15,9 @@ include docs/static/*.svg include docs/tutorials/*.t include hgext/__init__.py -include hgext/simple4server.py include hgext3rd/__init__.py include hgext3rd/evolve/__init__.py +include hgext3rd/evolve/serveronly.py include MANIFEST.in include README include setup.py
--- a/setup.py +++ b/setup.py @@ -15,10 +15,11 @@ if "'" in line: return line.split("'")[1] -py_modules = [] +py_modules = [ + 'hgext3rd.evolve.serveronly' +] py_packages = [ 'hgext3rd', - 'hgext3rd.evolve', ] if os.environ.get('INCLUDE_INHIBIT'):
--- a/tests/test-simple4server-bundle2.t +++ b/tests/test-simple4server-bundle2.t @@ -21,7 +21,7 @@ $ hg init server $ echo "[extensions]" >> ./server/.hg/hgrc - $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/simple4server.py" >> ./server/.hg/hgrc + $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/serveronly.py" >> ./server/.hg/hgrc $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS
--- a/tests/test-simple4server.t +++ b/tests/test-simple4server.t @@ -24,7 +24,7 @@ $ hg init server $ echo "[extensions]" >> ./server/.hg/hgrc - $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/simple4server.py" >> ./server/.hg/hgrc + $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/serveronly.py" >> ./server/.hg/hgrc $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS