Mercurial > evolve
annotate .gitlab-ci.yml @ 5010:effce0a1f5bd
tests: demonstrate how evolve loses transitive copies when interrupted
Let's say `b` has been renamed to `c` in commit A and then renamed
to `d` in commit B. We now modify A in a way that will cause a
conflict when we evolve B. `hg evolve` will now stop and let the user
resolve the conflicts, but it will have lost the copy information in
the working copy (should still be c->d).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 19 Nov 2019 14:24:31 -0800 |
parents | 1214f3d085a9 |
children | 43b448bb1a57 |
rev | line source |
---|---|
4873
91116cec0a67
gitlab-ci: basic test with flake8
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 flake8: |
4923
d18908c5642a
heptapod-ci: point to our own docker images
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4874
diff
changeset
|
2 image: octobus/ci-py2-hgext3rd |
4873
91116cec0a67
gitlab-ci: basic test with flake8
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 script: |
4923
d18908c5642a
heptapod-ci: point to our own docker images
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4874
diff
changeset
|
4 - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 flake8 |
4926
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
5 |
4925
dbeb04ee6679
heptapod-ci: add a --pure variant for the CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4924
diff
changeset
|
6 tests-py2-cext: |
4923
d18908c5642a
heptapod-ci: point to our own docker images
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4874
diff
changeset
|
7 image: octobus/ci-py2-hgext3rd |
4874
ab0d09c93532
gitlab-ci: be bold and try to run the full test in them
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4873
diff
changeset
|
8 script: |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
9 - hg pull -R /ci/repos/mercurial/ |
4966
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
10 - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')") |
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
11 - hg -R /ci/repos/mercurial/ update "$hg_rev" |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
12 - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always) |
4925
dbeb04ee6679
heptapod-ci: add a --pure variant for the CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4924
diff
changeset
|
13 |
dbeb04ee6679
heptapod-ci: add a --pure variant for the CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4924
diff
changeset
|
14 tests-py2-pure: |
dbeb04ee6679
heptapod-ci: add a --pure variant for the CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4924
diff
changeset
|
15 image: octobus/ci-py2-hgext3rd |
dbeb04ee6679
heptapod-ci: add a --pure variant for the CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4924
diff
changeset
|
16 script: |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
17 - hg pull -R /ci/repos/mercurial/ |
4966
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
18 - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')") |
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
19 - hg -R /ci/repos/mercurial/ update "$hg_rev" |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
20 - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure) |
4926
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
21 |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
22 tests-py3-cext: |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
23 image: octobus/ci-py3-hgext3rd |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
24 script: |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
25 - hg pull -R /ci/repos/mercurial/ |
4966
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
26 - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')") |
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
27 - hg -R /ci/repos/mercurial/ update "$hg_rev" |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
28 - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always) |
4926
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
29 |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
30 tests-py3-pure: |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
31 image: octobus/ci-py3-hgext3rd |
0fad1d376814
heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4925
diff
changeset
|
32 script: |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
33 - hg pull -R /ci/repos/mercurial/ |
4966
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
34 - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')") |
4f3c87584a4a
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
Anton Shestakov <av6@dwimlabs.net>
parents:
4959
diff
changeset
|
35 - hg -R /ci/repos/mercurial/ update "$hg_rev" |
4959
edc29a909339
heptapod-ci: simpler CI
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4958
diff
changeset
|
36 - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure) |
4986
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
37 |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
38 doc: |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
39 image: octobus/ci-py2-evolve-doc |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
40 script: |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
41 - cd docs/ |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
42 - make |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
43 variables: |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
44 LANG: en_us.UTF-8 |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
45 artifacts: |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
46 paths: |
1214f3d085a9
ci: add job to build and archive the documentation
Boris Feld <boris.feld@octobus.net>
parents:
4966
diff
changeset
|
47 - html/* |