annotate tests/test-check-py3-compat.t @ 39285:a3fd84f4fb38

filemerge: fix the wrong placements of messages in prompt Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on D4336. Thanks to Yuya who spotted this. Differential Revision: https://phab.mercurial-scm.org/D4375
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sun, 26 Aug 2018 19:14:26 +0300
parents 3201ea44fe09
children 4cfd1eebe6aa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27279
40eb385f798f tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
1 #require test-repo
40eb385f798f tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
2
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 29195
diff changeset
3 $ . "$TESTDIR/helpers-testrepo.sh"
27279
40eb385f798f tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
4 $ cd "$TESTDIR"/..
40eb385f798f tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
5
33530
05e3fa254b6b demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents: 33204
diff changeset
6 $ testrepohg files 'set:(**.py)' \
05e3fa254b6b demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents: 33204
diff changeset
7 > -X hgdemandimport/demandimportpy2.py \
37127
0e06d8086295 cbor: fix core test-check*
Pulkit Goyal <7895pulkit@gmail.com>
parents: 33918
diff changeset
8 > -X mercurial/thirdparty/cbor \
33530
05e3fa254b6b demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents: 33204
diff changeset
9 > | sed 's|\\|/|g' | xargs $PYTHON contrib/check-py3-compat.py
30435
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
10 contrib/python-zstandard/setup.py not using absolute_import
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
11 contrib/python-zstandard/setup_zstd.py not using absolute_import
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
12 contrib/python-zstandard/tests/common.py not using absolute_import
31796
e0dc40530c5a zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31480
diff changeset
13 contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import
30435
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
14 contrib/python-zstandard/tests/test_compressor.py not using absolute_import
31796
e0dc40530c5a zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31480
diff changeset
15 contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import
30435
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
16 contrib/python-zstandard/tests/test_data_structures.py not using absolute_import
31796
e0dc40530c5a zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31480
diff changeset
17 contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import
30435
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
18 contrib/python-zstandard/tests/test_decompressor.py not using absolute_import
31796
e0dc40530c5a zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31480
diff changeset
19 contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import
30435
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
20 contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
21 contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import
b86a448a2965 zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30333
diff changeset
22 contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import
27279
40eb385f798f tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
23 setup.py not using absolute_import
28583
260ce2eed951 tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents: 28564
diff changeset
24
260ce2eed951 tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents: 28564
diff changeset
25 #if py3exe
33204
ddd65b4f3ae6 tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents: 33116
diff changeset
26 $ testrepohg files 'set:(**.py) - grep(pygments)' \
33530
05e3fa254b6b demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents: 33204
diff changeset
27 > -X hgdemandimport/demandimportpy2.py \
33204
ddd65b4f3ae6 tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents: 33116
diff changeset
28 > -X hgext/fsmonitor/pywatchman \
39128
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
29 > -X mercurial/thirdparty/cbor \
30673
81bf1a686b99 py3: exclude pywatchman from test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30672
diff changeset
30 > | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py \
29810
ceff91dea404 py3: automatically glob out line numbers from check-py3-compat output
Yuya Nishihara <yuya@tcha.org>
parents: 29809
diff changeset
31 > | sed 's/[0-9][0-9]*)$/*)/'
39128
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
32 contrib/python-zstandard/setup.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
33 contrib/python-zstandard/setup_zstd.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
34 contrib/python-zstandard/tests/common.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
35 contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
36 contrib/python-zstandard/tests/test_compressor.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
37 contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
38 contrib/python-zstandard/tests/test_data_structures.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
39 contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
40 contrib/python-zstandard/tests/test_decompressor.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
41 contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
42 contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
43 contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
44 contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import
3201ea44fe09 tests: update test-check-py3-compat.t output in the py3exe branch
Augie Fackler <augie@google.com>
parents: 37127
diff changeset
45 setup.py not using absolute_import
28583
260ce2eed951 tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents: 28564
diff changeset
46
260ce2eed951 tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents: 28564
diff changeset
47 #endif
29886
e2c086f147ef py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents: 29810
diff changeset
48
e2c086f147ef py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents: 29810
diff changeset
49 #if py3exe py3pygments
33204
ddd65b4f3ae6 tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents: 33116
diff changeset
50 $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \
29886
e2c086f147ef py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents: 29810
diff changeset
51 > | xargs $PYTHON3 contrib/check-py3-compat.py \
e2c086f147ef py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents: 29810
diff changeset
52 > | sed 's/[0-9][0-9]*)$/*)/'
e2c086f147ef py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents: 29810
diff changeset
53 #endif