##// END OF EJS Templates
fix: add a -s option to format a revision and its descendants...
fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287

File last commit:

r45050:daf08314 stable
r45064:5205b46b default
Show More
heptapod-ci.yml
82 lines | 2.1 KiB | text/x-yaml | YamlLexer
heptapod-ci: add a basic file to be able to run tests with heptapod...
r44752 image: octobus/ci-mercurial-core
# The runner made a clone as root.
# We make a new clone owned by user used to run the step.
before_script:
- hg clone . /tmp/mercurial-ci/ --noupdate
- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
- cd /tmp/mercurial-ci/
heptapod-ci: run the normal test suite...
r44756 - (cd tests; ls -1 test-check-*.*) > /tmp/check-tests.txt
heptapod-ci: add a basic file to be able to run tests with heptapod...
r44752
heptapod-ci: run test with python3 too...
r44754 variables:
PYTHON: python
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "allow"
heptapod-ci: run test with python3 too...
r44754
.runtests_template: &runtests
heptapod-ci: add a basic file to be able to run tests with heptapod...
r44752 script:
- cd tests/
heptapod-ci: run test with python3 too...
r44754 - echo "python used, $PYTHON"
heptapod-ci: run the normal test suite...
r44756 - echo "$RUNTEST_ARGS"
heptapod-ci: use strict module policy...
r44926 - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" run-tests.py --color=always $RUNTEST_ARGS
heptapod-ci: run test with python3 too...
r44754
checks-py2:
<<: *runtests
heptapod-ci: run the normal test suite...
r44756 variables:
RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
heptapod-ci: run test with python3 too...
r44754
checks-py3:
<<: *runtests
variables:
heptapod-ci: run the normal test suite...
r44756 RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
heptapod-ci: run test with python3 too...
r44754 PYTHON: python3
heptapod-ci: also run the dedicated rust test for the rust code...
r44755
rust-cargo-test-py2: &rust_cargo_test
script:
- echo "python used, $PYTHON"
- make rust-tests
rust-cargo-test-py3:
<<: *rust_cargo_test
variables:
PYTHON: python3
heptapod-ci: run the normal test suite...
r44756
test-py2:
<<: *runtests
variables:
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
r44974 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "c"
heptapod-ci: run the normal test suite...
r44756
test-py3:
<<: *runtests
variables:
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
r44974 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
heptapod-ci: run the normal test suite...
r44756 PYTHON: python3
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "c"
heptapod-ci: run the --pure test too...
r44757
test-py2-pure:
<<: *runtests
variables:
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "py"
heptapod-ci: run the --pure test too...
r44757
test-py3-pure:
<<: *runtests
variables:
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
PYTHON: python3
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "py"
heptapod-ci: add a job to test the rust version of Mercurial...
r44758
test-py2-rust:
<<: *runtests
variables:
HGWITHRUSTEXT: cpython
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
r44974 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "rust+c"
heptapod-ci: add a job to test the rust version of Mercurial...
r44758
test-py3-rust:
<<: *runtests
variables:
HGWITHRUSTEXT: cpython
heptapod-ci: use the new `--rust/--no-rust` flag to run the tests
r44974 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
heptapod-ci: add a job to test the rust version of Mercurial...
r44758 PYTHON: python3
heptapod-ci: use strict module policy...
r44926 TEST_HGMODULEPOLICY: "rust+c"