Mercurial > hg
annotate tests/test-check-pyflakes.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | 77142de48ae4 |
children | aef5b606d3ee |
rev | line source |
---|---|
22047
8fb6844a4ff1
tests: change some #ifs to #requires
Matt Mackall <mpm@selenic.com>
parents:
21293
diff
changeset
|
1 #require test-repo pyflakes |
21208
0e1cbd3d52f7
tests: add repository check for pyflakes test
Matt Mackall <mpm@selenic.com>
parents:
20644
diff
changeset
|
2 |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15372
diff
changeset
|
3 $ cd "`dirname "$TESTDIR"`" |
19377
0cb996ee8c6d
tests: run pyflakes on files from manifest which could be python files
Simon Heimberg <simohe@besonet.ch>
parents:
16350
diff
changeset
|
4 |
0cb996ee8c6d
tests: run pyflakes on files from manifest which could be python files
Simon Heimberg <simohe@besonet.ch>
parents:
16350
diff
changeset
|
5 run pyflakes on all tracked files ending in .py or without a file ending |
0cb996ee8c6d
tests: run pyflakes on files from manifest which could be python files
Simon Heimberg <simohe@besonet.ch>
parents:
16350
diff
changeset
|
6 (skipping binary file random-seed) |
21208
0e1cbd3d52f7
tests: add repository check for pyflakes test
Matt Mackall <mpm@selenic.com>
parents:
20644
diff
changeset
|
7 |
21221
e3ca21e4d05f
tests: use locate to find files for pyflakes check
Matt Mackall <mpm@selenic.com>
parents:
21208
diff
changeset
|
8 $ hg locate 'set:**.py or grep("^!#.*python")' 2>/dev/null \ |
19377
0cb996ee8c6d
tests: run pyflakes on files from manifest which could be python files
Simon Heimberg <simohe@besonet.ch>
parents:
16350
diff
changeset
|
9 > | xargs pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py" |
21293
507ce509fd22
filterpyflakes: make memoryview filtering unconditional
Matt Mackall <mpm@selenic.com>
parents:
21271
diff
changeset
|
10 tests/filterpyflakes.py:58: undefined name 'undefinedname' |
22053
4354b1e35f53
tests: fix pyflakes test whitespace breakage
Matt Mackall <mpm@selenic.com>
parents:
22047
diff
changeset
|
11 |
4354b1e35f53
tests: fix pyflakes test whitespace breakage
Matt Mackall <mpm@selenic.com>
parents:
22047
diff
changeset
|
12 |