##// END OF EJS Templates
namespaces: add test for log...
Sean Farley -
r23773:c517b97c default
parent child Browse files
Show More
@@ -1,1820 +1,1844
1 Log on empty repository: checking consistency
1 Log on empty repository: checking consistency
2
2
3 $ hg init empty
3 $ hg init empty
4 $ cd empty
4 $ cd empty
5 $ hg log
5 $ hg log
6 $ hg log -r 1
6 $ hg log -r 1
7 abort: unknown revision '1'!
7 abort: unknown revision '1'!
8 [255]
8 [255]
9 $ hg log -r -1:0
9 $ hg log -r -1:0
10 abort: unknown revision '-1'!
10 abort: unknown revision '-1'!
11 [255]
11 [255]
12 $ hg log -r 'branch(name)'
12 $ hg log -r 'branch(name)'
13 abort: unknown revision 'name'!
13 abort: unknown revision 'name'!
14 [255]
14 [255]
15 $ hg log -r null -q
15 $ hg log -r null -q
16 -1:000000000000
16 -1:000000000000
17
17
18 The g is crafted to have 2 filelog topological heads in a linear
18 The g is crafted to have 2 filelog topological heads in a linear
19 changeset graph
19 changeset graph
20
20
21 $ hg init a
21 $ hg init a
22 $ cd a
22 $ cd a
23 $ echo a > a
23 $ echo a > a
24 $ echo f > f
24 $ echo f > f
25 $ hg ci -Ama -d '1 0'
25 $ hg ci -Ama -d '1 0'
26 adding a
26 adding a
27 adding f
27 adding f
28
28
29 $ hg cp a b
29 $ hg cp a b
30 $ hg cp f g
30 $ hg cp f g
31 $ hg ci -mb -d '2 0'
31 $ hg ci -mb -d '2 0'
32
32
33 $ mkdir dir
33 $ mkdir dir
34 $ hg mv b dir
34 $ hg mv b dir
35 $ echo g >> g
35 $ echo g >> g
36 $ echo f >> f
36 $ echo f >> f
37 $ hg ci -mc -d '3 0'
37 $ hg ci -mc -d '3 0'
38
38
39 $ hg mv a b
39 $ hg mv a b
40 $ hg cp -f f g
40 $ hg cp -f f g
41 $ echo a > d
41 $ echo a > d
42 $ hg add d
42 $ hg add d
43 $ hg ci -md -d '4 0'
43 $ hg ci -md -d '4 0'
44
44
45 $ hg mv dir/b e
45 $ hg mv dir/b e
46 $ hg ci -me -d '5 0'
46 $ hg ci -me -d '5 0'
47
47
48 $ hg log a
48 $ hg log a
49 changeset: 0:9161b9aeaf16
49 changeset: 0:9161b9aeaf16
50 user: test
50 user: test
51 date: Thu Jan 01 00:00:01 1970 +0000
51 date: Thu Jan 01 00:00:01 1970 +0000
52 summary: a
52 summary: a
53
53
54 log on directory
54 log on directory
55
55
56 $ hg log dir
56 $ hg log dir
57 changeset: 4:7e4639b4691b
57 changeset: 4:7e4639b4691b
58 tag: tip
58 tag: tip
59 user: test
59 user: test
60 date: Thu Jan 01 00:00:05 1970 +0000
60 date: Thu Jan 01 00:00:05 1970 +0000
61 summary: e
61 summary: e
62
62
63 changeset: 2:f8954cd4dc1f
63 changeset: 2:f8954cd4dc1f
64 user: test
64 user: test
65 date: Thu Jan 01 00:00:03 1970 +0000
65 date: Thu Jan 01 00:00:03 1970 +0000
66 summary: c
66 summary: c
67
67
68 $ hg log somethingthatdoesntexist dir
68 $ hg log somethingthatdoesntexist dir
69 changeset: 4:7e4639b4691b
69 changeset: 4:7e4639b4691b
70 tag: tip
70 tag: tip
71 user: test
71 user: test
72 date: Thu Jan 01 00:00:05 1970 +0000
72 date: Thu Jan 01 00:00:05 1970 +0000
73 summary: e
73 summary: e
74
74
75 changeset: 2:f8954cd4dc1f
75 changeset: 2:f8954cd4dc1f
76 user: test
76 user: test
77 date: Thu Jan 01 00:00:03 1970 +0000
77 date: Thu Jan 01 00:00:03 1970 +0000
78 summary: c
78 summary: c
79
79
80
80
81 -f, non-existent directory
81 -f, non-existent directory
82
82
83 $ hg log -f dir
83 $ hg log -f dir
84 abort: cannot follow file not in parent revision: "dir"
84 abort: cannot follow file not in parent revision: "dir"
85 [255]
85 [255]
86
86
87 -f, directory
87 -f, directory
88
88
89 $ hg up -q 3
89 $ hg up -q 3
90 $ hg log -f dir
90 $ hg log -f dir
91 changeset: 2:f8954cd4dc1f
91 changeset: 2:f8954cd4dc1f
92 user: test
92 user: test
93 date: Thu Jan 01 00:00:03 1970 +0000
93 date: Thu Jan 01 00:00:03 1970 +0000
94 summary: c
94 summary: c
95
95
96 -f, directory with --patch
96 -f, directory with --patch
97
97
98 $ hg log -f dir -p
98 $ hg log -f dir -p
99 changeset: 2:f8954cd4dc1f
99 changeset: 2:f8954cd4dc1f
100 user: test
100 user: test
101 date: Thu Jan 01 00:00:03 1970 +0000
101 date: Thu Jan 01 00:00:03 1970 +0000
102 summary: c
102 summary: c
103
103
104 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
104 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
105 --- /dev/null* (glob)
105 --- /dev/null* (glob)
106 +++ b/dir/b* (glob)
106 +++ b/dir/b* (glob)
107 @@ -0,0 +1,1 @@
107 @@ -0,0 +1,1 @@
108 +a
108 +a
109
109
110
110
111 -f, pattern
111 -f, pattern
112
112
113 $ hg log -f -I 'dir**' -p
113 $ hg log -f -I 'dir**' -p
114 changeset: 2:f8954cd4dc1f
114 changeset: 2:f8954cd4dc1f
115 user: test
115 user: test
116 date: Thu Jan 01 00:00:03 1970 +0000
116 date: Thu Jan 01 00:00:03 1970 +0000
117 summary: c
117 summary: c
118
118
119 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
119 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
120 --- /dev/null* (glob)
120 --- /dev/null* (glob)
121 +++ b/dir/b* (glob)
121 +++ b/dir/b* (glob)
122 @@ -0,0 +1,1 @@
122 @@ -0,0 +1,1 @@
123 +a
123 +a
124
124
125 $ hg up -q 4
125 $ hg up -q 4
126
126
127 -f, a wrong style
127 -f, a wrong style
128
128
129 $ hg log -f -l1 --style something
129 $ hg log -f -l1 --style something
130 abort: style 'something' not found
130 abort: style 'something' not found
131 (available styles: bisect, changelog, compact, default, phases, xml)
131 (available styles: bisect, changelog, compact, default, phases, xml)
132 [255]
132 [255]
133
133
134 -f, phases style
134 -f, phases style
135
135
136
136
137 $ hg log -f -l1 --style phases
137 $ hg log -f -l1 --style phases
138 changeset: 4:7e4639b4691b
138 changeset: 4:7e4639b4691b
139 tag: tip
139 tag: tip
140 phase: draft
140 phase: draft
141 user: test
141 user: test
142 date: Thu Jan 01 00:00:05 1970 +0000
142 date: Thu Jan 01 00:00:05 1970 +0000
143 summary: e
143 summary: e
144
144
145
145
146 -f, but no args
146 -f, but no args
147
147
148 $ hg log -f
148 $ hg log -f
149 changeset: 4:7e4639b4691b
149 changeset: 4:7e4639b4691b
150 tag: tip
150 tag: tip
151 user: test
151 user: test
152 date: Thu Jan 01 00:00:05 1970 +0000
152 date: Thu Jan 01 00:00:05 1970 +0000
153 summary: e
153 summary: e
154
154
155 changeset: 3:2ca5ba701980
155 changeset: 3:2ca5ba701980
156 user: test
156 user: test
157 date: Thu Jan 01 00:00:04 1970 +0000
157 date: Thu Jan 01 00:00:04 1970 +0000
158 summary: d
158 summary: d
159
159
160 changeset: 2:f8954cd4dc1f
160 changeset: 2:f8954cd4dc1f
161 user: test
161 user: test
162 date: Thu Jan 01 00:00:03 1970 +0000
162 date: Thu Jan 01 00:00:03 1970 +0000
163 summary: c
163 summary: c
164
164
165 changeset: 1:d89b0a12d229
165 changeset: 1:d89b0a12d229
166 user: test
166 user: test
167 date: Thu Jan 01 00:00:02 1970 +0000
167 date: Thu Jan 01 00:00:02 1970 +0000
168 summary: b
168 summary: b
169
169
170 changeset: 0:9161b9aeaf16
170 changeset: 0:9161b9aeaf16
171 user: test
171 user: test
172 date: Thu Jan 01 00:00:01 1970 +0000
172 date: Thu Jan 01 00:00:01 1970 +0000
173 summary: a
173 summary: a
174
174
175
175
176 one rename
176 one rename
177
177
178 $ hg up -q 2
178 $ hg up -q 2
179 $ hg log -vf a
179 $ hg log -vf a
180 changeset: 0:9161b9aeaf16
180 changeset: 0:9161b9aeaf16
181 user: test
181 user: test
182 date: Thu Jan 01 00:00:01 1970 +0000
182 date: Thu Jan 01 00:00:01 1970 +0000
183 files: a f
183 files: a f
184 description:
184 description:
185 a
185 a
186
186
187
187
188
188
189 many renames
189 many renames
190
190
191 $ hg up -q tip
191 $ hg up -q tip
192 $ hg log -vf e
192 $ hg log -vf e
193 changeset: 4:7e4639b4691b
193 changeset: 4:7e4639b4691b
194 tag: tip
194 tag: tip
195 user: test
195 user: test
196 date: Thu Jan 01 00:00:05 1970 +0000
196 date: Thu Jan 01 00:00:05 1970 +0000
197 files: dir/b e
197 files: dir/b e
198 description:
198 description:
199 e
199 e
200
200
201
201
202 changeset: 2:f8954cd4dc1f
202 changeset: 2:f8954cd4dc1f
203 user: test
203 user: test
204 date: Thu Jan 01 00:00:03 1970 +0000
204 date: Thu Jan 01 00:00:03 1970 +0000
205 files: b dir/b f g
205 files: b dir/b f g
206 description:
206 description:
207 c
207 c
208
208
209
209
210 changeset: 1:d89b0a12d229
210 changeset: 1:d89b0a12d229
211 user: test
211 user: test
212 date: Thu Jan 01 00:00:02 1970 +0000
212 date: Thu Jan 01 00:00:02 1970 +0000
213 files: b g
213 files: b g
214 description:
214 description:
215 b
215 b
216
216
217
217
218 changeset: 0:9161b9aeaf16
218 changeset: 0:9161b9aeaf16
219 user: test
219 user: test
220 date: Thu Jan 01 00:00:01 1970 +0000
220 date: Thu Jan 01 00:00:01 1970 +0000
221 files: a f
221 files: a f
222 description:
222 description:
223 a
223 a
224
224
225
225
226
226
227
227
228 log -pf dir/b
228 log -pf dir/b
229
229
230 $ hg up -q 3
230 $ hg up -q 3
231 $ hg log -pf dir/b
231 $ hg log -pf dir/b
232 changeset: 2:f8954cd4dc1f
232 changeset: 2:f8954cd4dc1f
233 user: test
233 user: test
234 date: Thu Jan 01 00:00:03 1970 +0000
234 date: Thu Jan 01 00:00:03 1970 +0000
235 summary: c
235 summary: c
236
236
237 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
237 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
238 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
238 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
239 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
239 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
240 @@ -0,0 +1,1 @@
240 @@ -0,0 +1,1 @@
241 +a
241 +a
242
242
243 changeset: 1:d89b0a12d229
243 changeset: 1:d89b0a12d229
244 user: test
244 user: test
245 date: Thu Jan 01 00:00:02 1970 +0000
245 date: Thu Jan 01 00:00:02 1970 +0000
246 summary: b
246 summary: b
247
247
248 diff -r 9161b9aeaf16 -r d89b0a12d229 b
248 diff -r 9161b9aeaf16 -r d89b0a12d229 b
249 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
249 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
250 +++ b/b Thu Jan 01 00:00:02 1970 +0000
250 +++ b/b Thu Jan 01 00:00:02 1970 +0000
251 @@ -0,0 +1,1 @@
251 @@ -0,0 +1,1 @@
252 +a
252 +a
253
253
254 changeset: 0:9161b9aeaf16
254 changeset: 0:9161b9aeaf16
255 user: test
255 user: test
256 date: Thu Jan 01 00:00:01 1970 +0000
256 date: Thu Jan 01 00:00:01 1970 +0000
257 summary: a
257 summary: a
258
258
259 diff -r 000000000000 -r 9161b9aeaf16 a
259 diff -r 000000000000 -r 9161b9aeaf16 a
260 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
260 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
261 +++ b/a Thu Jan 01 00:00:01 1970 +0000
261 +++ b/a Thu Jan 01 00:00:01 1970 +0000
262 @@ -0,0 +1,1 @@
262 @@ -0,0 +1,1 @@
263 +a
263 +a
264
264
265
265
266 log -pf b inside dir
266 log -pf b inside dir
267
267
268 $ hg --cwd=dir log -pf b
268 $ hg --cwd=dir log -pf b
269 changeset: 2:f8954cd4dc1f
269 changeset: 2:f8954cd4dc1f
270 user: test
270 user: test
271 date: Thu Jan 01 00:00:03 1970 +0000
271 date: Thu Jan 01 00:00:03 1970 +0000
272 summary: c
272 summary: c
273
273
274 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
274 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
275 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
275 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
276 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
276 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
277 @@ -0,0 +1,1 @@
277 @@ -0,0 +1,1 @@
278 +a
278 +a
279
279
280 changeset: 1:d89b0a12d229
280 changeset: 1:d89b0a12d229
281 user: test
281 user: test
282 date: Thu Jan 01 00:00:02 1970 +0000
282 date: Thu Jan 01 00:00:02 1970 +0000
283 summary: b
283 summary: b
284
284
285 diff -r 9161b9aeaf16 -r d89b0a12d229 b
285 diff -r 9161b9aeaf16 -r d89b0a12d229 b
286 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
286 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
287 +++ b/b Thu Jan 01 00:00:02 1970 +0000
287 +++ b/b Thu Jan 01 00:00:02 1970 +0000
288 @@ -0,0 +1,1 @@
288 @@ -0,0 +1,1 @@
289 +a
289 +a
290
290
291 changeset: 0:9161b9aeaf16
291 changeset: 0:9161b9aeaf16
292 user: test
292 user: test
293 date: Thu Jan 01 00:00:01 1970 +0000
293 date: Thu Jan 01 00:00:01 1970 +0000
294 summary: a
294 summary: a
295
295
296 diff -r 000000000000 -r 9161b9aeaf16 a
296 diff -r 000000000000 -r 9161b9aeaf16 a
297 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
297 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
298 +++ b/a Thu Jan 01 00:00:01 1970 +0000
298 +++ b/a Thu Jan 01 00:00:01 1970 +0000
299 @@ -0,0 +1,1 @@
299 @@ -0,0 +1,1 @@
300 +a
300 +a
301
301
302
302
303 log -pf, but no args
303 log -pf, but no args
304
304
305 $ hg log -pf
305 $ hg log -pf
306 changeset: 3:2ca5ba701980
306 changeset: 3:2ca5ba701980
307 user: test
307 user: test
308 date: Thu Jan 01 00:00:04 1970 +0000
308 date: Thu Jan 01 00:00:04 1970 +0000
309 summary: d
309 summary: d
310
310
311 diff -r f8954cd4dc1f -r 2ca5ba701980 a
311 diff -r f8954cd4dc1f -r 2ca5ba701980 a
312 --- a/a Thu Jan 01 00:00:03 1970 +0000
312 --- a/a Thu Jan 01 00:00:03 1970 +0000
313 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
313 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
314 @@ -1,1 +0,0 @@
314 @@ -1,1 +0,0 @@
315 -a
315 -a
316 diff -r f8954cd4dc1f -r 2ca5ba701980 b
316 diff -r f8954cd4dc1f -r 2ca5ba701980 b
317 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
317 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
318 +++ b/b Thu Jan 01 00:00:04 1970 +0000
318 +++ b/b Thu Jan 01 00:00:04 1970 +0000
319 @@ -0,0 +1,1 @@
319 @@ -0,0 +1,1 @@
320 +a
320 +a
321 diff -r f8954cd4dc1f -r 2ca5ba701980 d
321 diff -r f8954cd4dc1f -r 2ca5ba701980 d
322 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
322 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
323 +++ b/d Thu Jan 01 00:00:04 1970 +0000
323 +++ b/d Thu Jan 01 00:00:04 1970 +0000
324 @@ -0,0 +1,1 @@
324 @@ -0,0 +1,1 @@
325 +a
325 +a
326 diff -r f8954cd4dc1f -r 2ca5ba701980 g
326 diff -r f8954cd4dc1f -r 2ca5ba701980 g
327 --- a/g Thu Jan 01 00:00:03 1970 +0000
327 --- a/g Thu Jan 01 00:00:03 1970 +0000
328 +++ b/g Thu Jan 01 00:00:04 1970 +0000
328 +++ b/g Thu Jan 01 00:00:04 1970 +0000
329 @@ -1,2 +1,2 @@
329 @@ -1,2 +1,2 @@
330 f
330 f
331 -g
331 -g
332 +f
332 +f
333
333
334 changeset: 2:f8954cd4dc1f
334 changeset: 2:f8954cd4dc1f
335 user: test
335 user: test
336 date: Thu Jan 01 00:00:03 1970 +0000
336 date: Thu Jan 01 00:00:03 1970 +0000
337 summary: c
337 summary: c
338
338
339 diff -r d89b0a12d229 -r f8954cd4dc1f b
339 diff -r d89b0a12d229 -r f8954cd4dc1f b
340 --- a/b Thu Jan 01 00:00:02 1970 +0000
340 --- a/b Thu Jan 01 00:00:02 1970 +0000
341 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
341 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
342 @@ -1,1 +0,0 @@
342 @@ -1,1 +0,0 @@
343 -a
343 -a
344 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
344 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
345 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
345 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
346 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
346 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
347 @@ -0,0 +1,1 @@
347 @@ -0,0 +1,1 @@
348 +a
348 +a
349 diff -r d89b0a12d229 -r f8954cd4dc1f f
349 diff -r d89b0a12d229 -r f8954cd4dc1f f
350 --- a/f Thu Jan 01 00:00:02 1970 +0000
350 --- a/f Thu Jan 01 00:00:02 1970 +0000
351 +++ b/f Thu Jan 01 00:00:03 1970 +0000
351 +++ b/f Thu Jan 01 00:00:03 1970 +0000
352 @@ -1,1 +1,2 @@
352 @@ -1,1 +1,2 @@
353 f
353 f
354 +f
354 +f
355 diff -r d89b0a12d229 -r f8954cd4dc1f g
355 diff -r d89b0a12d229 -r f8954cd4dc1f g
356 --- a/g Thu Jan 01 00:00:02 1970 +0000
356 --- a/g Thu Jan 01 00:00:02 1970 +0000
357 +++ b/g Thu Jan 01 00:00:03 1970 +0000
357 +++ b/g Thu Jan 01 00:00:03 1970 +0000
358 @@ -1,1 +1,2 @@
358 @@ -1,1 +1,2 @@
359 f
359 f
360 +g
360 +g
361
361
362 changeset: 1:d89b0a12d229
362 changeset: 1:d89b0a12d229
363 user: test
363 user: test
364 date: Thu Jan 01 00:00:02 1970 +0000
364 date: Thu Jan 01 00:00:02 1970 +0000
365 summary: b
365 summary: b
366
366
367 diff -r 9161b9aeaf16 -r d89b0a12d229 b
367 diff -r 9161b9aeaf16 -r d89b0a12d229 b
368 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
368 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
369 +++ b/b Thu Jan 01 00:00:02 1970 +0000
369 +++ b/b Thu Jan 01 00:00:02 1970 +0000
370 @@ -0,0 +1,1 @@
370 @@ -0,0 +1,1 @@
371 +a
371 +a
372 diff -r 9161b9aeaf16 -r d89b0a12d229 g
372 diff -r 9161b9aeaf16 -r d89b0a12d229 g
373 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
373 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
374 +++ b/g Thu Jan 01 00:00:02 1970 +0000
374 +++ b/g Thu Jan 01 00:00:02 1970 +0000
375 @@ -0,0 +1,1 @@
375 @@ -0,0 +1,1 @@
376 +f
376 +f
377
377
378 changeset: 0:9161b9aeaf16
378 changeset: 0:9161b9aeaf16
379 user: test
379 user: test
380 date: Thu Jan 01 00:00:01 1970 +0000
380 date: Thu Jan 01 00:00:01 1970 +0000
381 summary: a
381 summary: a
382
382
383 diff -r 000000000000 -r 9161b9aeaf16 a
383 diff -r 000000000000 -r 9161b9aeaf16 a
384 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
384 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
385 +++ b/a Thu Jan 01 00:00:01 1970 +0000
385 +++ b/a Thu Jan 01 00:00:01 1970 +0000
386 @@ -0,0 +1,1 @@
386 @@ -0,0 +1,1 @@
387 +a
387 +a
388 diff -r 000000000000 -r 9161b9aeaf16 f
388 diff -r 000000000000 -r 9161b9aeaf16 f
389 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
389 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
390 +++ b/f Thu Jan 01 00:00:01 1970 +0000
390 +++ b/f Thu Jan 01 00:00:01 1970 +0000
391 @@ -0,0 +1,1 @@
391 @@ -0,0 +1,1 @@
392 +f
392 +f
393
393
394
394
395 log -vf dir/b
395 log -vf dir/b
396
396
397 $ hg log -vf dir/b
397 $ hg log -vf dir/b
398 changeset: 2:f8954cd4dc1f
398 changeset: 2:f8954cd4dc1f
399 user: test
399 user: test
400 date: Thu Jan 01 00:00:03 1970 +0000
400 date: Thu Jan 01 00:00:03 1970 +0000
401 files: b dir/b f g
401 files: b dir/b f g
402 description:
402 description:
403 c
403 c
404
404
405
405
406 changeset: 1:d89b0a12d229
406 changeset: 1:d89b0a12d229
407 user: test
407 user: test
408 date: Thu Jan 01 00:00:02 1970 +0000
408 date: Thu Jan 01 00:00:02 1970 +0000
409 files: b g
409 files: b g
410 description:
410 description:
411 b
411 b
412
412
413
413
414 changeset: 0:9161b9aeaf16
414 changeset: 0:9161b9aeaf16
415 user: test
415 user: test
416 date: Thu Jan 01 00:00:01 1970 +0000
416 date: Thu Jan 01 00:00:01 1970 +0000
417 files: a f
417 files: a f
418 description:
418 description:
419 a
419 a
420
420
421
421
422
422
423
423
424 -f and multiple filelog heads
424 -f and multiple filelog heads
425
425
426 $ hg up -q 2
426 $ hg up -q 2
427 $ hg log -f g --template '{rev}\n'
427 $ hg log -f g --template '{rev}\n'
428 2
428 2
429 1
429 1
430 0
430 0
431 $ hg up -q tip
431 $ hg up -q tip
432 $ hg log -f g --template '{rev}\n'
432 $ hg log -f g --template '{rev}\n'
433 3
433 3
434 2
434 2
435 0
435 0
436
436
437
437
438 log copies with --copies
438 log copies with --copies
439
439
440 $ hg log -vC --template '{rev} {file_copies}\n'
440 $ hg log -vC --template '{rev} {file_copies}\n'
441 4 e (dir/b)
441 4 e (dir/b)
442 3 b (a)g (f)
442 3 b (a)g (f)
443 2 dir/b (b)
443 2 dir/b (b)
444 1 b (a)g (f)
444 1 b (a)g (f)
445 0
445 0
446
446
447 log copies switch without --copies, with old filecopy template
447 log copies switch without --copies, with old filecopy template
448
448
449 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
449 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
450 4
450 4
451 3
451 3
452 2
452 2
453 1
453 1
454 0
454 0
455
455
456 log copies switch with --copies
456 log copies switch with --copies
457
457
458 $ hg log -vC --template '{rev} {file_copies_switch}\n'
458 $ hg log -vC --template '{rev} {file_copies_switch}\n'
459 4 e (dir/b)
459 4 e (dir/b)
460 3 b (a)g (f)
460 3 b (a)g (f)
461 2 dir/b (b)
461 2 dir/b (b)
462 1 b (a)g (f)
462 1 b (a)g (f)
463 0
463 0
464
464
465
465
466 log copies with hardcoded style and with --style=default
466 log copies with hardcoded style and with --style=default
467
467
468 $ hg log -vC -r4
468 $ hg log -vC -r4
469 changeset: 4:7e4639b4691b
469 changeset: 4:7e4639b4691b
470 tag: tip
470 tag: tip
471 user: test
471 user: test
472 date: Thu Jan 01 00:00:05 1970 +0000
472 date: Thu Jan 01 00:00:05 1970 +0000
473 files: dir/b e
473 files: dir/b e
474 copies: e (dir/b)
474 copies: e (dir/b)
475 description:
475 description:
476 e
476 e
477
477
478
478
479 $ hg log -vC -r4 --style=default
479 $ hg log -vC -r4 --style=default
480 changeset: 4:7e4639b4691b
480 changeset: 4:7e4639b4691b
481 tag: tip
481 tag: tip
482 user: test
482 user: test
483 date: Thu Jan 01 00:00:05 1970 +0000
483 date: Thu Jan 01 00:00:05 1970 +0000
484 files: dir/b e
484 files: dir/b e
485 copies: e (dir/b)
485 copies: e (dir/b)
486 description:
486 description:
487 e
487 e
488
488
489
489
490
490
491
491
492 log copies, non-linear manifest
492 log copies, non-linear manifest
493
493
494 $ hg up -C 3
494 $ hg up -C 3
495 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
495 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
496 $ hg mv dir/b e
496 $ hg mv dir/b e
497 $ echo foo > foo
497 $ echo foo > foo
498 $ hg ci -Ame2 -d '6 0'
498 $ hg ci -Ame2 -d '6 0'
499 adding foo
499 adding foo
500 created new head
500 created new head
501 $ hg log -v --template '{rev} {file_copies}\n' -r 5
501 $ hg log -v --template '{rev} {file_copies}\n' -r 5
502 5 e (dir/b)
502 5 e (dir/b)
503
503
504
504
505 log copies, execute bit set
505 log copies, execute bit set
506
506
507 #if execbit
507 #if execbit
508 $ chmod +x e
508 $ chmod +x e
509 $ hg ci -me3 -d '7 0'
509 $ hg ci -me3 -d '7 0'
510 $ hg log -v --template '{rev} {file_copies}\n' -r 6
510 $ hg log -v --template '{rev} {file_copies}\n' -r 6
511 6
511 6
512 #endif
512 #endif
513
513
514
514
515 log -p d
515 log -p d
516
516
517 $ hg log -pv d
517 $ hg log -pv d
518 changeset: 3:2ca5ba701980
518 changeset: 3:2ca5ba701980
519 user: test
519 user: test
520 date: Thu Jan 01 00:00:04 1970 +0000
520 date: Thu Jan 01 00:00:04 1970 +0000
521 files: a b d g
521 files: a b d g
522 description:
522 description:
523 d
523 d
524
524
525
525
526 diff -r f8954cd4dc1f -r 2ca5ba701980 d
526 diff -r f8954cd4dc1f -r 2ca5ba701980 d
527 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
527 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
528 +++ b/d Thu Jan 01 00:00:04 1970 +0000
528 +++ b/d Thu Jan 01 00:00:04 1970 +0000
529 @@ -0,0 +1,1 @@
529 @@ -0,0 +1,1 @@
530 +a
530 +a
531
531
532
532
533
533
534 log --removed file
534 log --removed file
535
535
536 $ hg log --removed -v a
536 $ hg log --removed -v a
537 changeset: 3:2ca5ba701980
537 changeset: 3:2ca5ba701980
538 user: test
538 user: test
539 date: Thu Jan 01 00:00:04 1970 +0000
539 date: Thu Jan 01 00:00:04 1970 +0000
540 files: a b d g
540 files: a b d g
541 description:
541 description:
542 d
542 d
543
543
544
544
545 changeset: 0:9161b9aeaf16
545 changeset: 0:9161b9aeaf16
546 user: test
546 user: test
547 date: Thu Jan 01 00:00:01 1970 +0000
547 date: Thu Jan 01 00:00:01 1970 +0000
548 files: a f
548 files: a f
549 description:
549 description:
550 a
550 a
551
551
552
552
553
553
554 log --removed revrange file
554 log --removed revrange file
555
555
556 $ hg log --removed -v -r0:2 a
556 $ hg log --removed -v -r0:2 a
557 changeset: 0:9161b9aeaf16
557 changeset: 0:9161b9aeaf16
558 user: test
558 user: test
559 date: Thu Jan 01 00:00:01 1970 +0000
559 date: Thu Jan 01 00:00:01 1970 +0000
560 files: a f
560 files: a f
561 description:
561 description:
562 a
562 a
563
563
564
564
565 $ cd ..
565 $ cd ..
566
566
567 log --follow tests
567 log --follow tests
568
568
569 $ hg init follow
569 $ hg init follow
570 $ cd follow
570 $ cd follow
571
571
572 $ echo base > base
572 $ echo base > base
573 $ hg ci -Ambase -d '1 0'
573 $ hg ci -Ambase -d '1 0'
574 adding base
574 adding base
575
575
576 $ echo r1 >> base
576 $ echo r1 >> base
577 $ hg ci -Amr1 -d '1 0'
577 $ hg ci -Amr1 -d '1 0'
578 $ echo r2 >> base
578 $ echo r2 >> base
579 $ hg ci -Amr2 -d '1 0'
579 $ hg ci -Amr2 -d '1 0'
580
580
581 $ hg up -C 1
581 $ hg up -C 1
582 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
582 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
583 $ echo b1 > b1
583 $ echo b1 > b1
584 $ hg ci -Amb1 -d '1 0'
584 $ hg ci -Amb1 -d '1 0'
585 adding b1
585 adding b1
586 created new head
586 created new head
587
587
588
588
589 log -f
589 log -f
590
590
591 $ hg log -f
591 $ hg log -f
592 changeset: 3:e62f78d544b4
592 changeset: 3:e62f78d544b4
593 tag: tip
593 tag: tip
594 parent: 1:3d5bf5654eda
594 parent: 1:3d5bf5654eda
595 user: test
595 user: test
596 date: Thu Jan 01 00:00:01 1970 +0000
596 date: Thu Jan 01 00:00:01 1970 +0000
597 summary: b1
597 summary: b1
598
598
599 changeset: 1:3d5bf5654eda
599 changeset: 1:3d5bf5654eda
600 user: test
600 user: test
601 date: Thu Jan 01 00:00:01 1970 +0000
601 date: Thu Jan 01 00:00:01 1970 +0000
602 summary: r1
602 summary: r1
603
603
604 changeset: 0:67e992f2c4f3
604 changeset: 0:67e992f2c4f3
605 user: test
605 user: test
606 date: Thu Jan 01 00:00:01 1970 +0000
606 date: Thu Jan 01 00:00:01 1970 +0000
607 summary: base
607 summary: base
608
608
609
609
610
610
611 log -f -r 1:tip
611 log -f -r 1:tip
612
612
613 $ hg up -C 0
613 $ hg up -C 0
614 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
614 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
615 $ echo b2 > b2
615 $ echo b2 > b2
616 $ hg ci -Amb2 -d '1 0'
616 $ hg ci -Amb2 -d '1 0'
617 adding b2
617 adding b2
618 created new head
618 created new head
619 $ hg log -f -r 1:tip
619 $ hg log -f -r 1:tip
620 changeset: 1:3d5bf5654eda
620 changeset: 1:3d5bf5654eda
621 user: test
621 user: test
622 date: Thu Jan 01 00:00:01 1970 +0000
622 date: Thu Jan 01 00:00:01 1970 +0000
623 summary: r1
623 summary: r1
624
624
625 changeset: 2:60c670bf5b30
625 changeset: 2:60c670bf5b30
626 user: test
626 user: test
627 date: Thu Jan 01 00:00:01 1970 +0000
627 date: Thu Jan 01 00:00:01 1970 +0000
628 summary: r2
628 summary: r2
629
629
630 changeset: 3:e62f78d544b4
630 changeset: 3:e62f78d544b4
631 parent: 1:3d5bf5654eda
631 parent: 1:3d5bf5654eda
632 user: test
632 user: test
633 date: Thu Jan 01 00:00:01 1970 +0000
633 date: Thu Jan 01 00:00:01 1970 +0000
634 summary: b1
634 summary: b1
635
635
636
636
637
637
638 log -r . with two parents
638 log -r . with two parents
639
639
640 $ hg up -C 3
640 $ hg up -C 3
641 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
641 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
642 $ hg merge tip
642 $ hg merge tip
643 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
643 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 (branch merge, don't forget to commit)
644 (branch merge, don't forget to commit)
645 $ hg log -r .
645 $ hg log -r .
646 changeset: 3:e62f78d544b4
646 changeset: 3:e62f78d544b4
647 parent: 1:3d5bf5654eda
647 parent: 1:3d5bf5654eda
648 user: test
648 user: test
649 date: Thu Jan 01 00:00:01 1970 +0000
649 date: Thu Jan 01 00:00:01 1970 +0000
650 summary: b1
650 summary: b1
651
651
652
652
653
653
654 log -r . with one parent
654 log -r . with one parent
655
655
656 $ hg ci -mm12 -d '1 0'
656 $ hg ci -mm12 -d '1 0'
657 $ hg log -r .
657 $ hg log -r .
658 changeset: 5:302e9dd6890d
658 changeset: 5:302e9dd6890d
659 tag: tip
659 tag: tip
660 parent: 3:e62f78d544b4
660 parent: 3:e62f78d544b4
661 parent: 4:ddb82e70d1a1
661 parent: 4:ddb82e70d1a1
662 user: test
662 user: test
663 date: Thu Jan 01 00:00:01 1970 +0000
663 date: Thu Jan 01 00:00:01 1970 +0000
664 summary: m12
664 summary: m12
665
665
666
666
667 $ echo postm >> b1
667 $ echo postm >> b1
668 $ hg ci -Amb1.1 -d'1 0'
668 $ hg ci -Amb1.1 -d'1 0'
669
669
670
670
671 log --follow-first
671 log --follow-first
672
672
673 $ hg log --follow-first
673 $ hg log --follow-first
674 changeset: 6:2404bbcab562
674 changeset: 6:2404bbcab562
675 tag: tip
675 tag: tip
676 user: test
676 user: test
677 date: Thu Jan 01 00:00:01 1970 +0000
677 date: Thu Jan 01 00:00:01 1970 +0000
678 summary: b1.1
678 summary: b1.1
679
679
680 changeset: 5:302e9dd6890d
680 changeset: 5:302e9dd6890d
681 parent: 3:e62f78d544b4
681 parent: 3:e62f78d544b4
682 parent: 4:ddb82e70d1a1
682 parent: 4:ddb82e70d1a1
683 user: test
683 user: test
684 date: Thu Jan 01 00:00:01 1970 +0000
684 date: Thu Jan 01 00:00:01 1970 +0000
685 summary: m12
685 summary: m12
686
686
687 changeset: 3:e62f78d544b4
687 changeset: 3:e62f78d544b4
688 parent: 1:3d5bf5654eda
688 parent: 1:3d5bf5654eda
689 user: test
689 user: test
690 date: Thu Jan 01 00:00:01 1970 +0000
690 date: Thu Jan 01 00:00:01 1970 +0000
691 summary: b1
691 summary: b1
692
692
693 changeset: 1:3d5bf5654eda
693 changeset: 1:3d5bf5654eda
694 user: test
694 user: test
695 date: Thu Jan 01 00:00:01 1970 +0000
695 date: Thu Jan 01 00:00:01 1970 +0000
696 summary: r1
696 summary: r1
697
697
698 changeset: 0:67e992f2c4f3
698 changeset: 0:67e992f2c4f3
699 user: test
699 user: test
700 date: Thu Jan 01 00:00:01 1970 +0000
700 date: Thu Jan 01 00:00:01 1970 +0000
701 summary: base
701 summary: base
702
702
703
703
704
704
705 log -P 2
705 log -P 2
706
706
707 $ hg log -P 2
707 $ hg log -P 2
708 changeset: 6:2404bbcab562
708 changeset: 6:2404bbcab562
709 tag: tip
709 tag: tip
710 user: test
710 user: test
711 date: Thu Jan 01 00:00:01 1970 +0000
711 date: Thu Jan 01 00:00:01 1970 +0000
712 summary: b1.1
712 summary: b1.1
713
713
714 changeset: 5:302e9dd6890d
714 changeset: 5:302e9dd6890d
715 parent: 3:e62f78d544b4
715 parent: 3:e62f78d544b4
716 parent: 4:ddb82e70d1a1
716 parent: 4:ddb82e70d1a1
717 user: test
717 user: test
718 date: Thu Jan 01 00:00:01 1970 +0000
718 date: Thu Jan 01 00:00:01 1970 +0000
719 summary: m12
719 summary: m12
720
720
721 changeset: 4:ddb82e70d1a1
721 changeset: 4:ddb82e70d1a1
722 parent: 0:67e992f2c4f3
722 parent: 0:67e992f2c4f3
723 user: test
723 user: test
724 date: Thu Jan 01 00:00:01 1970 +0000
724 date: Thu Jan 01 00:00:01 1970 +0000
725 summary: b2
725 summary: b2
726
726
727 changeset: 3:e62f78d544b4
727 changeset: 3:e62f78d544b4
728 parent: 1:3d5bf5654eda
728 parent: 1:3d5bf5654eda
729 user: test
729 user: test
730 date: Thu Jan 01 00:00:01 1970 +0000
730 date: Thu Jan 01 00:00:01 1970 +0000
731 summary: b1
731 summary: b1
732
732
733
733
734
734
735 log -r tip -p --git
735 log -r tip -p --git
736
736
737 $ hg log -r tip -p --git
737 $ hg log -r tip -p --git
738 changeset: 6:2404bbcab562
738 changeset: 6:2404bbcab562
739 tag: tip
739 tag: tip
740 user: test
740 user: test
741 date: Thu Jan 01 00:00:01 1970 +0000
741 date: Thu Jan 01 00:00:01 1970 +0000
742 summary: b1.1
742 summary: b1.1
743
743
744 diff --git a/b1 b/b1
744 diff --git a/b1 b/b1
745 --- a/b1
745 --- a/b1
746 +++ b/b1
746 +++ b/b1
747 @@ -1,1 +1,2 @@
747 @@ -1,1 +1,2 @@
748 b1
748 b1
749 +postm
749 +postm
750
750
751
751
752
752
753 log -r ""
753 log -r ""
754
754
755 $ hg log -r ''
755 $ hg log -r ''
756 hg: parse error: empty query
756 hg: parse error: empty query
757 [255]
757 [255]
758
758
759 log -r <some unknown node id>
759 log -r <some unknown node id>
760
760
761 $ hg log -r 1000000000000000000000000000000000000000
761 $ hg log -r 1000000000000000000000000000000000000000
762 abort: unknown revision '1000000000000000000000000000000000000000'!
762 abort: unknown revision '1000000000000000000000000000000000000000'!
763 [255]
763 [255]
764
764
765 log -k r1
765 log -k r1
766
766
767 $ hg log -k r1
767 $ hg log -k r1
768 changeset: 1:3d5bf5654eda
768 changeset: 1:3d5bf5654eda
769 user: test
769 user: test
770 date: Thu Jan 01 00:00:01 1970 +0000
770 date: Thu Jan 01 00:00:01 1970 +0000
771 summary: r1
771 summary: r1
772
772
773 log -p -l2 --color=always
773 log -p -l2 --color=always
774
774
775 $ hg --config extensions.color= --config color.mode=ansi \
775 $ hg --config extensions.color= --config color.mode=ansi \
776 > log -p -l2 --color=always
776 > log -p -l2 --color=always
777 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
777 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
778 tag: tip
778 tag: tip
779 user: test
779 user: test
780 date: Thu Jan 01 00:00:01 1970 +0000
780 date: Thu Jan 01 00:00:01 1970 +0000
781 summary: b1.1
781 summary: b1.1
782
782
783 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
783 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
784 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
784 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
785 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
785 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
786 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
786 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
787 b1
787 b1
788 \x1b[0;32m+postm\x1b[0m (esc)
788 \x1b[0;32m+postm\x1b[0m (esc)
789
789
790 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
790 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
791 parent: 3:e62f78d544b4
791 parent: 3:e62f78d544b4
792 parent: 4:ddb82e70d1a1
792 parent: 4:ddb82e70d1a1
793 user: test
793 user: test
794 date: Thu Jan 01 00:00:01 1970 +0000
794 date: Thu Jan 01 00:00:01 1970 +0000
795 summary: m12
795 summary: m12
796
796
797 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
797 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
798 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
798 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
799 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
799 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
800 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
800 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
801 \x1b[0;32m+b2\x1b[0m (esc)
801 \x1b[0;32m+b2\x1b[0m (esc)
802
802
803
803
804
804
805 log -r tip --stat
805 log -r tip --stat
806
806
807 $ hg log -r tip --stat
807 $ hg log -r tip --stat
808 changeset: 6:2404bbcab562
808 changeset: 6:2404bbcab562
809 tag: tip
809 tag: tip
810 user: test
810 user: test
811 date: Thu Jan 01 00:00:01 1970 +0000
811 date: Thu Jan 01 00:00:01 1970 +0000
812 summary: b1.1
812 summary: b1.1
813
813
814 b1 | 1 +
814 b1 | 1 +
815 1 files changed, 1 insertions(+), 0 deletions(-)
815 1 files changed, 1 insertions(+), 0 deletions(-)
816
816
817
817
818 $ cd ..
818 $ cd ..
819
819
820
820
821 User
821 User
822
822
823 $ hg init usertest
823 $ hg init usertest
824 $ cd usertest
824 $ cd usertest
825
825
826 $ echo a > a
826 $ echo a > a
827 $ hg ci -A -m "a" -u "User One <user1@example.org>"
827 $ hg ci -A -m "a" -u "User One <user1@example.org>"
828 adding a
828 adding a
829 $ echo b > b
829 $ echo b > b
830 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
830 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
831 adding b
831 adding b
832
832
833 $ hg log -u "User One <user1@example.org>"
833 $ hg log -u "User One <user1@example.org>"
834 changeset: 0:29a4c94f1924
834 changeset: 0:29a4c94f1924
835 user: User One <user1@example.org>
835 user: User One <user1@example.org>
836 date: Thu Jan 01 00:00:00 1970 +0000
836 date: Thu Jan 01 00:00:00 1970 +0000
837 summary: a
837 summary: a
838
838
839 $ hg log -u "user1" -u "user2"
839 $ hg log -u "user1" -u "user2"
840 changeset: 1:e834b5e69c0e
840 changeset: 1:e834b5e69c0e
841 tag: tip
841 tag: tip
842 user: User Two <user2@example.org>
842 user: User Two <user2@example.org>
843 date: Thu Jan 01 00:00:00 1970 +0000
843 date: Thu Jan 01 00:00:00 1970 +0000
844 summary: b
844 summary: b
845
845
846 changeset: 0:29a4c94f1924
846 changeset: 0:29a4c94f1924
847 user: User One <user1@example.org>
847 user: User One <user1@example.org>
848 date: Thu Jan 01 00:00:00 1970 +0000
848 date: Thu Jan 01 00:00:00 1970 +0000
849 summary: a
849 summary: a
850
850
851 $ hg log -u "user3"
851 $ hg log -u "user3"
852
852
853 $ cd ..
853 $ cd ..
854
854
855 $ hg init branches
855 $ hg init branches
856 $ cd branches
856 $ cd branches
857
857
858 $ echo a > a
858 $ echo a > a
859 $ hg ci -A -m "commit on default"
859 $ hg ci -A -m "commit on default"
860 adding a
860 adding a
861 $ hg branch test
861 $ hg branch test
862 marked working directory as branch test
862 marked working directory as branch test
863 (branches are permanent and global, did you want a bookmark?)
863 (branches are permanent and global, did you want a bookmark?)
864 $ echo b > b
864 $ echo b > b
865 $ hg ci -A -m "commit on test"
865 $ hg ci -A -m "commit on test"
866 adding b
866 adding b
867
867
868 $ hg up default
868 $ hg up default
869 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
869 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
870 $ echo c > c
870 $ echo c > c
871 $ hg ci -A -m "commit on default"
871 $ hg ci -A -m "commit on default"
872 adding c
872 adding c
873 $ hg up test
873 $ hg up test
874 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
874 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
875 $ echo c > c
875 $ echo c > c
876 $ hg ci -A -m "commit on test"
876 $ hg ci -A -m "commit on test"
877 adding c
877 adding c
878
878
879
879
880 log -b default
880 log -b default
881
881
882 $ hg log -b default
882 $ hg log -b default
883 changeset: 2:c3a4f03cc9a7
883 changeset: 2:c3a4f03cc9a7
884 parent: 0:24427303d56f
884 parent: 0:24427303d56f
885 user: test
885 user: test
886 date: Thu Jan 01 00:00:00 1970 +0000
886 date: Thu Jan 01 00:00:00 1970 +0000
887 summary: commit on default
887 summary: commit on default
888
888
889 changeset: 0:24427303d56f
889 changeset: 0:24427303d56f
890 user: test
890 user: test
891 date: Thu Jan 01 00:00:00 1970 +0000
891 date: Thu Jan 01 00:00:00 1970 +0000
892 summary: commit on default
892 summary: commit on default
893
893
894
894
895
895
896 log -b test
896 log -b test
897
897
898 $ hg log -b test
898 $ hg log -b test
899 changeset: 3:f5d8de11c2e2
899 changeset: 3:f5d8de11c2e2
900 branch: test
900 branch: test
901 tag: tip
901 tag: tip
902 parent: 1:d32277701ccb
902 parent: 1:d32277701ccb
903 user: test
903 user: test
904 date: Thu Jan 01 00:00:00 1970 +0000
904 date: Thu Jan 01 00:00:00 1970 +0000
905 summary: commit on test
905 summary: commit on test
906
906
907 changeset: 1:d32277701ccb
907 changeset: 1:d32277701ccb
908 branch: test
908 branch: test
909 user: test
909 user: test
910 date: Thu Jan 01 00:00:00 1970 +0000
910 date: Thu Jan 01 00:00:00 1970 +0000
911 summary: commit on test
911 summary: commit on test
912
912
913
913
914
914
915 log -b dummy
915 log -b dummy
916
916
917 $ hg log -b dummy
917 $ hg log -b dummy
918 abort: unknown revision 'dummy'!
918 abort: unknown revision 'dummy'!
919 [255]
919 [255]
920
920
921
921
922 log -b .
922 log -b .
923
923
924 $ hg log -b .
924 $ hg log -b .
925 changeset: 3:f5d8de11c2e2
925 changeset: 3:f5d8de11c2e2
926 branch: test
926 branch: test
927 tag: tip
927 tag: tip
928 parent: 1:d32277701ccb
928 parent: 1:d32277701ccb
929 user: test
929 user: test
930 date: Thu Jan 01 00:00:00 1970 +0000
930 date: Thu Jan 01 00:00:00 1970 +0000
931 summary: commit on test
931 summary: commit on test
932
932
933 changeset: 1:d32277701ccb
933 changeset: 1:d32277701ccb
934 branch: test
934 branch: test
935 user: test
935 user: test
936 date: Thu Jan 01 00:00:00 1970 +0000
936 date: Thu Jan 01 00:00:00 1970 +0000
937 summary: commit on test
937 summary: commit on test
938
938
939
939
940
940
941 log -b default -b test
941 log -b default -b test
942
942
943 $ hg log -b default -b test
943 $ hg log -b default -b test
944 changeset: 3:f5d8de11c2e2
944 changeset: 3:f5d8de11c2e2
945 branch: test
945 branch: test
946 tag: tip
946 tag: tip
947 parent: 1:d32277701ccb
947 parent: 1:d32277701ccb
948 user: test
948 user: test
949 date: Thu Jan 01 00:00:00 1970 +0000
949 date: Thu Jan 01 00:00:00 1970 +0000
950 summary: commit on test
950 summary: commit on test
951
951
952 changeset: 2:c3a4f03cc9a7
952 changeset: 2:c3a4f03cc9a7
953 parent: 0:24427303d56f
953 parent: 0:24427303d56f
954 user: test
954 user: test
955 date: Thu Jan 01 00:00:00 1970 +0000
955 date: Thu Jan 01 00:00:00 1970 +0000
956 summary: commit on default
956 summary: commit on default
957
957
958 changeset: 1:d32277701ccb
958 changeset: 1:d32277701ccb
959 branch: test
959 branch: test
960 user: test
960 user: test
961 date: Thu Jan 01 00:00:00 1970 +0000
961 date: Thu Jan 01 00:00:00 1970 +0000
962 summary: commit on test
962 summary: commit on test
963
963
964 changeset: 0:24427303d56f
964 changeset: 0:24427303d56f
965 user: test
965 user: test
966 date: Thu Jan 01 00:00:00 1970 +0000
966 date: Thu Jan 01 00:00:00 1970 +0000
967 summary: commit on default
967 summary: commit on default
968
968
969
969
970
970
971 log -b default -b .
971 log -b default -b .
972
972
973 $ hg log -b default -b .
973 $ hg log -b default -b .
974 changeset: 3:f5d8de11c2e2
974 changeset: 3:f5d8de11c2e2
975 branch: test
975 branch: test
976 tag: tip
976 tag: tip
977 parent: 1:d32277701ccb
977 parent: 1:d32277701ccb
978 user: test
978 user: test
979 date: Thu Jan 01 00:00:00 1970 +0000
979 date: Thu Jan 01 00:00:00 1970 +0000
980 summary: commit on test
980 summary: commit on test
981
981
982 changeset: 2:c3a4f03cc9a7
982 changeset: 2:c3a4f03cc9a7
983 parent: 0:24427303d56f
983 parent: 0:24427303d56f
984 user: test
984 user: test
985 date: Thu Jan 01 00:00:00 1970 +0000
985 date: Thu Jan 01 00:00:00 1970 +0000
986 summary: commit on default
986 summary: commit on default
987
987
988 changeset: 1:d32277701ccb
988 changeset: 1:d32277701ccb
989 branch: test
989 branch: test
990 user: test
990 user: test
991 date: Thu Jan 01 00:00:00 1970 +0000
991 date: Thu Jan 01 00:00:00 1970 +0000
992 summary: commit on test
992 summary: commit on test
993
993
994 changeset: 0:24427303d56f
994 changeset: 0:24427303d56f
995 user: test
995 user: test
996 date: Thu Jan 01 00:00:00 1970 +0000
996 date: Thu Jan 01 00:00:00 1970 +0000
997 summary: commit on default
997 summary: commit on default
998
998
999
999
1000
1000
1001 log -b . -b test
1001 log -b . -b test
1002
1002
1003 $ hg log -b . -b test
1003 $ hg log -b . -b test
1004 changeset: 3:f5d8de11c2e2
1004 changeset: 3:f5d8de11c2e2
1005 branch: test
1005 branch: test
1006 tag: tip
1006 tag: tip
1007 parent: 1:d32277701ccb
1007 parent: 1:d32277701ccb
1008 user: test
1008 user: test
1009 date: Thu Jan 01 00:00:00 1970 +0000
1009 date: Thu Jan 01 00:00:00 1970 +0000
1010 summary: commit on test
1010 summary: commit on test
1011
1011
1012 changeset: 1:d32277701ccb
1012 changeset: 1:d32277701ccb
1013 branch: test
1013 branch: test
1014 user: test
1014 user: test
1015 date: Thu Jan 01 00:00:00 1970 +0000
1015 date: Thu Jan 01 00:00:00 1970 +0000
1016 summary: commit on test
1016 summary: commit on test
1017
1017
1018
1018
1019
1019
1020 log -b 2
1020 log -b 2
1021
1021
1022 $ hg log -b 2
1022 $ hg log -b 2
1023 changeset: 2:c3a4f03cc9a7
1023 changeset: 2:c3a4f03cc9a7
1024 parent: 0:24427303d56f
1024 parent: 0:24427303d56f
1025 user: test
1025 user: test
1026 date: Thu Jan 01 00:00:00 1970 +0000
1026 date: Thu Jan 01 00:00:00 1970 +0000
1027 summary: commit on default
1027 summary: commit on default
1028
1028
1029 changeset: 0:24427303d56f
1029 changeset: 0:24427303d56f
1030 user: test
1030 user: test
1031 date: Thu Jan 01 00:00:00 1970 +0000
1031 date: Thu Jan 01 00:00:00 1970 +0000
1032 summary: commit on default
1032 summary: commit on default
1033
1033
1034 #if gettext
1034 #if gettext
1035
1035
1036 Test that all log names are translated (e.g. branches, bookmarks, tags):
1036 Test that all log names are translated (e.g. branches, bookmarks, tags):
1037
1037
1038 $ hg bookmark babar -r tip
1038 $ hg bookmark babar -r tip
1039
1039
1040 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
1040 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
1041 \xc3\x84nderung: 3:f5d8de11c2e2 (esc)
1041 \xc3\x84nderung: 3:f5d8de11c2e2 (esc)
1042 Zweig: test
1042 Zweig: test
1043 Lesezeichen: babar
1043 Lesezeichen: babar
1044 Marke: tip
1044 Marke: tip
1045 Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
1045 Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
1046 Nutzer: test
1046 Nutzer: test
1047 Datum: Thu Jan 01 00:00:00 1970 +0000
1047 Datum: Thu Jan 01 00:00:00 1970 +0000
1048 Zusammenfassung: commit on test
1048 Zusammenfassung: commit on test
1049
1049
1050 $ hg bookmark -d babar
1050 $ hg bookmark -d babar
1051
1051
1052 #endif
1052 #endif
1053
1053
1054 log -p --cwd dir (in subdir)
1054 log -p --cwd dir (in subdir)
1055
1055
1056 $ mkdir dir
1056 $ mkdir dir
1057 $ hg log -p --cwd dir
1057 $ hg log -p --cwd dir
1058 changeset: 3:f5d8de11c2e2
1058 changeset: 3:f5d8de11c2e2
1059 branch: test
1059 branch: test
1060 tag: tip
1060 tag: tip
1061 parent: 1:d32277701ccb
1061 parent: 1:d32277701ccb
1062 user: test
1062 user: test
1063 date: Thu Jan 01 00:00:00 1970 +0000
1063 date: Thu Jan 01 00:00:00 1970 +0000
1064 summary: commit on test
1064 summary: commit on test
1065
1065
1066 diff -r d32277701ccb -r f5d8de11c2e2 c
1066 diff -r d32277701ccb -r f5d8de11c2e2 c
1067 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1067 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1068 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1068 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1069 @@ -0,0 +1,1 @@
1069 @@ -0,0 +1,1 @@
1070 +c
1070 +c
1071
1071
1072 changeset: 2:c3a4f03cc9a7
1072 changeset: 2:c3a4f03cc9a7
1073 parent: 0:24427303d56f
1073 parent: 0:24427303d56f
1074 user: test
1074 user: test
1075 date: Thu Jan 01 00:00:00 1970 +0000
1075 date: Thu Jan 01 00:00:00 1970 +0000
1076 summary: commit on default
1076 summary: commit on default
1077
1077
1078 diff -r 24427303d56f -r c3a4f03cc9a7 c
1078 diff -r 24427303d56f -r c3a4f03cc9a7 c
1079 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1079 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1080 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1080 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1081 @@ -0,0 +1,1 @@
1081 @@ -0,0 +1,1 @@
1082 +c
1082 +c
1083
1083
1084 changeset: 1:d32277701ccb
1084 changeset: 1:d32277701ccb
1085 branch: test
1085 branch: test
1086 user: test
1086 user: test
1087 date: Thu Jan 01 00:00:00 1970 +0000
1087 date: Thu Jan 01 00:00:00 1970 +0000
1088 summary: commit on test
1088 summary: commit on test
1089
1089
1090 diff -r 24427303d56f -r d32277701ccb b
1090 diff -r 24427303d56f -r d32277701ccb b
1091 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1091 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1092 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1092 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1093 @@ -0,0 +1,1 @@
1093 @@ -0,0 +1,1 @@
1094 +b
1094 +b
1095
1095
1096 changeset: 0:24427303d56f
1096 changeset: 0:24427303d56f
1097 user: test
1097 user: test
1098 date: Thu Jan 01 00:00:00 1970 +0000
1098 date: Thu Jan 01 00:00:00 1970 +0000
1099 summary: commit on default
1099 summary: commit on default
1100
1100
1101 diff -r 000000000000 -r 24427303d56f a
1101 diff -r 000000000000 -r 24427303d56f a
1102 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1102 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1103 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1103 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1104 @@ -0,0 +1,1 @@
1104 @@ -0,0 +1,1 @@
1105 +a
1105 +a
1106
1106
1107
1107
1108
1108
1109 log -p -R repo
1109 log -p -R repo
1110
1110
1111 $ cd dir
1111 $ cd dir
1112 $ hg log -p -R .. ../a
1112 $ hg log -p -R .. ../a
1113 changeset: 0:24427303d56f
1113 changeset: 0:24427303d56f
1114 user: test
1114 user: test
1115 date: Thu Jan 01 00:00:00 1970 +0000
1115 date: Thu Jan 01 00:00:00 1970 +0000
1116 summary: commit on default
1116 summary: commit on default
1117
1117
1118 diff -r 000000000000 -r 24427303d56f a
1118 diff -r 000000000000 -r 24427303d56f a
1119 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1119 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1120 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1120 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1121 @@ -0,0 +1,1 @@
1121 @@ -0,0 +1,1 @@
1122 +a
1122 +a
1123
1123
1124
1124
1125 $ cd ../..
1125 $ cd ../..
1126
1126
1127 $ hg init follow2
1127 $ hg init follow2
1128 $ cd follow2
1128 $ cd follow2
1129
1129
1130 # Build the following history:
1130 # Build the following history:
1131 # tip - o - x - o - x - x
1131 # tip - o - x - o - x - x
1132 # \ /
1132 # \ /
1133 # o - o - o - x
1133 # o - o - o - x
1134 # \ /
1134 # \ /
1135 # o
1135 # o
1136 #
1136 #
1137 # Where "o" is a revision containing "foo" and
1137 # Where "o" is a revision containing "foo" and
1138 # "x" is a revision without "foo"
1138 # "x" is a revision without "foo"
1139
1139
1140 $ touch init
1140 $ touch init
1141 $ hg ci -A -m "init, unrelated"
1141 $ hg ci -A -m "init, unrelated"
1142 adding init
1142 adding init
1143 $ echo 'foo' > init
1143 $ echo 'foo' > init
1144 $ hg ci -m "change, unrelated"
1144 $ hg ci -m "change, unrelated"
1145 $ echo 'foo' > foo
1145 $ echo 'foo' > foo
1146 $ hg ci -A -m "add unrelated old foo"
1146 $ hg ci -A -m "add unrelated old foo"
1147 adding foo
1147 adding foo
1148 $ hg rm foo
1148 $ hg rm foo
1149 $ hg ci -m "delete foo, unrelated"
1149 $ hg ci -m "delete foo, unrelated"
1150 $ echo 'related' > foo
1150 $ echo 'related' > foo
1151 $ hg ci -A -m "add foo, related"
1151 $ hg ci -A -m "add foo, related"
1152 adding foo
1152 adding foo
1153
1153
1154 $ hg up 0
1154 $ hg up 0
1155 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1155 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1156 $ touch branch
1156 $ touch branch
1157 $ hg ci -A -m "first branch, unrelated"
1157 $ hg ci -A -m "first branch, unrelated"
1158 adding branch
1158 adding branch
1159 created new head
1159 created new head
1160 $ touch foo
1160 $ touch foo
1161 $ hg ci -A -m "create foo, related"
1161 $ hg ci -A -m "create foo, related"
1162 adding foo
1162 adding foo
1163 $ echo 'change' > foo
1163 $ echo 'change' > foo
1164 $ hg ci -m "change foo, related"
1164 $ hg ci -m "change foo, related"
1165
1165
1166 $ hg up 6
1166 $ hg up 6
1167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1168 $ echo 'change foo in branch' > foo
1168 $ echo 'change foo in branch' > foo
1169 $ hg ci -m "change foo in branch, related"
1169 $ hg ci -m "change foo in branch, related"
1170 created new head
1170 created new head
1171 $ hg merge 7
1171 $ hg merge 7
1172 merging foo
1172 merging foo
1173 warning: conflicts during merge.
1173 warning: conflicts during merge.
1174 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
1174 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
1175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1176 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1176 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1177 [1]
1177 [1]
1178 $ echo 'merge 1' > foo
1178 $ echo 'merge 1' > foo
1179 $ hg resolve -m foo
1179 $ hg resolve -m foo
1180 (no more unresolved files)
1180 (no more unresolved files)
1181 $ hg ci -m "First merge, related"
1181 $ hg ci -m "First merge, related"
1182
1182
1183 $ hg merge 4
1183 $ hg merge 4
1184 merging foo
1184 merging foo
1185 warning: conflicts during merge.
1185 warning: conflicts during merge.
1186 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
1186 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
1187 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
1187 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
1188 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1188 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
1189 [1]
1189 [1]
1190 $ echo 'merge 2' > foo
1190 $ echo 'merge 2' > foo
1191 $ hg resolve -m foo
1191 $ hg resolve -m foo
1192 (no more unresolved files)
1192 (no more unresolved files)
1193 $ hg ci -m "Last merge, related"
1193 $ hg ci -m "Last merge, related"
1194
1194
1195 $ hg log --graph
1195 $ hg log --graph
1196 @ changeset: 10:4dae8563d2c5
1196 @ changeset: 10:4dae8563d2c5
1197 |\ tag: tip
1197 |\ tag: tip
1198 | | parent: 9:7b35701b003e
1198 | | parent: 9:7b35701b003e
1199 | | parent: 4:88176d361b69
1199 | | parent: 4:88176d361b69
1200 | | user: test
1200 | | user: test
1201 | | date: Thu Jan 01 00:00:00 1970 +0000
1201 | | date: Thu Jan 01 00:00:00 1970 +0000
1202 | | summary: Last merge, related
1202 | | summary: Last merge, related
1203 | |
1203 | |
1204 | o changeset: 9:7b35701b003e
1204 | o changeset: 9:7b35701b003e
1205 | |\ parent: 8:e5416ad8a855
1205 | |\ parent: 8:e5416ad8a855
1206 | | | parent: 7:87fe3144dcfa
1206 | | | parent: 7:87fe3144dcfa
1207 | | | user: test
1207 | | | user: test
1208 | | | date: Thu Jan 01 00:00:00 1970 +0000
1208 | | | date: Thu Jan 01 00:00:00 1970 +0000
1209 | | | summary: First merge, related
1209 | | | summary: First merge, related
1210 | | |
1210 | | |
1211 | | o changeset: 8:e5416ad8a855
1211 | | o changeset: 8:e5416ad8a855
1212 | | | parent: 6:dc6c325fe5ee
1212 | | | parent: 6:dc6c325fe5ee
1213 | | | user: test
1213 | | | user: test
1214 | | | date: Thu Jan 01 00:00:00 1970 +0000
1214 | | | date: Thu Jan 01 00:00:00 1970 +0000
1215 | | | summary: change foo in branch, related
1215 | | | summary: change foo in branch, related
1216 | | |
1216 | | |
1217 | o | changeset: 7:87fe3144dcfa
1217 | o | changeset: 7:87fe3144dcfa
1218 | |/ user: test
1218 | |/ user: test
1219 | | date: Thu Jan 01 00:00:00 1970 +0000
1219 | | date: Thu Jan 01 00:00:00 1970 +0000
1220 | | summary: change foo, related
1220 | | summary: change foo, related
1221 | |
1221 | |
1222 | o changeset: 6:dc6c325fe5ee
1222 | o changeset: 6:dc6c325fe5ee
1223 | | user: test
1223 | | user: test
1224 | | date: Thu Jan 01 00:00:00 1970 +0000
1224 | | date: Thu Jan 01 00:00:00 1970 +0000
1225 | | summary: create foo, related
1225 | | summary: create foo, related
1226 | |
1226 | |
1227 | o changeset: 5:73db34516eb9
1227 | o changeset: 5:73db34516eb9
1228 | | parent: 0:e87515fd044a
1228 | | parent: 0:e87515fd044a
1229 | | user: test
1229 | | user: test
1230 | | date: Thu Jan 01 00:00:00 1970 +0000
1230 | | date: Thu Jan 01 00:00:00 1970 +0000
1231 | | summary: first branch, unrelated
1231 | | summary: first branch, unrelated
1232 | |
1232 | |
1233 o | changeset: 4:88176d361b69
1233 o | changeset: 4:88176d361b69
1234 | | user: test
1234 | | user: test
1235 | | date: Thu Jan 01 00:00:00 1970 +0000
1235 | | date: Thu Jan 01 00:00:00 1970 +0000
1236 | | summary: add foo, related
1236 | | summary: add foo, related
1237 | |
1237 | |
1238 o | changeset: 3:dd78ae4afb56
1238 o | changeset: 3:dd78ae4afb56
1239 | | user: test
1239 | | user: test
1240 | | date: Thu Jan 01 00:00:00 1970 +0000
1240 | | date: Thu Jan 01 00:00:00 1970 +0000
1241 | | summary: delete foo, unrelated
1241 | | summary: delete foo, unrelated
1242 | |
1242 | |
1243 o | changeset: 2:c4c64aedf0f7
1243 o | changeset: 2:c4c64aedf0f7
1244 | | user: test
1244 | | user: test
1245 | | date: Thu Jan 01 00:00:00 1970 +0000
1245 | | date: Thu Jan 01 00:00:00 1970 +0000
1246 | | summary: add unrelated old foo
1246 | | summary: add unrelated old foo
1247 | |
1247 | |
1248 o | changeset: 1:e5faa7440653
1248 o | changeset: 1:e5faa7440653
1249 |/ user: test
1249 |/ user: test
1250 | date: Thu Jan 01 00:00:00 1970 +0000
1250 | date: Thu Jan 01 00:00:00 1970 +0000
1251 | summary: change, unrelated
1251 | summary: change, unrelated
1252 |
1252 |
1253 o changeset: 0:e87515fd044a
1253 o changeset: 0:e87515fd044a
1254 user: test
1254 user: test
1255 date: Thu Jan 01 00:00:00 1970 +0000
1255 date: Thu Jan 01 00:00:00 1970 +0000
1256 summary: init, unrelated
1256 summary: init, unrelated
1257
1257
1258
1258
1259 $ hg --traceback log -f foo
1259 $ hg --traceback log -f foo
1260 changeset: 10:4dae8563d2c5
1260 changeset: 10:4dae8563d2c5
1261 tag: tip
1261 tag: tip
1262 parent: 9:7b35701b003e
1262 parent: 9:7b35701b003e
1263 parent: 4:88176d361b69
1263 parent: 4:88176d361b69
1264 user: test
1264 user: test
1265 date: Thu Jan 01 00:00:00 1970 +0000
1265 date: Thu Jan 01 00:00:00 1970 +0000
1266 summary: Last merge, related
1266 summary: Last merge, related
1267
1267
1268 changeset: 9:7b35701b003e
1268 changeset: 9:7b35701b003e
1269 parent: 8:e5416ad8a855
1269 parent: 8:e5416ad8a855
1270 parent: 7:87fe3144dcfa
1270 parent: 7:87fe3144dcfa
1271 user: test
1271 user: test
1272 date: Thu Jan 01 00:00:00 1970 +0000
1272 date: Thu Jan 01 00:00:00 1970 +0000
1273 summary: First merge, related
1273 summary: First merge, related
1274
1274
1275 changeset: 8:e5416ad8a855
1275 changeset: 8:e5416ad8a855
1276 parent: 6:dc6c325fe5ee
1276 parent: 6:dc6c325fe5ee
1277 user: test
1277 user: test
1278 date: Thu Jan 01 00:00:00 1970 +0000
1278 date: Thu Jan 01 00:00:00 1970 +0000
1279 summary: change foo in branch, related
1279 summary: change foo in branch, related
1280
1280
1281 changeset: 7:87fe3144dcfa
1281 changeset: 7:87fe3144dcfa
1282 user: test
1282 user: test
1283 date: Thu Jan 01 00:00:00 1970 +0000
1283 date: Thu Jan 01 00:00:00 1970 +0000
1284 summary: change foo, related
1284 summary: change foo, related
1285
1285
1286 changeset: 6:dc6c325fe5ee
1286 changeset: 6:dc6c325fe5ee
1287 user: test
1287 user: test
1288 date: Thu Jan 01 00:00:00 1970 +0000
1288 date: Thu Jan 01 00:00:00 1970 +0000
1289 summary: create foo, related
1289 summary: create foo, related
1290
1290
1291 changeset: 4:88176d361b69
1291 changeset: 4:88176d361b69
1292 user: test
1292 user: test
1293 date: Thu Jan 01 00:00:00 1970 +0000
1293 date: Thu Jan 01 00:00:00 1970 +0000
1294 summary: add foo, related
1294 summary: add foo, related
1295
1295
1296
1296
1297 Also check when maxrev < lastrevfilelog
1297 Also check when maxrev < lastrevfilelog
1298
1298
1299 $ hg --traceback log -f -r4 foo
1299 $ hg --traceback log -f -r4 foo
1300 changeset: 4:88176d361b69
1300 changeset: 4:88176d361b69
1301 user: test
1301 user: test
1302 date: Thu Jan 01 00:00:00 1970 +0000
1302 date: Thu Jan 01 00:00:00 1970 +0000
1303 summary: add foo, related
1303 summary: add foo, related
1304
1304
1305 $ cd ..
1305 $ cd ..
1306
1306
1307 Issue2383: hg log showing _less_ differences than hg diff
1307 Issue2383: hg log showing _less_ differences than hg diff
1308
1308
1309 $ hg init issue2383
1309 $ hg init issue2383
1310 $ cd issue2383
1310 $ cd issue2383
1311
1311
1312 Create a test repo:
1312 Create a test repo:
1313
1313
1314 $ echo a > a
1314 $ echo a > a
1315 $ hg ci -Am0
1315 $ hg ci -Am0
1316 adding a
1316 adding a
1317 $ echo b > b
1317 $ echo b > b
1318 $ hg ci -Am1
1318 $ hg ci -Am1
1319 adding b
1319 adding b
1320 $ hg co 0
1320 $ hg co 0
1321 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1321 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1322 $ echo b > a
1322 $ echo b > a
1323 $ hg ci -m2
1323 $ hg ci -m2
1324 created new head
1324 created new head
1325
1325
1326 Merge:
1326 Merge:
1327
1327
1328 $ hg merge
1328 $ hg merge
1329 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1329 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1330 (branch merge, don't forget to commit)
1330 (branch merge, don't forget to commit)
1331
1331
1332 Make sure there's a file listed in the merge to trigger the bug:
1332 Make sure there's a file listed in the merge to trigger the bug:
1333
1333
1334 $ echo c > a
1334 $ echo c > a
1335 $ hg ci -m3
1335 $ hg ci -m3
1336
1336
1337 Two files shown here in diff:
1337 Two files shown here in diff:
1338
1338
1339 $ hg diff --rev 2:3
1339 $ hg diff --rev 2:3
1340 diff -r b09be438c43a -r 8e07aafe1edc a
1340 diff -r b09be438c43a -r 8e07aafe1edc a
1341 --- a/a Thu Jan 01 00:00:00 1970 +0000
1341 --- a/a Thu Jan 01 00:00:00 1970 +0000
1342 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1342 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1343 @@ -1,1 +1,1 @@
1343 @@ -1,1 +1,1 @@
1344 -b
1344 -b
1345 +c
1345 +c
1346 diff -r b09be438c43a -r 8e07aafe1edc b
1346 diff -r b09be438c43a -r 8e07aafe1edc b
1347 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1347 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1348 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1348 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1349 @@ -0,0 +1,1 @@
1349 @@ -0,0 +1,1 @@
1350 +b
1350 +b
1351
1351
1352 Diff here should be the same:
1352 Diff here should be the same:
1353
1353
1354 $ hg log -vpr 3
1354 $ hg log -vpr 3
1355 changeset: 3:8e07aafe1edc
1355 changeset: 3:8e07aafe1edc
1356 tag: tip
1356 tag: tip
1357 parent: 2:b09be438c43a
1357 parent: 2:b09be438c43a
1358 parent: 1:925d80f479bb
1358 parent: 1:925d80f479bb
1359 user: test
1359 user: test
1360 date: Thu Jan 01 00:00:00 1970 +0000
1360 date: Thu Jan 01 00:00:00 1970 +0000
1361 files: a
1361 files: a
1362 description:
1362 description:
1363 3
1363 3
1364
1364
1365
1365
1366 diff -r b09be438c43a -r 8e07aafe1edc a
1366 diff -r b09be438c43a -r 8e07aafe1edc a
1367 --- a/a Thu Jan 01 00:00:00 1970 +0000
1367 --- a/a Thu Jan 01 00:00:00 1970 +0000
1368 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1368 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1369 @@ -1,1 +1,1 @@
1369 @@ -1,1 +1,1 @@
1370 -b
1370 -b
1371 +c
1371 +c
1372 diff -r b09be438c43a -r 8e07aafe1edc b
1372 diff -r b09be438c43a -r 8e07aafe1edc b
1373 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1373 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1374 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1374 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1375 @@ -0,0 +1,1 @@
1375 @@ -0,0 +1,1 @@
1376 +b
1376 +b
1377
1377
1378 $ cd ..
1378 $ cd ..
1379
1379
1380 'hg log -r rev fn' when last(filelog(fn)) != rev
1380 'hg log -r rev fn' when last(filelog(fn)) != rev
1381
1381
1382 $ hg init simplelog
1382 $ hg init simplelog
1383 $ cd simplelog
1383 $ cd simplelog
1384 $ echo f > a
1384 $ echo f > a
1385 $ hg ci -Am'a' -d '0 0'
1385 $ hg ci -Am'a' -d '0 0'
1386 adding a
1386 adding a
1387 $ echo f >> a
1387 $ echo f >> a
1388 $ hg ci -Am'a bis' -d '1 0'
1388 $ hg ci -Am'a bis' -d '1 0'
1389
1389
1390 $ hg log -r0 a
1390 $ hg log -r0 a
1391 changeset: 0:9f758d63dcde
1391 changeset: 0:9f758d63dcde
1392 user: test
1392 user: test
1393 date: Thu Jan 01 00:00:00 1970 +0000
1393 date: Thu Jan 01 00:00:00 1970 +0000
1394 summary: a
1394 summary: a
1395
1395
1396 enable obsolete to test hidden feature
1396 enable obsolete to test hidden feature
1397
1397
1398 $ cat >> $HGRCPATH << EOF
1398 $ cat >> $HGRCPATH << EOF
1399 > [experimental]
1399 > [experimental]
1400 > evolution=createmarkers
1400 > evolution=createmarkers
1401 > EOF
1401 > EOF
1402
1402
1403 $ hg log --template='{rev}:{node}\n'
1403 $ hg log --template='{rev}:{node}\n'
1404 1:a765632148dc55d38c35c4f247c618701886cb2f
1404 1:a765632148dc55d38c35c4f247c618701886cb2f
1405 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1405 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1406 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
1406 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
1407 $ hg up null -q
1407 $ hg up null -q
1408 $ hg log --template='{rev}:{node}\n'
1408 $ hg log --template='{rev}:{node}\n'
1409 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1409 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1410 $ hg log --template='{rev}:{node}\n' --hidden
1410 $ hg log --template='{rev}:{node}\n' --hidden
1411 1:a765632148dc55d38c35c4f247c618701886cb2f
1411 1:a765632148dc55d38c35c4f247c618701886cb2f
1412 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1412 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1413 $ hg log -r a
1413 $ hg log -r a
1414 abort: hidden revision 'a'!
1414 abort: hidden revision 'a'!
1415 (use --hidden to access hidden revisions)
1415 (use --hidden to access hidden revisions)
1416 [255]
1416 [255]
1417
1417
1418 test that parent prevent a changeset to be hidden
1418 test that parent prevent a changeset to be hidden
1419
1419
1420 $ hg up 1 -q --hidden
1420 $ hg up 1 -q --hidden
1421 $ hg log --template='{rev}:{node}\n'
1421 $ hg log --template='{rev}:{node}\n'
1422 1:a765632148dc55d38c35c4f247c618701886cb2f
1422 1:a765632148dc55d38c35c4f247c618701886cb2f
1423 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1423 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1424
1424
1425 test that second parent prevent a changeset to be hidden too
1425 test that second parent prevent a changeset to be hidden too
1426
1426
1427 $ hg debugsetparents 0 1 # nothing suitable to merge here
1427 $ hg debugsetparents 0 1 # nothing suitable to merge here
1428 $ hg log --template='{rev}:{node}\n'
1428 $ hg log --template='{rev}:{node}\n'
1429 1:a765632148dc55d38c35c4f247c618701886cb2f
1429 1:a765632148dc55d38c35c4f247c618701886cb2f
1430 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1430 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1431 $ hg debugsetparents 1
1431 $ hg debugsetparents 1
1432 $ hg up -q null
1432 $ hg up -q null
1433
1433
1434 bookmarks prevent a changeset being hidden
1434 bookmarks prevent a changeset being hidden
1435
1435
1436 $ hg bookmark --hidden -r 1 X
1436 $ hg bookmark --hidden -r 1 X
1437 $ hg log --template '{rev}:{node}\n'
1437 $ hg log --template '{rev}:{node}\n'
1438 1:a765632148dc55d38c35c4f247c618701886cb2f
1438 1:a765632148dc55d38c35c4f247c618701886cb2f
1439 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1439 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1440 $ hg bookmark -d X
1440 $ hg bookmark -d X
1441
1441
1442 divergent bookmarks are not hidden
1442 divergent bookmarks are not hidden
1443
1443
1444 $ hg bookmark --hidden -r 1 X@foo
1444 $ hg bookmark --hidden -r 1 X@foo
1445 $ hg log --template '{rev}:{node}\n'
1445 $ hg log --template '{rev}:{node}\n'
1446 1:a765632148dc55d38c35c4f247c618701886cb2f
1446 1:a765632148dc55d38c35c4f247c618701886cb2f
1447 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1447 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1448
1448
1449 clear extensions configuration
1449 clear extensions configuration
1450 $ echo '[extensions]' >> $HGRCPATH
1450 $ echo '[extensions]' >> $HGRCPATH
1451 $ echo "obs=!" >> $HGRCPATH
1451 $ echo "obs=!" >> $HGRCPATH
1452 $ cd ..
1452 $ cd ..
1453
1453
1454 test -u/-k for problematic encoding
1454 test -u/-k for problematic encoding
1455 # unicode: cp932:
1455 # unicode: cp932:
1456 # u30A2 0x83 0x41(= 'A')
1456 # u30A2 0x83 0x41(= 'A')
1457 # u30C2 0x83 0x61(= 'a')
1457 # u30C2 0x83 0x61(= 'a')
1458
1458
1459 $ hg init problematicencoding
1459 $ hg init problematicencoding
1460 $ cd problematicencoding
1460 $ cd problematicencoding
1461
1461
1462 $ python > setup.sh <<EOF
1462 $ python > setup.sh <<EOF
1463 > print u'''
1463 > print u'''
1464 > echo a > text
1464 > echo a > text
1465 > hg add text
1465 > hg add text
1466 > hg --encoding utf-8 commit -u '\u30A2' -m none
1466 > hg --encoding utf-8 commit -u '\u30A2' -m none
1467 > echo b > text
1467 > echo b > text
1468 > hg --encoding utf-8 commit -u '\u30C2' -m none
1468 > hg --encoding utf-8 commit -u '\u30C2' -m none
1469 > echo c > text
1469 > echo c > text
1470 > hg --encoding utf-8 commit -u none -m '\u30A2'
1470 > hg --encoding utf-8 commit -u none -m '\u30A2'
1471 > echo d > text
1471 > echo d > text
1472 > hg --encoding utf-8 commit -u none -m '\u30C2'
1472 > hg --encoding utf-8 commit -u none -m '\u30C2'
1473 > '''.encode('utf-8')
1473 > '''.encode('utf-8')
1474 > EOF
1474 > EOF
1475 $ sh < setup.sh
1475 $ sh < setup.sh
1476
1476
1477 test in problematic encoding
1477 test in problematic encoding
1478 $ python > test.sh <<EOF
1478 $ python > test.sh <<EOF
1479 > print u'''
1479 > print u'''
1480 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
1480 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
1481 > echo ====
1481 > echo ====
1482 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
1482 > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
1483 > echo ====
1483 > echo ====
1484 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
1484 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
1485 > echo ====
1485 > echo ====
1486 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
1486 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
1487 > '''.encode('cp932')
1487 > '''.encode('cp932')
1488 > EOF
1488 > EOF
1489 $ sh < test.sh
1489 $ sh < test.sh
1490 0
1490 0
1491 ====
1491 ====
1492 1
1492 1
1493 ====
1493 ====
1494 2
1494 2
1495 0
1495 0
1496 ====
1496 ====
1497 3
1497 3
1498 1
1498 1
1499
1499
1500 $ cd ..
1500 $ cd ..
1501
1501
1502 test hg log on non-existent files and on directories
1502 test hg log on non-existent files and on directories
1503 $ hg init issue1340
1503 $ hg init issue1340
1504 $ cd issue1340
1504 $ cd issue1340
1505 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
1505 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
1506 $ echo 1 > d1/f1
1506 $ echo 1 > d1/f1
1507 $ echo 1 > D2/f1
1507 $ echo 1 > D2/f1
1508 $ echo 1 > D3.i/f1
1508 $ echo 1 > D3.i/f1
1509 $ echo 1 > d4.hg/f1
1509 $ echo 1 > d4.hg/f1
1510 $ echo 1 > d5.d/f1
1510 $ echo 1 > d5.d/f1
1511 $ echo 1 > .d6/f1
1511 $ echo 1 > .d6/f1
1512 $ hg -q add .
1512 $ hg -q add .
1513 $ hg commit -m "a bunch of weird directories"
1513 $ hg commit -m "a bunch of weird directories"
1514 $ hg log -l1 d1/f1 | grep changeset
1514 $ hg log -l1 d1/f1 | grep changeset
1515 changeset: 0:65624cd9070a
1515 changeset: 0:65624cd9070a
1516 $ hg log -l1 f1
1516 $ hg log -l1 f1
1517 $ hg log -l1 . | grep changeset
1517 $ hg log -l1 . | grep changeset
1518 changeset: 0:65624cd9070a
1518 changeset: 0:65624cd9070a
1519 $ hg log -l1 ./ | grep changeset
1519 $ hg log -l1 ./ | grep changeset
1520 changeset: 0:65624cd9070a
1520 changeset: 0:65624cd9070a
1521 $ hg log -l1 d1 | grep changeset
1521 $ hg log -l1 d1 | grep changeset
1522 changeset: 0:65624cd9070a
1522 changeset: 0:65624cd9070a
1523 $ hg log -l1 D2 | grep changeset
1523 $ hg log -l1 D2 | grep changeset
1524 changeset: 0:65624cd9070a
1524 changeset: 0:65624cd9070a
1525 $ hg log -l1 D2/f1 | grep changeset
1525 $ hg log -l1 D2/f1 | grep changeset
1526 changeset: 0:65624cd9070a
1526 changeset: 0:65624cd9070a
1527 $ hg log -l1 D3.i | grep changeset
1527 $ hg log -l1 D3.i | grep changeset
1528 changeset: 0:65624cd9070a
1528 changeset: 0:65624cd9070a
1529 $ hg log -l1 D3.i/f1 | grep changeset
1529 $ hg log -l1 D3.i/f1 | grep changeset
1530 changeset: 0:65624cd9070a
1530 changeset: 0:65624cd9070a
1531 $ hg log -l1 d4.hg | grep changeset
1531 $ hg log -l1 d4.hg | grep changeset
1532 changeset: 0:65624cd9070a
1532 changeset: 0:65624cd9070a
1533 $ hg log -l1 d4.hg/f1 | grep changeset
1533 $ hg log -l1 d4.hg/f1 | grep changeset
1534 changeset: 0:65624cd9070a
1534 changeset: 0:65624cd9070a
1535 $ hg log -l1 d5.d | grep changeset
1535 $ hg log -l1 d5.d | grep changeset
1536 changeset: 0:65624cd9070a
1536 changeset: 0:65624cd9070a
1537 $ hg log -l1 d5.d/f1 | grep changeset
1537 $ hg log -l1 d5.d/f1 | grep changeset
1538 changeset: 0:65624cd9070a
1538 changeset: 0:65624cd9070a
1539 $ hg log -l1 .d6 | grep changeset
1539 $ hg log -l1 .d6 | grep changeset
1540 changeset: 0:65624cd9070a
1540 changeset: 0:65624cd9070a
1541 $ hg log -l1 .d6/f1 | grep changeset
1541 $ hg log -l1 .d6/f1 | grep changeset
1542 changeset: 0:65624cd9070a
1542 changeset: 0:65624cd9070a
1543
1543
1544 issue3772: hg log -r :null showing revision 0 as well
1544 issue3772: hg log -r :null showing revision 0 as well
1545
1545
1546 $ hg log -r :null
1546 $ hg log -r :null
1547 changeset: 0:65624cd9070a
1547 changeset: 0:65624cd9070a
1548 tag: tip
1548 tag: tip
1549 user: test
1549 user: test
1550 date: Thu Jan 01 00:00:00 1970 +0000
1550 date: Thu Jan 01 00:00:00 1970 +0000
1551 summary: a bunch of weird directories
1551 summary: a bunch of weird directories
1552
1552
1553 changeset: -1:000000000000
1553 changeset: -1:000000000000
1554 user:
1554 user:
1555 date: Thu Jan 01 00:00:00 1970 +0000
1555 date: Thu Jan 01 00:00:00 1970 +0000
1556
1556
1557 $ hg log -r null:null
1557 $ hg log -r null:null
1558 changeset: -1:000000000000
1558 changeset: -1:000000000000
1559 user:
1559 user:
1560 date: Thu Jan 01 00:00:00 1970 +0000
1560 date: Thu Jan 01 00:00:00 1970 +0000
1561
1561
1562 Check that adding an arbitrary name shows up in log automatically
1563
1564 $ cat > ../names.py <<EOF
1565 > """A small extension to test adding arbitrary names to a repo"""
1566 > from mercurial.namespaces import namespace
1567 >
1568 > def reposetup(ui, repo):
1569 > foo = {'foo': repo[0].node()}
1570 > ns = namespace("bars", "bar",
1571 > lambda r: foo.keys(),
1572 > lambda r, name: foo.get(name),
1573 > lambda r, node: [name for name, n
1574 > in foo.iteritems()
1575 > if n == node])
1576 > repo.names.addnamespace(ns)
1577 > EOF
1578
1579 $ hg --config extensions.names=../names.py log -r 0
1580 changeset: 0:65624cd9070a
1581 tag: tip
1582 bar: foo
1583 user: test
1584 date: Thu Jan 01 00:00:00 1970 +0000
1585 summary: a bunch of weird directories
1562
1586
1563 $ cd ..
1587 $ cd ..
1564
1588
1565 hg log -f dir across branches
1589 hg log -f dir across branches
1566
1590
1567 $ hg init acrossbranches
1591 $ hg init acrossbranches
1568 $ cd acrossbranches
1592 $ cd acrossbranches
1569 $ mkdir d
1593 $ mkdir d
1570 $ echo a > d/a && hg ci -Aqm a
1594 $ echo a > d/a && hg ci -Aqm a
1571 $ echo b > d/a && hg ci -Aqm b
1595 $ echo b > d/a && hg ci -Aqm b
1572 $ hg up -q 0
1596 $ hg up -q 0
1573 $ echo b > d/a && hg ci -Aqm c
1597 $ echo b > d/a && hg ci -Aqm c
1574 $ hg log -f d -T '{desc}' -G
1598 $ hg log -f d -T '{desc}' -G
1575 @ c
1599 @ c
1576 |
1600 |
1577 o a
1601 o a
1578
1602
1579 $ hg log -f d/a -T '{desc}' -G
1603 $ hg log -f d/a -T '{desc}' -G
1580 @ c
1604 @ c
1581 |
1605 |
1582 o a
1606 o a
1583
1607
1584 $ cd ..
1608 $ cd ..
1585
1609
1586 hg log -f with linkrev pointing to another branch
1610 hg log -f with linkrev pointing to another branch
1587 -------------------------------------------------
1611 -------------------------------------------------
1588
1612
1589 create history with a filerev whose linkrev points to another branch
1613 create history with a filerev whose linkrev points to another branch
1590
1614
1591 $ hg init branchedlinkrev
1615 $ hg init branchedlinkrev
1592 $ cd branchedlinkrev
1616 $ cd branchedlinkrev
1593 $ echo 1 > a
1617 $ echo 1 > a
1594 $ hg commit -Am 'content1'
1618 $ hg commit -Am 'content1'
1595 adding a
1619 adding a
1596 $ echo 2 > a
1620 $ echo 2 > a
1597 $ hg commit -m 'content2'
1621 $ hg commit -m 'content2'
1598 $ hg up --rev 'desc(content1)'
1622 $ hg up --rev 'desc(content1)'
1599 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1623 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1600 $ echo unrelated > unrelated
1624 $ echo unrelated > unrelated
1601 $ hg commit -Am 'unrelated'
1625 $ hg commit -Am 'unrelated'
1602 adding unrelated
1626 adding unrelated
1603 created new head
1627 created new head
1604 $ hg graft -r 'desc(content2)'
1628 $ hg graft -r 'desc(content2)'
1605 grafting 1:2294ae80ad84 "content2"
1629 grafting 1:2294ae80ad84 "content2"
1606 $ echo 3 > a
1630 $ echo 3 > a
1607 $ hg commit -m 'content3'
1631 $ hg commit -m 'content3'
1608 $ hg log -G
1632 $ hg log -G
1609 @ changeset: 4:50b9b36e9c5d
1633 @ changeset: 4:50b9b36e9c5d
1610 | tag: tip
1634 | tag: tip
1611 | user: test
1635 | user: test
1612 | date: Thu Jan 01 00:00:00 1970 +0000
1636 | date: Thu Jan 01 00:00:00 1970 +0000
1613 | summary: content3
1637 | summary: content3
1614 |
1638 |
1615 o changeset: 3:15b2327059e5
1639 o changeset: 3:15b2327059e5
1616 | user: test
1640 | user: test
1617 | date: Thu Jan 01 00:00:00 1970 +0000
1641 | date: Thu Jan 01 00:00:00 1970 +0000
1618 | summary: content2
1642 | summary: content2
1619 |
1643 |
1620 o changeset: 2:2029acd1168c
1644 o changeset: 2:2029acd1168c
1621 | parent: 0:ae0a3c9f9e95
1645 | parent: 0:ae0a3c9f9e95
1622 | user: test
1646 | user: test
1623 | date: Thu Jan 01 00:00:00 1970 +0000
1647 | date: Thu Jan 01 00:00:00 1970 +0000
1624 | summary: unrelated
1648 | summary: unrelated
1625 |
1649 |
1626 | o changeset: 1:2294ae80ad84
1650 | o changeset: 1:2294ae80ad84
1627 |/ user: test
1651 |/ user: test
1628 | date: Thu Jan 01 00:00:00 1970 +0000
1652 | date: Thu Jan 01 00:00:00 1970 +0000
1629 | summary: content2
1653 | summary: content2
1630 |
1654 |
1631 o changeset: 0:ae0a3c9f9e95
1655 o changeset: 0:ae0a3c9f9e95
1632 user: test
1656 user: test
1633 date: Thu Jan 01 00:00:00 1970 +0000
1657 date: Thu Jan 01 00:00:00 1970 +0000
1634 summary: content1
1658 summary: content1
1635
1659
1636
1660
1637 log -f on the file should list the graft result.
1661 log -f on the file should list the graft result.
1638
1662
1639 $ hg log -Gf a
1663 $ hg log -Gf a
1640 @ changeset: 4:50b9b36e9c5d
1664 @ changeset: 4:50b9b36e9c5d
1641 | tag: tip
1665 | tag: tip
1642 | user: test
1666 | user: test
1643 | date: Thu Jan 01 00:00:00 1970 +0000
1667 | date: Thu Jan 01 00:00:00 1970 +0000
1644 | summary: content3
1668 | summary: content3
1645 |
1669 |
1646 o changeset: 3:15b2327059e5
1670 o changeset: 3:15b2327059e5
1647 | user: test
1671 | user: test
1648 | date: Thu Jan 01 00:00:00 1970 +0000
1672 | date: Thu Jan 01 00:00:00 1970 +0000
1649 | summary: content2
1673 | summary: content2
1650 |
1674 |
1651 o changeset: 0:ae0a3c9f9e95
1675 o changeset: 0:ae0a3c9f9e95
1652 user: test
1676 user: test
1653 date: Thu Jan 01 00:00:00 1970 +0000
1677 date: Thu Jan 01 00:00:00 1970 +0000
1654 summary: content1
1678 summary: content1
1655
1679
1656
1680
1657 plain log lists the original version
1681 plain log lists the original version
1658 (XXX we should probably list both)
1682 (XXX we should probably list both)
1659
1683
1660 $ hg log -G a
1684 $ hg log -G a
1661 @ changeset: 4:50b9b36e9c5d
1685 @ changeset: 4:50b9b36e9c5d
1662 | tag: tip
1686 | tag: tip
1663 | user: test
1687 | user: test
1664 | date: Thu Jan 01 00:00:00 1970 +0000
1688 | date: Thu Jan 01 00:00:00 1970 +0000
1665 | summary: content3
1689 | summary: content3
1666 |
1690 |
1667 | o changeset: 1:2294ae80ad84
1691 | o changeset: 1:2294ae80ad84
1668 |/ user: test
1692 |/ user: test
1669 | date: Thu Jan 01 00:00:00 1970 +0000
1693 | date: Thu Jan 01 00:00:00 1970 +0000
1670 | summary: content2
1694 | summary: content2
1671 |
1695 |
1672 o changeset: 0:ae0a3c9f9e95
1696 o changeset: 0:ae0a3c9f9e95
1673 user: test
1697 user: test
1674 date: Thu Jan 01 00:00:00 1970 +0000
1698 date: Thu Jan 01 00:00:00 1970 +0000
1675 summary: content1
1699 summary: content1
1676
1700
1677
1701
1678 hg log -f from the grafted changeset
1702 hg log -f from the grafted changeset
1679 (The bootstrap should properly take the topology in account)
1703 (The bootstrap should properly take the topology in account)
1680
1704
1681 $ hg up 'desc(content3)^'
1705 $ hg up 'desc(content3)^'
1682 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1706 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1683 $ hg log -Gf a
1707 $ hg log -Gf a
1684 @ changeset: 3:15b2327059e5
1708 @ changeset: 3:15b2327059e5
1685 | user: test
1709 | user: test
1686 | date: Thu Jan 01 00:00:00 1970 +0000
1710 | date: Thu Jan 01 00:00:00 1970 +0000
1687 | summary: content2
1711 | summary: content2
1688 |
1712 |
1689 o changeset: 0:ae0a3c9f9e95
1713 o changeset: 0:ae0a3c9f9e95
1690 user: test
1714 user: test
1691 date: Thu Jan 01 00:00:00 1970 +0000
1715 date: Thu Jan 01 00:00:00 1970 +0000
1692 summary: content1
1716 summary: content1
1693
1717
1694
1718
1695 Test that we use the first non-hidden changeset in that case.
1719 Test that we use the first non-hidden changeset in that case.
1696
1720
1697 (hide the changeset)
1721 (hide the changeset)
1698
1722
1699 $ hg log -T '{node}\n' -r 1
1723 $ hg log -T '{node}\n' -r 1
1700 2294ae80ad8447bc78383182eeac50cb049df623
1724 2294ae80ad8447bc78383182eeac50cb049df623
1701 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
1725 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
1702 $ hg log -G
1726 $ hg log -G
1703 o changeset: 4:50b9b36e9c5d
1727 o changeset: 4:50b9b36e9c5d
1704 | tag: tip
1728 | tag: tip
1705 | user: test
1729 | user: test
1706 | date: Thu Jan 01 00:00:00 1970 +0000
1730 | date: Thu Jan 01 00:00:00 1970 +0000
1707 | summary: content3
1731 | summary: content3
1708 |
1732 |
1709 @ changeset: 3:15b2327059e5
1733 @ changeset: 3:15b2327059e5
1710 | user: test
1734 | user: test
1711 | date: Thu Jan 01 00:00:00 1970 +0000
1735 | date: Thu Jan 01 00:00:00 1970 +0000
1712 | summary: content2
1736 | summary: content2
1713 |
1737 |
1714 o changeset: 2:2029acd1168c
1738 o changeset: 2:2029acd1168c
1715 | parent: 0:ae0a3c9f9e95
1739 | parent: 0:ae0a3c9f9e95
1716 | user: test
1740 | user: test
1717 | date: Thu Jan 01 00:00:00 1970 +0000
1741 | date: Thu Jan 01 00:00:00 1970 +0000
1718 | summary: unrelated
1742 | summary: unrelated
1719 |
1743 |
1720 o changeset: 0:ae0a3c9f9e95
1744 o changeset: 0:ae0a3c9f9e95
1721 user: test
1745 user: test
1722 date: Thu Jan 01 00:00:00 1970 +0000
1746 date: Thu Jan 01 00:00:00 1970 +0000
1723 summary: content1
1747 summary: content1
1724
1748
1725
1749
1726 Check that log on the file does not drop the file revision.
1750 Check that log on the file does not drop the file revision.
1727
1751
1728 $ hg log -G a
1752 $ hg log -G a
1729 o changeset: 4:50b9b36e9c5d
1753 o changeset: 4:50b9b36e9c5d
1730 | tag: tip
1754 | tag: tip
1731 | user: test
1755 | user: test
1732 | date: Thu Jan 01 00:00:00 1970 +0000
1756 | date: Thu Jan 01 00:00:00 1970 +0000
1733 | summary: content3
1757 | summary: content3
1734 |
1758 |
1735 @ changeset: 3:15b2327059e5
1759 @ changeset: 3:15b2327059e5
1736 | user: test
1760 | user: test
1737 | date: Thu Jan 01 00:00:00 1970 +0000
1761 | date: Thu Jan 01 00:00:00 1970 +0000
1738 | summary: content2
1762 | summary: content2
1739 |
1763 |
1740 o changeset: 0:ae0a3c9f9e95
1764 o changeset: 0:ae0a3c9f9e95
1741 user: test
1765 user: test
1742 date: Thu Jan 01 00:00:00 1970 +0000
1766 date: Thu Jan 01 00:00:00 1970 +0000
1743 summary: content1
1767 summary: content1
1744
1768
1745
1769
1746 Even when a head revision is linkrev-shadowed.
1770 Even when a head revision is linkrev-shadowed.
1747
1771
1748 $ hg log -T '{node}\n' -r 4
1772 $ hg log -T '{node}\n' -r 4
1749 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
1773 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
1750 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
1774 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
1751 $ hg log -G a
1775 $ hg log -G a
1752 @ changeset: 3:15b2327059e5
1776 @ changeset: 3:15b2327059e5
1753 | tag: tip
1777 | tag: tip
1754 | user: test
1778 | user: test
1755 | date: Thu Jan 01 00:00:00 1970 +0000
1779 | date: Thu Jan 01 00:00:00 1970 +0000
1756 | summary: content2
1780 | summary: content2
1757 |
1781 |
1758 o changeset: 0:ae0a3c9f9e95
1782 o changeset: 0:ae0a3c9f9e95
1759 user: test
1783 user: test
1760 date: Thu Jan 01 00:00:00 1970 +0000
1784 date: Thu Jan 01 00:00:00 1970 +0000
1761 summary: content1
1785 summary: content1
1762
1786
1763
1787
1764 $ cd ..
1788 $ cd ..
1765
1789
1766 Even when the file revision is missing from some head:
1790 Even when the file revision is missing from some head:
1767
1791
1768 $ hg init issue4490
1792 $ hg init issue4490
1769 $ cd issue4490
1793 $ cd issue4490
1770 $ echo '[experimental]' >> .hg/hgrc
1794 $ echo '[experimental]' >> .hg/hgrc
1771 $ echo 'evolution=createmarkers' >> .hg/hgrc
1795 $ echo 'evolution=createmarkers' >> .hg/hgrc
1772 $ echo a > a
1796 $ echo a > a
1773 $ hg ci -Am0
1797 $ hg ci -Am0
1774 adding a
1798 adding a
1775 $ echo b > b
1799 $ echo b > b
1776 $ hg ci -Am1
1800 $ hg ci -Am1
1777 adding b
1801 adding b
1778 $ echo B > b
1802 $ echo B > b
1779 $ hg ci --amend -m 1
1803 $ hg ci --amend -m 1
1780 $ hg up 0
1804 $ hg up 0
1781 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1805 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1782 $ echo c > c
1806 $ echo c > c
1783 $ hg ci -Am2
1807 $ hg ci -Am2
1784 adding c
1808 adding c
1785 created new head
1809 created new head
1786 $ hg up 'head() and not .'
1810 $ hg up 'head() and not .'
1787 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1811 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1788 $ hg log -G
1812 $ hg log -G
1789 o changeset: 4:db815d6d32e6
1813 o changeset: 4:db815d6d32e6
1790 | tag: tip
1814 | tag: tip
1791 | parent: 0:f7b1eb17ad24
1815 | parent: 0:f7b1eb17ad24
1792 | user: test
1816 | user: test
1793 | date: Thu Jan 01 00:00:00 1970 +0000
1817 | date: Thu Jan 01 00:00:00 1970 +0000
1794 | summary: 2
1818 | summary: 2
1795 |
1819 |
1796 | @ changeset: 3:9bc8ce7f9356
1820 | @ changeset: 3:9bc8ce7f9356
1797 |/ parent: 0:f7b1eb17ad24
1821 |/ parent: 0:f7b1eb17ad24
1798 | user: test
1822 | user: test
1799 | date: Thu Jan 01 00:00:00 1970 +0000
1823 | date: Thu Jan 01 00:00:00 1970 +0000
1800 | summary: 1
1824 | summary: 1
1801 |
1825 |
1802 o changeset: 0:f7b1eb17ad24
1826 o changeset: 0:f7b1eb17ad24
1803 user: test
1827 user: test
1804 date: Thu Jan 01 00:00:00 1970 +0000
1828 date: Thu Jan 01 00:00:00 1970 +0000
1805 summary: 0
1829 summary: 0
1806
1830
1807 $ hg log -f -G b
1831 $ hg log -f -G b
1808 @ changeset: 3:9bc8ce7f9356
1832 @ changeset: 3:9bc8ce7f9356
1809 | parent: 0:f7b1eb17ad24
1833 | parent: 0:f7b1eb17ad24
1810 | user: test
1834 | user: test
1811 | date: Thu Jan 01 00:00:00 1970 +0000
1835 | date: Thu Jan 01 00:00:00 1970 +0000
1812 | summary: 1
1836 | summary: 1
1813 |
1837 |
1814 $ hg log -G b
1838 $ hg log -G b
1815 @ changeset: 3:9bc8ce7f9356
1839 @ changeset: 3:9bc8ce7f9356
1816 | parent: 0:f7b1eb17ad24
1840 | parent: 0:f7b1eb17ad24
1817 | user: test
1841 | user: test
1818 | date: Thu Jan 01 00:00:00 1970 +0000
1842 | date: Thu Jan 01 00:00:00 1970 +0000
1819 | summary: 1
1843 | summary: 1
1820 |
1844 |
General Comments 0
You need to be logged in to leave comments. Login now