Mercurial > hg
annotate tests/test-check-code-hg.t @ 26730:a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 14 Oct 2015 12:57:33 -0400 |
parents | 8fb6844a4ff1 |
children |
rev | line source |
---|---|
22047
8fb6844a4ff1
tests: change some #ifs to #requires
Matt Mackall <mpm@selenic.com>
parents:
21225
diff
changeset
|
1 #require test-repo |
21223
c35c027f5f43
test-check-code-hg: use test-repo check
Matt Mackall <mpm@selenic.com>
parents:
20239
diff
changeset
|
2 |
15557
7bb5ed61b74c
tests: convert test-check-code-hg.py to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
11771
diff
changeset
|
3 $ check_code="$TESTDIR"/../contrib/check-code.py |
7bb5ed61b74c
tests: convert test-check-code-hg.py to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
11771
diff
changeset
|
4 $ cd "$TESTDIR"/.. |
15558
c6b600d2348c
tests: run check-code with warnings and maintain a whitelist
Mads Kiilerich <mads@kiilerich.com>
parents:
15557
diff
changeset
|
5 |
19384
96fd9af75834
tests: check-code all python files in one run
Simon Heimberg <simohe@besonet.ch>
parents:
19321
diff
changeset
|
6 New errors are not allowed. Warnings are strongly discouraged. |
20239
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
7 (The writing "no-che?k-code" is for not skipping this file when checking.) |
19384
96fd9af75834
tests: check-code all python files in one run
Simon Heimberg <simohe@besonet.ch>
parents:
19321
diff
changeset
|
8 |
21225
c58aa73bf0b9
test-check-code-hg: use locate instead of manifest
Matt Mackall <mpm@selenic.com>
parents:
21224
diff
changeset
|
9 $ hg locate | sed 's-\\-/-g' | |
19495
9aee3d014394
tests: test-check-code-hg.t works for all files to check
Simon Heimberg <simohe@besonet.ch>
parents:
19386
diff
changeset
|
10 > xargs "$check_code" --warnings --per-file=0 || false |
20239
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
11 Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
12 Skipping i18n/polib.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
13 Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
14 Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
15 Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob) |