Mercurial > evolve
view .gitlab-ci.yml @ 5970:65d4e47d7f26
rewriteutil: use precheck from core if recent enough
This commit makes the evolve extension's `rewriteutil.precheck()`
simply delegate to the same function from Mercurial core, if that
function is deemed recent enough. The way I made that check is by
looking for `rewriteutil.find_new_divergence_from()`. That means that
there's a range of commits (ba6881c6::8125bcd2^) where the user would
see less detailed error messages if they are running with an hg
version from that range (there are no released versions in that
range).
As you can see in the tests, switching to core's version of the
function mostly affects error messages and exit codes.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 04 May 2021 09:40:18 -0700 |
parents | c0ed8e574638 |
children | 8accc5eb0aba 221a2563b02f 97c248f9bb58 |
line wrap: on
line source
.prepare_hg: &prepare_hg - hg pull -R /ci/repos/mercurial/ - hg_branch=$(tests/testlib/map-hg-rev.sh "$(hg identify --branch)") - hg -R /ci/repos/mercurial/ update "$hg_branch" - hg_rev=$(hg log -R /ci/repos/mercurial/ -r . -T '{node}') - echo testing with mercurial branch="$hg_branch", revision="$hg_rev" pytype: image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd script: - *prepare_hg - pytype --version - jobs=$(python -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 RUNTEST_ARGS: "" TEST_HGMODULEPOLICY: "allow" .runtests_template: &runtests image: registry.heptapod.net/mercurial/ci-images/$PY-hgext3rd before_script: - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt) script: - *prepare_hg - ("$PYTHON" --version) - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS) checks-py2: <<: *runtests variables: 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: RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py2-pure: <<: *runtests variables: 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" doc: image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc script: - cd docs/ - make variables: LANG: en_US.UTF-8 PYTHON: python3 PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH" SPHINXBUILD: python3 -m sphinx -b html artifacts: paths: - html/* sdist: stage: .post image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd script: - python3 setup.py sdist artifacts: paths: - dist/* only: - tags