author | Marti Raudsepp <marti@juffo.org> |
Fri, 06 Nov 2009 13:48:17 +0200 | |
changeset 9730 | 732fc0e9d411 |
parent 4857 | 2192001e4bb4 |
child 10369 | 98a0421b9e52 |
permissions | -rwxr-xr-x |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 |
#!/bin/sh |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 |
|
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
3 |
HGMERGE=true; export HGMERGE |
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
4 |
|
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 |
echo % init |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 |
hg init |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 |
|
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 |
echo % commit |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 |
echo 'a' > a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 |
hg ci -A -m test -u nobody -d '1 0' |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
11 |
|
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 |
echo % annotate -c |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 |
hg annotate -c a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
14 |
|
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
15 |
echo % annotate -cl |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
16 |
hg annotate -cl a |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
17 |
|
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
echo % annotate -d |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
19 |
hg annotate -d a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
20 |
|
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
21 |
echo % annotate -n |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
22 |
hg annotate -n a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
23 |
|
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
24 |
echo % annotate -nl |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
25 |
hg annotate -nl a |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
26 |
|
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
27 |
echo % annotate -u |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
28 |
hg annotate -u a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
29 |
|
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
30 |
echo % annotate -cdnu |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
31 |
hg annotate -cdnu a |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
32 |
|
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
33 |
echo % annotate -cdnul |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
34 |
hg annotate -cdnul a |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
35 |
|
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
36 |
cat <<EOF >>a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
37 |
a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
38 |
a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
39 |
EOF |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
40 |
hg ci -ma1 -d '1 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
41 |
hg cp a b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
42 |
hg ci -mb -d '1 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
43 |
cat <<EOF >> b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
44 |
b4 |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
45 |
b5 |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
46 |
b6 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
47 |
EOF |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
48 |
hg ci -mb2 -d '2 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
49 |
|
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
50 |
echo % annotate -n b |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
51 |
hg annotate -n b |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
52 |
echo % annotate -nl b |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
53 |
hg annotate -nl b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
54 |
echo % annotate -nf b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
55 |
hg annotate -nf b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
56 |
echo % annotate -nlf b |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
57 |
hg annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
58 |
|
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
59 |
hg up -C 2 |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
60 |
cat <<EOF >> b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
61 |
b4 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
62 |
c |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
63 |
b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
64 |
EOF |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
65 |
hg ci -mb2.1 -d '2 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
66 |
hg merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
67 |
hg ci -mmergeb -d '3 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
68 |
echo % annotate after merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
69 |
hg annotate -nf b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
70 |
echo % annotate after merge with -l |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
71 |
hg annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
72 |
|
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
73 |
hg up -C 1 |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
74 |
hg cp a b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
75 |
cat <<EOF > b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
76 |
a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
77 |
z |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
78 |
a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
79 |
EOF |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
80 |
hg ci -mc -d '3 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
81 |
hg merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
82 |
cat <<EOF >> b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
83 |
b4 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
84 |
c |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
85 |
b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
86 |
EOF |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
87 |
echo d >> b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
88 |
hg ci -mmerge2 -d '4 0' |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
89 |
echo % annotate after rename merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
90 |
hg annotate -nf b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
91 |
echo % annotate after rename merge with -l |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
92 |
hg annotate -nlf b |
3405
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3202
diff
changeset
|
93 |
|
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3202
diff
changeset
|
94 |
echo % linkrev vs rev |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
95 |
hg annotate -r tip -n a |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
96 |
echo % linkrev vs rev with -l |
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
97 |
hg annotate -r tip -nl a |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
98 |
|
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
99 |
# test issue 589 |
4659
7a7d4937272b
Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4640
diff
changeset
|
100 |
# annotate was crashing when trying to --follow something |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
101 |
# like A -> B -> A |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
102 |
echo % generate ABA rename configuration |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
103 |
echo foo > foo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
104 |
hg add foo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
105 |
hg ci -m addfoo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
106 |
hg rename foo bar |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
107 |
hg ci -m renamefoo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
108 |
hg rename bar foo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
109 |
hg ci -m renamebar |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
110 |
|
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
111 |
echo % annotate after ABA with follow |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
112 |
hg annotate --follow foo |
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
113 |