--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitlab-ci.yml Sat Oct 05 13:50:05 2019 -0400
@@ -0,0 +1,12 @@
+flake8:
+ script:
+ - pip install --user flake8
+ - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 ~/.local/bin/flake8
+tests:
+ script:
+ - echo $PWD
+ - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+ - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/
+ - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`
+ - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py -j 3)
+ - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
--- a/.hgtags Fri Sep 27 13:03:14 2019 +0200
+++ b/.hgtags Sat Oct 05 13:50:05 2019 -0400
@@ -81,3 +81,4 @@
05c9dcf5512ed77490a35b4d6b1c3fe860259f48 8.5.1
756db65030c64b22836fe236d1db3b95477e3ef7 9.0.0
6f37fdad7ac123ca0a76872ac4639bd1f3c248f7 9.1.0
+40795751be1c329ec23202ecd79ba45623e1df66 9.2.0
--- a/CHANGELOG Fri Sep 27 13:03:14 2019 +0200
+++ b/CHANGELOG Sat Oct 05 13:50:05 2019 -0400
@@ -1,6 +1,11 @@
Changelog
=========
+9.2.1 -- 2019-10-05
+-------------------
+
+ * setup: fix install on python 3
+
9.2.0 -- 2019-09-28
-------------------
--- a/MANIFEST.in Fri Sep 27 13:03:14 2019 +0200
+++ b/MANIFEST.in Sat Oct 05 13:50:05 2019 -0400
@@ -2,6 +2,7 @@
exclude .hg-format-source
recursive-exclude contrib *
exclude hgext3rd/evolve/hack
+exclude .gitlab-ci.yml
recursive-exclude hgext3rd/evolve/hack *
exclude hgext3rd/evolve/legacy.py
exclude Makefile
--- a/README Fri Sep 27 13:03:14 2019 +0200
+++ b/README Sat Oct 05 13:50:05 2019 -0400
@@ -14,7 +14,7 @@
This extension:
-* enables the “changeset evolution” feature of Mercurial core,
+* enables the "changeset evolution" feature of Mercurial core,
* provides a set of commands to mutate your history,
--- a/debian/changelog Fri Sep 27 13:03:14 2019 +0200
+++ b/debian/changelog Sat Oct 05 13:50:05 2019 -0400
@@ -1,3 +1,9 @@
+mercurial-evolve (9.2.1-1) UNRELEASED; urgency=medium
+
+ * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sat, 05 Oct 2019 13:48:02 -0400
+
mercurial-evolve (9.2.0-1) unstable; urgency=medium
* new upstream release
--- a/hgext3rd/evolve/metadata.py Fri Sep 27 13:03:14 2019 +0200
+++ b/hgext3rd/evolve/metadata.py Sat Oct 05 13:50:05 2019 -0400
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-__version__ = b'9.2.0'
+__version__ = b'9.2.1'
testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
minimumhgversion = b'4.5'
buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Fri Sep 27 13:03:14 2019 +0200
+++ b/hgext3rd/topic/__init__.py Sat Oct 05 13:50:05 2019 -0400
@@ -187,7 +187,7 @@
b'topic.active': b'green',
}
-__version__ = b'0.17.0'
+__version__ = b'0.17.1'
testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
minimumhgversion = b'4.5'
--- a/setup.py Fri Sep 27 13:03:14 2019 +0200
+++ b/setup.py Sat Oct 05 13:50:05 2019 -0400
@@ -13,7 +13,7 @@
def get_version():
'''Read version info from a file without importing it'''
- return get_metadata()['__version__']
+ return u'%s' % get_metadata()['__version__']
def min_hg_version():
'''Read version info from a file without importing it'''
@@ -28,6 +28,9 @@
'hgext3rd.evolve.thirdparty',
'hgext3rd.topic',
]
+py_packagedir = {
+ 'hgext3rd': join(dirname(__file__), 'hgext3rd')
+}
py_versions = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4'
@@ -44,10 +47,11 @@
maintainer_email='pierre-yves.david@ens-lyon.org',
url='https://www.mercurial-scm.org/doc/evolution/',
description='Flexible evolution of Mercurial history.',
- long_description=open('README').read(),
+ long_description=open(join(dirname(__file__), 'README')).read(),
keywords='hg mercurial',
license='GPLv2+',
py_modules=py_modules,
packages=py_packages,
+ package_dir=py_packagedir,
python_requires=py_versions
)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-version-install.t Sat Oct 05 13:50:05 2019 -0400
@@ -0,0 +1,24 @@
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
+
+Test outputting version number
+
+ $ hg version -v
+ Mercurial Distributed SCM (version *) (glob)
+ (see https://mercurial-scm.org for more information)
+
+ Copyright (C) 2005-* Matt Mackall and others (glob)
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ Enabled extensions:
+
+ evolve external * (glob)
+
+Test install
+TODO: fix warning
+ $ "$PYTHON" "$TESTDIR/../setup.py" install --root "$TESTTMP/installtest" > /dev/null
+ */distutils/dist.py:*: UserWarning: Unknown distribution option: 'python_requires' (glob)
+ warnings.warn(msg)