Mercurial > hg > evolve

changeset 1902:9f42f819267b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: move the extensions to 'hgext3rd' We have the 'hgext3rd' as the official place for extension for some time now. We start the big migration. This might break some people setup but this is a necessary step to have evolve easily available through pip.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 28 Feb 2017 15:09:03 +0100
parents 7b8195e22050
children a53efee7d8b0
files MANIFEST.in README hgext/evolve.py hgext3rd/__init__.py hgext3rd/evolve/__init__.py setup.py tests/_exc-util.sh tests/test-amend.t tests/test-corrupt.t tests/test-divergent.t tests/test-drop.t tests/test-evolve-bumped.t tests/test-evolve-list.t tests/test-evolve-order.t tests/test-evolve-split.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-import.t tests/test-inhibit.t tests/test-obsconvert.t tests/test-obsolete-push.t tests/test-obsolete.t tests/test-options.t tests/test-prev-next.t tests/test-prune.t tests/test-sharing.t tests/test-simple4server-bundle2.t tests/test-simple4server.t tests/test-split.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-touch.t tests/test-tutorial.t tests/test-uncommit.t tests/test-unstable.t tests/test-userguide.t tests/test-wireproto-bundle1.t tests/test-wireproto.t
diffstat 38 files changed, 47 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,9 +15,10 @@
 include docs/*.rst
 include docs/static/*.svg
 include docs/tutorials/*.t
-include hgext/evolve.py
 include hgext/__init__.py
 include hgext/simple4server.py
+include hgext3rd/__init__.py
+include hgext3rd/evolve/__init__.py
 include MANIFEST.in
 include README
 include setup.py
--- a/README
+++ b/README
@@ -59,6 +59,7 @@
 6.0.0 --
 
   - removed old (unpackaged) pushexperiment extension.
+  - move all extensions in the official 'hgext3rd' namespace package
 
 5.6.0 -- 2017-02-01
 
new file mode 100644
--- /dev/null
+++ b/hgext3rd/__init__.py
@@ -0,0 +1,4 @@
+# name space package to host third party extensions
+from __future__ import absolute_import
+import pkgutil
+__path__ = pkgutil.extend_path(__path__, __name__)
rename from hgext/evolve.py
rename to hgext3rd/evolve/__init__.py
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,10 @@
           if "'" in line:
             return line.split("'")[1]
 
-py_modules = [
-    'hgext.evolve',
+py_modules = []
+py_packages = [
+    'hgext3rd',
+    'hgext3rd.evolve',
 ]
 
 if os.environ.get('INCLUDE_INHIBIT'):
@@ -25,7 +27,7 @@
 
 setup(
     name='hg-evolve',
-    version=get_version('hgext/evolve.py'),
+    version=get_version('hgext3rd/evolve/__init__.py'),
     author='Pierre-Yves David',
     maintainer='Pierre-Yves David',
     maintainer_email='pierre-yves.david@ens-lyon.org',
@@ -34,5 +36,6 @@
     long_description=open('README').read(),
     keywords='hg mercurial',
     license='GPLv2+',
-    py_modules=py_modules
+    py_modules=py_modules,
+    packages=py_packages
 )
--- a/tests/_exc-util.sh
+++ b/tests/_exc-util.sh
@@ -22,7 +22,7 @@
 [extensions]
 hgext.strip=
 EOF
-echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 mkcommit() {
    echo "$1" > "$1"
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -2,7 +2,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ glog() {
   >   hg glog --template '{rev}@{branch}({phase}) {desc|firstline}\n' "$@"
--- a/tests/test-corrupt.t
+++ b/tests/test-corrupt.t
@@ -15,7 +15,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" >> "$1"
   >    hg add "$1"
--- a/tests/test-divergent.t
+++ b/tests/test-divergent.t
@@ -17,7 +17,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-drop.t
+++ b/tests/test-drop.t
@@ -4,7 +4,7 @@
   > hgext.graphlog=
   > EOF
   $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext/drophack.py" >> $HGRCPATH
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-evolve-bumped.t
+++ b/tests/test-evolve-bumped.t
@@ -10,7 +10,7 @@
   adding a
   $ cd ..
 
-  $ evolvepath=$(echo $(dirname $TESTDIR))/hgext/evolve.py
+  $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/
   $ hg clone -U public private
   $ cd private
   $ cat >> .hg/hgrc <<EOF
--- a/tests/test-evolve-list.t
+++ b/tests/test-evolve-list.t
@@ -3,7 +3,7 @@
   > [extensions]
   > rebase=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 Test the instability listing
   $ hg init r2
--- a/tests/test-evolve-order.t
+++ b/tests/test-evolve-order.t
@@ -18,7 +18,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-evolve-split.t
+++ b/tests/test-evolve-split.t
@@ -17,7 +17,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-evolve-topic.t
+++ b/tests/test-evolve-topic.t
@@ -20,7 +20,7 @@
   > rebase = 
   > topic = $HGTEST_TOPICROOT/hgext3rd/topic/
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ mkcommit() {
   >    echo "$1" > "$1"
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -16,7 +16,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -9,7 +9,7 @@
   $ hg init auto-obsolete
   $ cd auto-obsolete
   $ echo '[extensions]' >> $HGRCPATH
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ echo A > a
   $ hg commit -Am A
   adding a
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -8,7 +8,7 @@
   > rebase=
   > strip=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ 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
   $ mkcommit() {
--- a/tests/test-obsconvert.t
+++ b/tests/test-obsconvert.t
@@ -1,7 +1,7 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ hg init alpha
   $ cd alpha
   $ echo foo > foo
--- a/tests/test-obsolete-push.t
+++ b/tests/test-obsolete-push.t
@@ -4,7 +4,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
   $ glog() {
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -9,7 +9,7 @@
   > [extensions]
   > hgext.rebase=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-options.t
+++ b/tests/test-options.t
@@ -3,7 +3,7 @@
   > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ mkcommit() {
   >    echo "$1" > "$1"
--- a/tests/test-prev-next.t
+++ b/tests/test-prev-next.t
@@ -2,7 +2,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 hg prev -B should move active bookmark
   $ hg init
--- a/tests/test-prune.t
+++ b/tests/test-prune.t
@@ -3,7 +3,7 @@
   > logtemplate={rev}:{node|short}[{bookmarks}] ({separate('/', obsolete ,phase)}) {desc|firstline}\n
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ mkcommit() {
   >    echo "$1" > "$1"
--- a/tests/test-sharing.t
+++ b/tests/test-sharing.t
@@ -9,7 +9,7 @@
   > [extensions]
   > rebase =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ hg init public
   $ hg clone public test-repo
   updating to branch default
--- a/tests/test-simple4server-bundle2.t
+++ b/tests/test-simple4server-bundle2.t
@@ -31,7 +31,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat ./errors.log
   $ echo "[extensions]" >> ./client/.hg/hgrc
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> ./client/.hg/hgrc
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> ./client/.hg/hgrc
   $ cp -r client other
 
 Smoke testing
--- a/tests/test-simple4server.t
+++ b/tests/test-simple4server.t
@@ -34,7 +34,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat ./errors.log
   $ echo "[extensions]" >> ./client/.hg/hgrc
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> ./client/.hg/hgrc
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> ./client/.hg/hgrc
   $ cp -r client other
 
 Smoke testing
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -20,7 +20,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -17,7 +17,7 @@
   > touch.args=babar
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ safesed() {
   >   sed "$1" "$2" > `pwd`/sed.temp
--- a/tests/test-stabilize-order.t
+++ b/tests/test-stabilize-order.t
@@ -4,7 +4,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ glog() {
   >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -5,7 +5,7 @@
   > hgext.rebase=
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ glog() {
   >   hg glog --template \
--- a/tests/test-touch.t
+++ b/tests/test-touch.t
@@ -7,7 +7,7 @@
   > [extensions]
   > hgext.rebase=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ hg init repo
   $ cd repo
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -59,7 +59,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > evolve = $TESTDIR/../hgext/evolve.py
+  > evolve = $TESTDIR/../hgext3rd/evolve/
   > # enabling rebase is also needed for now
   > rebase =
   > EOF
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -2,7 +2,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ glog() {
   >   hg glog --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
--- a/tests/test-unstable.t
+++ b/tests/test-unstable.t
@@ -15,7 +15,7 @@
   > [extensions]
   > hgext.graphlog=
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
--- a/tests/test-userguide.t
+++ b/tests/test-userguide.t
@@ -32,7 +32,7 @@
   > [extensions]
   > rebase =
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
 example 3: safe amend with "hg commit --amend" (figure 2)
   $ echo 'tweak feature Y' >> file1.c
--- a/tests/test-wireproto-bundle1.t
+++ b/tests/test-wireproto-bundle1.t
@@ -8,7 +8,7 @@
   > publish = False
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ mkcommit() {
   >    echo "$1" > "$1"
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -11,7 +11,7 @@
   > publish = False
   > [extensions]
   > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
   $ mkcommit() {
   >    echo "$1" > "$1"