##// END OF EJS Templates
Remove dummy branch hack from tests
Matt Mackall -
r4180:f80cf8b7 default
parent child Browse files
Show More
@@ -1,21 +1,20 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 hg init
3 hg init
4 hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
5 touch a
4 touch a
6 hg add a
5 hg add a
7 hg ci -m "a" -d "1000000 0"
6 hg ci -m "a" -d "1000000 0"
8
7
9 echo 123 > b
8 echo 123 > b
10 hg add b
9 hg add b
11 hg diff --nodates
10 hg diff --nodates
12
11
13 hg diff --nodates -r tip
12 hg diff --nodates -r tip
14
13
15 echo foo > a
14 echo foo > a
16 hg diff --nodates
15 hg diff --nodates
17
16
18 hg diff -r ""
17 hg diff -r ""
19 hg diff -r tip -r ""
18 hg diff -r tip -r ""
20
19
21 true
20 true
@@ -1,22 +1,22 b''
1 diff -r 4da5fa99f904 b
1 diff -r acd8075edac9 b
2 --- /dev/null
2 --- /dev/null
3 +++ b/b
3 +++ b/b
4 @@ -0,0 +1,1 @@
4 @@ -0,0 +1,1 @@
5 +123
5 +123
6 diff -r 4da5fa99f904 b
6 diff -r acd8075edac9 b
7 --- /dev/null
7 --- /dev/null
8 +++ b/b
8 +++ b/b
9 @@ -0,0 +1,1 @@
9 @@ -0,0 +1,1 @@
10 +123
10 +123
11 diff -r 4da5fa99f904 a
11 diff -r acd8075edac9 a
12 --- a/a
12 --- a/a
13 +++ b/a
13 +++ b/a
14 @@ -0,0 +1,1 @@
14 @@ -0,0 +1,1 @@
15 +foo
15 +foo
16 diff -r 4da5fa99f904 b
16 diff -r acd8075edac9 b
17 --- /dev/null
17 --- /dev/null
18 +++ b/b
18 +++ b/b
19 @@ -0,0 +1,1 @@
19 @@ -0,0 +1,1 @@
20 +123
20 +123
21 abort: Ambiguous identifier!
21 abort: Ambiguous identifier!
22 abort: Ambiguous identifier!
22 abort: Ambiguous identifier!
@@ -1,89 +1,88 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 hg init a
3 hg init a
4
4
5 cd a
5 cd a
6 echo a > a
6 echo a > a
7 hg ci -Ama -d '1 0'
7 hg ci -Ama -d '1 0'
8
8
9 hg cp a b
9 hg cp a b
10 hg ci -mb -d '2 0'
10 hg ci -mb -d '2 0'
11
11
12 mkdir dir
12 mkdir dir
13 hg mv b dir
13 hg mv b dir
14 hg ci -mc -d '3 0'
14 hg ci -mc -d '3 0'
15
15
16 hg mv a b
16 hg mv a b
17 echo a > d
17 echo a > d
18 hg add d
18 hg add d
19 hg ci -md -d '4 0'
19 hg ci -md -d '4 0'
20
20
21 hg mv dir/b e
21 hg mv dir/b e
22 hg ci -me -d '5 0'
22 hg ci -me -d '5 0'
23
23
24 hg log a
24 hg log a
25 echo % -f, directory
25 echo % -f, directory
26 hg log -f dir
26 hg log -f dir
27 echo % -f, but no args
27 echo % -f, but no args
28 hg log -f
28 hg log -f
29 echo % one rename
29 echo % one rename
30 hg log -vf a
30 hg log -vf a
31 echo % many renames
31 echo % many renames
32 hg log -vf e
32 hg log -vf e
33
33
34 echo % log copies
34 echo % log copies
35 hg log -vC --template '{rev} {file_copies%filecopy}\n'
35 hg log -vC --template '{rev} {file_copies%filecopy}\n'
36
36
37 echo % log copies, non-linear manifest
37 echo % log copies, non-linear manifest
38 hg up -C 3
38 hg up -C 3
39 hg mv dir/b e
39 hg mv dir/b e
40 echo foo > foo
40 echo foo > foo
41 hg ci -Ame2 -d '6 0'
41 hg ci -Ame2 -d '6 0'
42 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 5
42 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 5
43
43
44 echo '% log -p d'
44 echo '% log -p d'
45 hg log -pv d
45 hg log -pv d
46
46
47 # log --follow tests
47 # log --follow tests
48 hg init ../follow
48 hg init ../follow
49 cd ../follow
49 cd ../follow
50 hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
51 echo base > base
50 echo base > base
52 hg ci -Ambase -d '1 0'
51 hg ci -Ambase -d '1 0'
53
52
54 echo r1 >> base
53 echo r1 >> base
55 hg ci -Amr1 -d '1 0'
54 hg ci -Amr1 -d '1 0'
56 echo r2 >> base
55 echo r2 >> base
57 hg ci -Amr2 -d '1 0'
56 hg ci -Amr2 -d '1 0'
58
57
59 hg up -C 1
58 hg up -C 1
60 echo b1 > b1
59 echo b1 > b1
61 hg ci -Amb1 -d '1 0'
60 hg ci -Amb1 -d '1 0'
62
61
63 echo % log -f
62 echo % log -f
64 hg log -f
63 hg log -f
65
64
66 hg up -C 0
65 hg up -C 0
67 echo b2 > b2
66 echo b2 > b2
68 hg ci -Amb2 -d '1 0'
67 hg ci -Amb2 -d '1 0'
69
68
70 echo % log -f -r 1:tip
69 echo % log -f -r 1:tip
71 hg log -f -r 1:tip
70 hg log -f -r 1:tip
72
71
73 hg up -C 3
72 hg up -C 3
74 hg merge tip
73 hg merge tip
75 hg ci -mm12 -d '1 0'
74 hg ci -mm12 -d '1 0'
76
75
77 echo postm >> b1
76 echo postm >> b1
78 hg ci -Amb1.1 -d'1 0'
77 hg ci -Amb1.1 -d'1 0'
79
78
80 echo % log --follow-first
79 echo % log --follow-first
81 hg log --follow-first
80 hg log --follow-first
82
81
83 echo % log -P 2
82 echo % log -P 2
84 hg log -P 2
83 hg log -P 2
85
84
86 echo '% log -r ""'
85 echo '% log -r ""'
87 hg log -r ''
86 hg log -r ''
88
87
89 exit 0
88 exit 0
@@ -1,219 +1,204 b''
1 adding a
1 adding a
2 changeset: 0:8580ff50825a
2 changeset: 0:8580ff50825a
3 user: test
3 user: test
4 date: Thu Jan 01 00:00:01 1970 +0000
4 date: Thu Jan 01 00:00:01 1970 +0000
5 summary: a
5 summary: a
6
6
7 % -f, directory
7 % -f, directory
8 abort: can only follow copies/renames for explicit file names
8 abort: can only follow copies/renames for explicit file names
9 % -f, but no args
9 % -f, but no args
10 changeset: 4:b30c444c7c84
10 changeset: 4:b30c444c7c84
11 tag: tip
11 tag: tip
12 user: test
12 user: test
13 date: Thu Jan 01 00:00:05 1970 +0000
13 date: Thu Jan 01 00:00:05 1970 +0000
14 summary: e
14 summary: e
15
15
16 changeset: 3:16b60bf3f99a
16 changeset: 3:16b60bf3f99a
17 user: test
17 user: test
18 date: Thu Jan 01 00:00:04 1970 +0000
18 date: Thu Jan 01 00:00:04 1970 +0000
19 summary: d
19 summary: d
20
20
21 changeset: 2:21fba396af4c
21 changeset: 2:21fba396af4c
22 user: test
22 user: test
23 date: Thu Jan 01 00:00:03 1970 +0000
23 date: Thu Jan 01 00:00:03 1970 +0000
24 summary: c
24 summary: c
25
25
26 changeset: 1:c0296dabce9b
26 changeset: 1:c0296dabce9b
27 user: test
27 user: test
28 date: Thu Jan 01 00:00:02 1970 +0000
28 date: Thu Jan 01 00:00:02 1970 +0000
29 summary: b
29 summary: b
30
30
31 changeset: 0:8580ff50825a
31 changeset: 0:8580ff50825a
32 user: test
32 user: test
33 date: Thu Jan 01 00:00:01 1970 +0000
33 date: Thu Jan 01 00:00:01 1970 +0000
34 summary: a
34 summary: a
35
35
36 % one rename
36 % one rename
37 changeset: 0:8580ff50825a
37 changeset: 0:8580ff50825a
38 user: test
38 user: test
39 date: Thu Jan 01 00:00:01 1970 +0000
39 date: Thu Jan 01 00:00:01 1970 +0000
40 files: a
40 files: a
41 description:
41 description:
42 a
42 a
43
43
44
44
45 % many renames
45 % many renames
46 changeset: 4:b30c444c7c84
46 changeset: 4:b30c444c7c84
47 tag: tip
47 tag: tip
48 user: test
48 user: test
49 date: Thu Jan 01 00:00:05 1970 +0000
49 date: Thu Jan 01 00:00:05 1970 +0000
50 files: dir/b e
50 files: dir/b e
51 description:
51 description:
52 e
52 e
53
53
54
54
55 changeset: 2:21fba396af4c
55 changeset: 2:21fba396af4c
56 user: test
56 user: test
57 date: Thu Jan 01 00:00:03 1970 +0000
57 date: Thu Jan 01 00:00:03 1970 +0000
58 files: b dir/b
58 files: b dir/b
59 description:
59 description:
60 c
60 c
61
61
62
62
63 changeset: 1:c0296dabce9b
63 changeset: 1:c0296dabce9b
64 user: test
64 user: test
65 date: Thu Jan 01 00:00:02 1970 +0000
65 date: Thu Jan 01 00:00:02 1970 +0000
66 files: b
66 files: b
67 description:
67 description:
68 b
68 b
69
69
70
70
71 changeset: 0:8580ff50825a
71 changeset: 0:8580ff50825a
72 user: test
72 user: test
73 date: Thu Jan 01 00:00:01 1970 +0000
73 date: Thu Jan 01 00:00:01 1970 +0000
74 files: a
74 files: a
75 description:
75 description:
76 a
76 a
77
77
78
78
79 % log copies
79 % log copies
80 4 e (dir/b)
80 4 e (dir/b)
81 3 b (a)
81 3 b (a)
82 2 dir/b (b)
82 2 dir/b (b)
83 1 b (a)
83 1 b (a)
84 0
84 0
85 % log copies, non-linear manifest
85 % log copies, non-linear manifest
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
87 adding foo
87 adding foo
88 5 e (dir/b)
88 5 e (dir/b)
89 % log -p d
89 % log -p d
90 changeset: 3:16b60bf3f99a
90 changeset: 3:16b60bf3f99a
91 user: test
91 user: test
92 date: Thu Jan 01 00:00:04 1970 +0000
92 date: Thu Jan 01 00:00:04 1970 +0000
93 files: a b d
93 files: a b d
94 description:
94 description:
95 d
95 d
96
96
97
97
98 diff -r 21fba396af4c -r 16b60bf3f99a d
98 diff -r 21fba396af4c -r 16b60bf3f99a d
99 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
99 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
100 +++ b/d Thu Jan 01 00:00:04 1970 +0000
100 +++ b/d Thu Jan 01 00:00:04 1970 +0000
101 @@ -0,0 +1,1 @@
101 @@ -0,0 +1,1 @@
102 +a
102 +a
103
103
104 adding base
104 adding base
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
106 adding b1
106 adding b1
107 % log -f
107 % log -f
108 changeset: 3:07a62f044f0d
108 changeset: 3:e62f78d544b4
109 branch: dummy
110 tag: tip
109 tag: tip
111 parent: 1:fb3d4e35b279
110 parent: 1:3d5bf5654eda
112 user: test
111 user: test
113 date: Thu Jan 01 00:00:01 1970 +0000
112 date: Thu Jan 01 00:00:01 1970 +0000
114 summary: b1
113 summary: b1
115
114
116 changeset: 1:fb3d4e35b279
115 changeset: 1:3d5bf5654eda
117 branch: dummy
118 user: test
116 user: test
119 date: Thu Jan 01 00:00:01 1970 +0000
117 date: Thu Jan 01 00:00:01 1970 +0000
120 summary: r1
118 summary: r1
121
119
122 changeset: 0:ea445bfed6b9
120 changeset: 0:67e992f2c4f3
123 branch: dummy
124 user: test
121 user: test
125 date: Thu Jan 01 00:00:01 1970 +0000
122 date: Thu Jan 01 00:00:01 1970 +0000
126 summary: base
123 summary: base
127
124
128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
125 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
129 adding b2
126 adding b2
130 % log -f -r 1:tip
127 % log -f -r 1:tip
131 changeset: 1:fb3d4e35b279
128 changeset: 1:3d5bf5654eda
132 branch: dummy
133 user: test
129 user: test
134 date: Thu Jan 01 00:00:01 1970 +0000
130 date: Thu Jan 01 00:00:01 1970 +0000
135 summary: r1
131 summary: r1
136
132
137 changeset: 2:e8882cbc828c
133 changeset: 2:60c670bf5b30
138 branch: dummy
139 user: test
134 user: test
140 date: Thu Jan 01 00:00:01 1970 +0000
135 date: Thu Jan 01 00:00:01 1970 +0000
141 summary: r2
136 summary: r2
142
137
143 changeset: 3:07a62f044f0d
138 changeset: 3:e62f78d544b4
144 branch: dummy
139 parent: 1:3d5bf5654eda
145 parent: 1:fb3d4e35b279
146 user: test
140 user: test
147 date: Thu Jan 01 00:00:01 1970 +0000
141 date: Thu Jan 01 00:00:01 1970 +0000
148 summary: b1
142 summary: b1
149
143
150 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
144 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 (branch merge, don't forget to commit)
146 (branch merge, don't forget to commit)
153 % log --follow-first
147 % log --follow-first
154 changeset: 6:0f621dafa603
148 changeset: 6:2404bbcab562
155 branch: dummy
156 tag: tip
149 tag: tip
157 user: test
150 user: test
158 date: Thu Jan 01 00:00:01 1970 +0000
151 date: Thu Jan 01 00:00:01 1970 +0000
159 summary: b1.1
152 summary: b1.1
160
153
161 changeset: 5:0cf53fb6dfd5
154 changeset: 5:302e9dd6890d
162 branch: dummy
155 parent: 3:e62f78d544b4
163 parent: 3:07a62f044f0d
156 parent: 4:ddb82e70d1a1
164 parent: 4:b76598590bc3
165 user: test
157 user: test
166 date: Thu Jan 01 00:00:01 1970 +0000
158 date: Thu Jan 01 00:00:01 1970 +0000
167 summary: m12
159 summary: m12
168
160
169 changeset: 3:07a62f044f0d
161 changeset: 3:e62f78d544b4
170 branch: dummy
162 parent: 1:3d5bf5654eda
171 parent: 1:fb3d4e35b279
172 user: test
163 user: test
173 date: Thu Jan 01 00:00:01 1970 +0000
164 date: Thu Jan 01 00:00:01 1970 +0000
174 summary: b1
165 summary: b1
175
166
176 changeset: 1:fb3d4e35b279
167 changeset: 1:3d5bf5654eda
177 branch: dummy
178 user: test
168 user: test
179 date: Thu Jan 01 00:00:01 1970 +0000
169 date: Thu Jan 01 00:00:01 1970 +0000
180 summary: r1
170 summary: r1
181
171
182 changeset: 0:ea445bfed6b9
172 changeset: 0:67e992f2c4f3
183 branch: dummy
184 user: test
173 user: test
185 date: Thu Jan 01 00:00:01 1970 +0000
174 date: Thu Jan 01 00:00:01 1970 +0000
186 summary: base
175 summary: base
187
176
188 % log -P 2
177 % log -P 2
189 changeset: 6:0f621dafa603
178 changeset: 6:2404bbcab562
190 branch: dummy
191 tag: tip
179 tag: tip
192 user: test
180 user: test
193 date: Thu Jan 01 00:00:01 1970 +0000
181 date: Thu Jan 01 00:00:01 1970 +0000
194 summary: b1.1
182 summary: b1.1
195
183
196 changeset: 5:0cf53fb6dfd5
184 changeset: 5:302e9dd6890d
197 branch: dummy
185 parent: 3:e62f78d544b4
198 parent: 3:07a62f044f0d
186 parent: 4:ddb82e70d1a1
199 parent: 4:b76598590bc3
200 user: test
187 user: test
201 date: Thu Jan 01 00:00:01 1970 +0000
188 date: Thu Jan 01 00:00:01 1970 +0000
202 summary: m12
189 summary: m12
203
190
204 changeset: 4:b76598590bc3
191 changeset: 4:ddb82e70d1a1
205 branch: dummy
192 parent: 0:67e992f2c4f3
206 parent: 0:ea445bfed6b9
207 user: test
193 user: test
208 date: Thu Jan 01 00:00:01 1970 +0000
194 date: Thu Jan 01 00:00:01 1970 +0000
209 summary: b2
195 summary: b2
210
196
211 changeset: 3:07a62f044f0d
197 changeset: 3:e62f78d544b4
212 branch: dummy
198 parent: 1:3d5bf5654eda
213 parent: 1:fb3d4e35b279
214 user: test
199 user: test
215 date: Thu Jan 01 00:00:01 1970 +0000
200 date: Thu Jan 01 00:00:01 1970 +0000
216 summary: b1
201 summary: b1
217
202
218 % log -r ""
203 % log -r ""
219 abort: Ambiguous identifier!
204 abort: Ambiguous identifier!
General Comments 0
You need to be logged in to leave comments. Login now