Mercurial > hg
annotate tests/test-check-rust-format.t @ 46758:7f6c002d7c0a
split: close transaction in the unlikely event of a conflict while rebasing
`hg split` *should* never result in conflicts, but in case there are
bugs, we should at least commit the transaction so they can continue
the rebase. One of our users ran into the regression fixed by
D10120. They fixed the conflict and the tried to continue the rebase,
but it failed with "abort: cannot continue inconsistent rebase"
because the rebase state referred to commits written in a transaction
that was never committed.
Side note: `hg split` should probably turn off copy tracing to reduce
the impact of such bugs, and to speed it up as well. Copies made in
the rebased commits should still be respected because `hg rebase`
calls `copies.graftcopies()`.
Differential Revision: https://phab.mercurial-scm.org/D10164
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Mar 2021 09:15:40 -0800 |
parents | d42809b6b10f |
children | 9ebc10ad4a04 |
rev | line source |
---|---|
43819
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 #require rustfmt test-repo |
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 |
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 |
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 $ cd "$TESTDIR"/.. |
45987
d42809b6b10f
rust-format: pin the formatted to a specific nightly version
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44732
diff
changeset
|
6 $ RUSTFMT=$(rustup which --toolchain nightly-2020-10-04 rustfmt) |
43819
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
7 $ for f in `testrepohg files 'glob:**/*.rs'` ; do |
44732
f44a7d8660ea
test-check-rust-format: specify --edition=2018
Yuya Nishihara <yuya@tcha.org>
parents:
43819
diff
changeset
|
8 > $RUSTFMT --check --edition=2018 --unstable-features --color=never $f |
43819
e8a3bbffdc7d
tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
9 > done |