Mercurial > evolve
annotate tests/test-check-flake8.t @ 3805:2410e7063692
evolve: implement resolution of content-divergence when on differet parents
This patch implements the basic version of resolution of content-divergence
changesets when they are on different parents but one of the parent is gca of
both the different parents.
The functionality first relocates the divergent changeset which was left behind
and then resolves the content-divergence like it resolves in normal cases.
This is a very basic implementation because it still does not work on
interrupted evolution. Test changes in this patch shows the basic functionality
working. The output of dry-run is also required to be tweaked in such cased.
Upcoming patches will add more tests and will improve the implementation to work
during conflicts too.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 01 Jun 2018 19:52:06 +0530 |
parents | b3dbba6e34c9 |
children | f354de498737 |
rev | line source |
---|---|
2038
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
1 #require test-repo |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
2 |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
3 $ checkflake8() { |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
4 > if ! (which flake8 > /dev/null); then |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
5 > echo skipped: missing tool: flake8; |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
6 > exit 80; |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
7 > fi; |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
8 > }; |
a4b09789117a
tests: split pyflake and flake8 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2037
diff
changeset
|
9 $ checkflake8 |
1930 | 10 |
11 Copied from Mercurial core (60ee2593a270) | |
12 | |
13 $ cd "`dirname "$TESTDIR"`" | |
14 | |
2002 | 15 run flake8 if it exists; if it doesn't, then just skip |
16 | |
3390
b3dbba6e34c9
evolve: start vendoring third party package cbor
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2121
diff
changeset
|
17 $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \ |
b3dbba6e34c9
evolve: start vendoring third party package cbor
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2121
diff
changeset
|
18 > -X hgext3rd/evolve/thirdparty \ |
b3dbba6e34c9
evolve: start vendoring third party package cbor
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2121
diff
changeset
|
19 > 2>/dev/null \ |
2108
206066375dcb
checks: update pyflakes matching too
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2038
diff
changeset
|
20 > | xargs -0 flake8 |