Mercurial > evolve
changeset 6155:5bd5a7ab32d3
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 25 Feb 2022 01:52:58 +0300 |
| parents | 74665d83fb3b (current diff) e2804c9ebd72 (diff) |
| children | 47f1a6bea77f |
| files | hgext3rd/evolve/metadata.py hgext3rd/pullbundle.py hgext3rd/topic/__init__.py |
| diffstat | 7 files changed, 52 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Mon Feb 21 18:26:25 2022 +0300 +++ b/.gitlab-ci.yml Fri Feb 25 01:52:58 2022 +0300 @@ -11,13 +11,13 @@ script: - *prepare_hg - pytype --version - - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()') + - jobs=$(python3 -c 'import multiprocessing; print(multiprocessing.cpu_count())') - pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true when: manual variables: - PY: py2 - PYTHON: python + PY: py3 + PYTHON: python3 RUNTEST_ARGS: "" TEST_HGMODULEPOLICY: "allow" @@ -33,40 +33,40 @@ checks-py2: <<: *runtests variables: + PY: py2 + PYTHON: python2 RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" checks-py3: <<: *runtests variables: - PY: py3 - PYTHON: python3 RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" tests-py2-cext: <<: *runtests variables: + PY: py2 + PYTHON: python2 RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py2-pure: <<: *runtests variables: + PY: py2 + PYTHON: python2 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "py" tests-py3-cext: <<: *runtests variables: - PY: py3 - PYTHON: python3 RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py3-pure: <<: *runtests variables: - PY: py3 - PYTHON: python3 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "py" @@ -76,9 +76,7 @@ - make doc variables: LANG: en_US.UTF-8 - PYTHON: python3 PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH" - SPHINXBUILD: python3 -m sphinx -b html artifacts: paths: - html/* @@ -120,3 +118,28 @@ RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt" TEST_HGMODULEPOLICY: "c" when: manual + +deb: + image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd + script: + - apt-get update && apt-get -yq install devscripts equivs --no-install-recommends + - mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control + - version=$($PYTHON setup.py --version) + - debversion="$version+hg$(date +%Y%m%d)+$(hg log -r . -T '{node|short}')" + - make deb-prepare + - mkdir -p debs + - mv ../mercurial-evolve_$version.orig debs/mercurial-evolve_$debversion.orig + - cd debs/mercurial-evolve_$debversion.orig + - DEBEMAIL="evolve-testers@mercurial-scm.org" debchange --newversion "$debversion-1" "automated build" + - debuild --unsigned-source --unsigned-changes --build=binary + - dpkg --contents ../mercurial-evolve_$debversion-1_all.deb + variables: + DEBIAN_FRONTEND: noninteractive + DEB_BUILD_OPTIONS: nocheck nodoc + artifacts: + paths: + - debs/*.build + - debs/*.buildinfo + - debs/*.changes + - debs/*.deb + when: manual
--- a/.hgtags Mon Feb 21 18:26:25 2022 +0300 +++ b/.hgtags Fri Feb 25 01:52:58 2022 +0300 @@ -98,3 +98,4 @@ cca465bf6a6a103449aa58deecdffba8e546f7c6 10.3.3 de530d27554b43c00509696dc7a1496f5129e1a4 10.4.0 64bb9c4a13d388233d4d6d9b761ece9c6ce77fb3 10.4.1 +0d53a8d4170b32d03e4fd8582b32fe2790d5e34f 10.5.0
--- a/CHANGELOG Mon Feb 21 18:26:25 2022 +0300 +++ b/CHANGELOG Fri Feb 25 01:52:58 2022 +0300 @@ -1,9 +1,11 @@ Changelog ========= -10.5.0 - in progress +10.5.0 -- 2022-02-23 -------------------- + * compatibility with Mercurial 6.1 + * evolve: handle cases when working directory parent has multiple successors * multiple commands: do not check for new divergence if divergence is allowed via configuration @@ -15,6 +17,8 @@ topic (0.24.0) + * compatibility with Mercurial 6.1 + * topic: make histedit preserve topics when the first changeset in a stack is rewritten (issue6550)
--- a/debian/changelog Mon Feb 21 18:26:25 2022 +0300 +++ b/debian/changelog Fri Feb 25 01:52:58 2022 +0300 @@ -1,3 +1,9 @@ +mercurial-evolve (10.5.0-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Wed, 23 Feb 2022 17:41:26 +0300 + mercurial-evolve (10.4.1-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Mon Feb 21 18:26:25 2022 +0300 +++ b/hgext3rd/evolve/metadata.py Fri Feb 25 01:52:58 2022 +0300 @@ -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'10.5.0.dev' -testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0' +__version__ = b'10.6.0.dev' +testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' minimumhgversion = b'4.8' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/pullbundle.py Mon Feb 21 18:26:25 2022 +0300 +++ b/hgext3rd/pullbundle.py Fri Feb 25 01:52:58 2022 +0300 @@ -92,8 +92,8 @@ from mercurial.i18n import _ -__version__ = b'0.1.3.dev' -testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9' +__version__ = b'0.2.0.dev' +testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' minimumhgversion = b'4.8' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Mon Feb 21 18:26:25 2022 +0300 +++ b/hgext3rd/topic/__init__.py Fri Feb 25 01:52:58 2022 +0300 @@ -231,9 +231,9 @@ b'log.topic': b'green_background', } -__version__ = b'0.24.0.dev' +__version__ = b'0.25.0.dev' -testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0' +testedwith = b'4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' minimumhgversion = b'4.8' buglink = b'https://bz.mercurial-scm.org/'