Mercurial > hg
annotate tests/test-locate @ 7104:9514cbb6e4f6
bdiff: normalize the diff (issue1295)
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 14 Oct 2008 20:13:53 +0200 |
parents | a5cde03cd019 |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
1622
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 #!/bin/sh |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
2 |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
3 hglocate() |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
4 { |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
5 echo "hg locate $@" |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
6 hg locate "$@" |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
7 ret=$? |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
8 echo |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
9 return $ret |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
10 } |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
11 |
1622
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
12 mkdir t |
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
13 cd t |
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
14 hg init |
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
15 echo 0 > a |
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
16 echo 0 > b |
2487 | 17 echo 0 > t.h |
2480
519a1011db91
fix -I/-X when relative paths used or in subdir
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
18 mkdir t |
519a1011db91
fix -I/-X when relative paths used or in subdir
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
19 echo 0 > t/x |
4235
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
20 echo 0 > t/b |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
21 echo 0 > t/e.h |
4307
702f48570eb3
change relglob: patterns to be consistent with glob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4235
diff
changeset
|
22 mkdir dir.h |
702f48570eb3
change relglob: patterns to be consistent with glob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4235
diff
changeset
|
23 echo 0 > dir.h/foo |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1622
diff
changeset
|
24 hg ci -A -m m -d "1000000 0" |
1622
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
25 touch nottracked |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
26 hglocate a && echo locate succeeded || echo locate failed |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
27 hglocate NONEXISTENT && echo locate succeeded || echo locate failed |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
28 hglocate |
1622
5e9168401a68
fix locate broken since 63799b01985c
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
29 hg rm a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1622
diff
changeset
|
30 hg ci -m m -d "1000000 0" |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
31 hglocate a |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
32 hglocate NONEXISTENT |
4308
a5cde03cd019
locate: don't print "file not found" messages.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4307
diff
changeset
|
33 hglocate relpath:NONEXISTENT |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
34 hglocate |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
35 hglocate -r 0 a |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
36 hglocate -r 0 NONEXISTENT |
4308
a5cde03cd019
locate: don't print "file not found" messages.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4307
diff
changeset
|
37 hglocate -r 0 relpath:NONEXISTENT |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
38 hglocate -r 0 |
2480
519a1011db91
fix -I/-X when relative paths used or in subdir
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
39 echo % -I/-X with relative path should work |
519a1011db91
fix -I/-X when relative paths used or in subdir
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
40 cd t |
4234
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
41 hglocate |
fe0c0a317c09
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4196
diff
changeset
|
42 hglocate -I ../t |
2487 | 43 # test issue294 |
44 cd .. | |
3988
9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2487
diff
changeset
|
45 rm -r t |
4307
702f48570eb3
change relglob: patterns to be consistent with glob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4235
diff
changeset
|
46 hglocate 't/**' |
4235
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
47 mkdir otherdir |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
48 cd otherdir |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
49 hglocate b |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
50 hglocate '*.h' |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
51 hglocate path:t/x |
4307
702f48570eb3
change relglob: patterns to be consistent with glob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4235
diff
changeset
|
52 hglocate 're:.*\.h$' |
4235
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
53 hglocate -r 0 b |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
54 hglocate -r 0 '*.h' |
eca3277c4220
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4234
diff
changeset
|
55 hglocate -r 0 path:t/x |
4307
702f48570eb3
change relglob: patterns to be consistent with glob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4235
diff
changeset
|
56 hglocate -r 0 're:.*\.h$' |