Mercurial > hg
annotate contrib/heptapod-ci.yml @ 45761:341e014fe0fb stable
repoview: only pin obsolete wdir parents while there are unresolved conflicts
I noticed after doing an update from an obsolete revision with a dirty wdir that
the obsolete commit stayed visible for no obvious reason. It was decided in
85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in
order to allow re-resolving. Since the point of pinning the obsolete parents
was to allow resolving in the first place (aaeccdb6e654), it makes sense to also
gate it on whether or not there are any remaining files to resolve. This might
result in pinning again if files are marked unresolved again, but that seems
reasonable, given that it still solves the original issue.
Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is
likely to cause complaints about pushing multiple heads or other unexpected
errors. So the faster it comes out of that state, the better.
Differential Revision: https://phab.mercurial-scm.org/D9248
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 23 Oct 2020 22:20:08 -0400 |
parents | e604a3c03ab9 |
children | 063cf294d5e0 |
rev | line source |
---|---|
44249
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 image: octobus/ci-mercurial-core |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 # The runner made a clone as root. |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 # We make a new clone owned by user used to run the step. |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 before_script: |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 - hg clone . /tmp/mercurial-ci/ --noupdate |
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'` |
45051
93e8e6e0b5fb
heptapod-ci: build rhg before tests run
Antoine Cezar <antoine.cezar@octobus.net>
parents:
44936
diff
changeset
|
8 - cd /tmp/mercurial-ci/rust/rhg |
93e8e6e0b5fb
heptapod-ci: build rhg before tests run
Antoine Cezar <antoine.cezar@octobus.net>
parents:
44936
diff
changeset
|
9 - cargo build |
44249
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 - cd /tmp/mercurial-ci/ |
44499
daf083140b5b
heptapod-ci: fix test paths in the listing file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44472
diff
changeset
|
11 - ls -1 tests/test-check-*.* > /tmp/check-tests.txt |
44249
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
13 variables: |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
14 PYTHON: python |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
15 TEST_HGMODULEPOLICY: "allow" |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
16 |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
17 .runtests_template: &runtests |
44249
8b1dd3f42396
heptapod-ci: add a basic file to be able to run tests with heptapod
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 script: |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
19 - echo "python used, $PYTHON" |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
20 - echo "$RUNTEST_ARGS" |
44472
b7760c2d33de
heptapod-ci: run the test from outside the test directory
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44430
diff
changeset
|
21 - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
22 |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
23 checks-py2: |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
24 <<: *runtests |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
25 variables: |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
26 RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
27 |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
28 checks-py3: |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
29 <<: *runtests |
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
30 variables: |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
31 RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" |
44251
2aa2408e7515
heptapod-ci: run test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44250
diff
changeset
|
32 PYTHON: python3 |
44252
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
33 |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
34 rust-cargo-test-py2: &rust_cargo_test |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
35 script: |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
36 - echo "python used, $PYTHON" |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
37 - make rust-tests |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
38 |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
39 rust-cargo-test-py3: |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
40 <<: *rust_cargo_test |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
41 variables: |
5fd43c788943
heptapod-ci: also run the dedicated rust test for the rust code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44251
diff
changeset
|
42 PYTHON: python3 |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
43 |
45609
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
44 rust-cargo-test-py3-dirstate-tree: |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
45 <<: *rust_cargo_test |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
46 variables: |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
47 PYTHON: python3 |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
48 HG_RUST_FEATURES: dirstate-tree |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
49 |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
50 test-py2: |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
51 <<: *runtests |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
52 variables: |
44490
b3991b72d9f1
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44430
diff
changeset
|
53 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt" |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
54 TEST_HGMODULEPOLICY: "c" |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
55 |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
56 test-py3: |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
57 <<: *runtests |
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
58 variables: |
44490
b3991b72d9f1
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44430
diff
changeset
|
59 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt" |
44253
8814308e83bb
heptapod-ci: run the normal test suite
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44252
diff
changeset
|
60 PYTHON: python3 |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
61 TEST_HGMODULEPOLICY: "c" |
44254
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
62 |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
63 test-py2-pure: |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
64 <<: *runtests |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
65 variables: |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
66 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
67 TEST_HGMODULEPOLICY: "py" |
44254
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
68 |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
69 test-py3-pure: |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
70 <<: *runtests |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
71 variables: |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
72 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" |
6733c565ca46
heptapod-ci: run the --pure test too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44253
diff
changeset
|
73 PYTHON: python3 |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
74 TEST_HGMODULEPOLICY: "py" |
44255
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
75 |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
76 test-py2-rust: |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
77 <<: *runtests |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
78 variables: |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
79 HGWITHRUSTEXT: cpython |
44490
b3991b72d9f1
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44430
diff
changeset
|
80 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
81 TEST_HGMODULEPOLICY: "rust+c" |
44255
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
82 |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
83 test-py3-rust: |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
84 <<: *runtests |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
85 variables: |
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
86 HGWITHRUSTEXT: cpython |
44490
b3991b72d9f1
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44430
diff
changeset
|
87 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" |
44255
541a509a47a8
heptapod-ci: add a job to test the rust version of Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44254
diff
changeset
|
88 PYTHON: python3 |
44430
4bd35d25903f
heptapod-ci: use strict module policy
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44255
diff
changeset
|
89 TEST_HGMODULEPOLICY: "rust+c" |
44936
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
90 |
45609
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
91 test-py3-rust-dirstate-tree: |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
92 <<: *runtests |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
93 variables: |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
94 HGWITHRUSTEXT: cpython |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
95 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
96 PYTHON: python3 |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
97 TEST_HGMODULEPOLICY: "rust+c" |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
98 HG_RUST_FEATURES: "dirstate-tree" |
e604a3c03ab9
rust: introduce `dirstate-tree` cargo feature
Raphaël Gomès <rgomes@octobus.net>
parents:
45051
diff
changeset
|
99 |
44936
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
100 test-py2-chg: |
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
101 <<: *runtests |
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
102 variables: |
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
103 RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" |
aa568b6c6a10
heptapod-ci: also run tests for chg on python 2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44577
diff
changeset
|
104 TEST_HGMODULEPOLICY: "c" |