Mercurial > hg > evolve
changeset 1903:a53efee7d8b0
hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack'
We move them in the 'hgext3rd' package. In the same move we put them under the
'evolve' package for clarity. We use a sub-package 'hack' to make their status
clearer.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 28 Feb 2017 14:36:18 +0100 |
parents | 9f42f819267b |
children | 202ac6c94b7f |
files | MANIFEST.in hgext/directaccess.py hgext/inhibit.py hgext3rd/evolve/hack/__init__.py hgext3rd/evolve/hack/directaccess.py hgext3rd/evolve/hack/inhibit.py setup.py tests/test-inhibit.t |
diffstat | 6 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,7 @@ exclude contrib/nopushpublish.py -exclude hgext/directaccess.py exclude hgext/drophack.py -exclude hgext/inhibit.py exclude hgext/obsolete.py +exclude hgext3rd/evolve/hack/*.py exclude Makefile exclude tests/test-drop.t exclude tests/test-inhibit.t
--- a/setup.py +++ b/setup.py @@ -22,8 +22,8 @@ ] if os.environ.get('INCLUDE_INHIBIT'): - py_modules.append('hgext.inhibit') - py_modules.append('hgext.directaccess') + py_modules.append('hgext3rd.evolve.hack.inhibit') + py_modules.append('hgext3rd.evolve.hack.directaccess') setup( name='hg-evolve',
--- a/tests/test-inhibit.t +++ b/tests/test-inhibit.t @@ -9,8 +9,8 @@ > strip= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH - $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH - $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH + $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH + $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH $ mkcommit() { > echo "$1" > "$1" > hg add "$1" @@ -728,7 +728,7 @@ $ cat >> $HGRCPATH <<EOF > [extensions] > EOF - $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH + $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH Empty commit $ hg amend @@ -781,7 +781,7 @@ cannot use inhibit without the direct access extension (please enable it or inhibit won't work) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext/directaccess.py" >> $HGRCPATH + $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH $ cd .. hg push should not allow directaccess unless forced with --hidden