|
1 @ (34) head |
|
2 | |
|
3 | o (33) head |
|
4 | | |
|
5 o | (32) expand |
|
6 |\ \ |
|
7 | o \ (31) expand |
|
8 | |\ \ |
|
9 | | o \ (30) expand |
|
10 | | |\ \ |
|
11 | | | o | (29) regular commit |
|
12 | | | | | |
|
13 | | o | | (28) merge zero known |
|
14 | | |\ \ \ |
|
15 o | | | | | (27) collapse |
|
16 |/ / / / / |
|
17 | | o---+ (26) merge one known; far right |
|
18 | | | | | |
|
19 +---o | | (25) merge one known; far left |
|
20 | | | | | |
|
21 | | o | | (24) merge one known; immediate right |
|
22 | | |\| | |
|
23 | | o | | (23) merge one known; immediate left |
|
24 | |/| | | |
|
25 +---o---+ (22) merge two known; one far left, one far right |
|
26 | | / / |
|
27 o | | | (21) expand |
|
28 |\ \ \ \ |
|
29 | o---+-+ (20) merge two known; two far right |
|
30 | / / / |
|
31 o | | | (19) expand |
|
32 |\ \ \ \ |
|
33 +---+---o (18) merge two known; two far left |
|
34 | | | | |
|
35 | o | | (17) expand |
|
36 | |\ \ \ |
|
37 | | o---+ (16) merge two known; one immediate right, one near right |
|
38 | | |/ / |
|
39 o | | | (15) expand |
|
40 |\ \ \ \ |
|
41 | o-----+ (14) merge two known; one immediate right, one far right |
|
42 | |/ / / |
|
43 o | | | (13) expand |
|
44 |\ \ \ \ |
|
45 +---o | | (12) merge two known; one immediate right, one far left |
|
46 | | |/ / |
|
47 | o | | (11) expand |
|
48 | |\ \ \ |
|
49 | | o---+ (10) merge two known; one immediate left, one near right |
|
50 | |/ / / |
|
51 o | | | (9) expand |
|
52 |\ \ \ \ |
|
53 | o-----+ (8) merge two known; one immediate left, one far right |
|
54 |/ / / / |
|
55 o | | | (7) expand |
|
56 |\ \ \ \ |
|
57 +---o | | (6) merge two known; one immediate left, one far left |
|
58 | |/ / / |
|
59 | o | | (5) expand |
|
60 | |\ \ \ |
|
61 | | o | | (4) merge two known; one immediate left, one immediate right |
|
62 | |/|/ / |
|
63 | o / / (3) collapse |
|
64 |/ / / |
|
65 o / / (2) collapse |
|
66 |/ / |
|
67 o / (1) collapse |
|
68 |/ |
|
69 o (0) root |
|
70 |
|
71 |
|
72 $ "$TESTDIR/hghave" no-outer-repo || exit 80 |
|
73 |
|
74 $ set -e |
|
75 |
|
76 $ commit() |
|
77 > { |
|
78 > rev=$1 |
|
79 > msg=$2 |
|
80 > shift 2 |
|
81 > if [ "$#" -gt 0 ]; then |
|
82 > hg debugsetparents "$@" |
|
83 > fi |
|
84 > echo $rev > a |
|
85 > hg commit -Aqd "$rev 0" -m "($rev) $msg" |
|
86 > } |
|
87 |
|
88 $ echo "[extensions]" >> $HGRCPATH |
|
89 $ echo "graphlog=" >> $HGRCPATH |
|
90 |
|
91 $ hg init repo |
|
92 $ cd repo |
|
93 |
|
94 Empty repo: |
|
95 |
|
96 $ hg glog |
|
97 |
|
98 |
|
99 Building DAG: |
|
100 |
|
101 $ commit 0 "root" |
|
102 $ commit 1 "collapse" 0 |
|
103 $ commit 2 "collapse" 1 |
|
104 $ commit 3 "collapse" 2 |
|
105 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
106 $ commit 5 "expand" 3 4 |
|
107 $ commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
108 $ commit 7 "expand" 2 5 |
|
109 $ commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
110 $ commit 9 "expand" 7 8 |
|
111 $ commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
112 $ commit 11 "expand" 6 10 |
|
113 $ commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
114 $ commit 13 "expand" 9 11 |
|
115 $ commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
116 $ commit 15 "expand" 13 14 |
|
117 $ commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
118 $ commit 17 "expand" 12 16 |
|
119 $ commit 18 "merge two known; two far left" 1 15 |
|
120 $ commit 19 "expand" 15 17 |
|
121 $ commit 20 "merge two known; two far right" 0 18 |
|
122 $ commit 21 "expand" 19 20 |
|
123 $ commit 22 "merge two known; one far left, one far right" 18 21 |
|
124 $ commit 23 "merge one known; immediate left" 1 22 |
|
125 $ commit 24 "merge one known; immediate right" 0 23 |
|
126 $ commit 25 "merge one known; far left" 21 24 |
|
127 $ commit 26 "merge one known; far right" 18 25 |
|
128 $ commit 27 "collapse" 21 |
|
129 $ commit 28 "merge zero known" 1 26 |
|
130 $ commit 29 "regular commit" 0 |
|
131 $ commit 30 "expand" 28 29 |
|
132 $ commit 31 "expand" 21 30 |
|
133 $ commit 32 "expand" 27 31 |
|
134 $ commit 33 "head" 18 |
|
135 $ commit 34 "head" 32 |
|
136 |
|
137 |
|
138 $ hg glog -q |
|
139 @ 34:fea3ac5810e0 |
|
140 | |
|
141 | o 33:68608f5145f9 |
|
142 | | |
|
143 o | 32:d06dffa21a31 |
|
144 |\ \ |
|
145 | o \ 31:621d83e11f67 |
|
146 | |\ \ |
|
147 | | o \ 30:6e11cd4b648f |
|
148 | | |\ \ |
|
149 | | | o | 29:cd9bb2be7593 |
|
150 | | | | | |
|
151 | | o | | 28:44ecd0b9ae99 |
|
152 | | |\ \ \ |
|
153 o | | | | | 27:886ed638191b |
|
154 |/ / / / / |
|
155 | | o---+ 26:7f25b6c2f0b9 |
|
156 | | | | | |
|
157 +---o | | 25:91da8ed57247 |
|
158 | | | | | |
|
159 | | o | | 24:a9c19a3d96b7 |
|
160 | | |\| | |
|
161 | | o | | 23:a01cddf0766d |
|
162 | |/| | | |
|
163 +---o---+ 22:e0d9cccacb5d |
|
164 | | / / |
|
165 o | | | 21:d42a756af44d |
|
166 |\ \ \ \ |
|
167 | o---+-+ 20:d30ed6450e32 |
|
168 | / / / |
|
169 o | | | 19:31ddc2c1573b |
|
170 |\ \ \ \ |
|
171 +---+---o 18:1aa84d96232a |
|
172 | | | | |
|
173 | o | | 17:44765d7c06e0 |
|
174 | |\ \ \ |
|
175 | | o---+ 16:3677d192927d |
|
176 | | |/ / |
|
177 o | | | 15:1dda3f72782d |
|
178 |\ \ \ \ |
|
179 | o-----+ 14:8eac370358ef |
|
180 | |/ / / |
|
181 o | | | 13:22d8966a97e3 |
|
182 |\ \ \ \ |
|
183 +---o | | 12:86b91144a6e9 |
|
184 | | |/ / |
|
185 | o | | 11:832d76e6bdf2 |
|
186 | |\ \ \ |
|
187 | | o---+ 10:74c64d036d72 |
|
188 | |/ / / |
|
189 o | | | 9:7010c0af0a35 |
|
190 |\ \ \ \ |
|
191 | o-----+ 8:7a0b11f71937 |
|
192 |/ / / / |
|
193 o | | | 7:b632bb1b1224 |
|
194 |\ \ \ \ |
|
195 +---o | | 6:b105a072e251 |
|
196 | |/ / / |
|
197 | o | | 5:4409d547b708 |
|
198 | |\ \ \ |
|
199 | | o | | 4:26a8bac39d9f |
|
200 | |/|/ / |
|
201 | o / / 3:27eef8ed80b4 |
|
202 |/ / / |
|
203 o / / 2:3d9a33b8d1e1 |
|
204 |/ / |
|
205 o / 1:6db2ef61d156 |
|
206 |/ |
|
207 o 0:e6eb3150255d |
|
208 |
|
209 |
|
210 $ hg glog |
|
211 @ changeset: 34:fea3ac5810e0 |
|
212 | tag: tip |
|
213 | parent: 32:d06dffa21a31 |
|
214 | user: test |
|
215 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
216 | summary: (34) head |
|
217 | |
|
218 | o changeset: 33:68608f5145f9 |
|
219 | | parent: 18:1aa84d96232a |
|
220 | | user: test |
|
221 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
222 | | summary: (33) head |
|
223 | | |
|
224 o | changeset: 32:d06dffa21a31 |
|
225 |\ \ parent: 27:886ed638191b |
|
226 | | | parent: 31:621d83e11f67 |
|
227 | | | user: test |
|
228 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
229 | | | summary: (32) expand |
|
230 | | | |
|
231 | o | changeset: 31:621d83e11f67 |
|
232 | |\ \ parent: 21:d42a756af44d |
|
233 | | | | parent: 30:6e11cd4b648f |
|
234 | | | | user: test |
|
235 | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
236 | | | | summary: (31) expand |
|
237 | | | | |
|
238 | | o | changeset: 30:6e11cd4b648f |
|
239 | | |\ \ parent: 28:44ecd0b9ae99 |
|
240 | | | | | parent: 29:cd9bb2be7593 |
|
241 | | | | | user: test |
|
242 | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
243 | | | | | summary: (30) expand |
|
244 | | | | | |
|
245 | | | o | changeset: 29:cd9bb2be7593 |
|
246 | | | | | parent: 0:e6eb3150255d |
|
247 | | | | | user: test |
|
248 | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
249 | | | | | summary: (29) regular commit |
|
250 | | | | | |
|
251 | | o | | changeset: 28:44ecd0b9ae99 |
|
252 | | |\ \ \ parent: 1:6db2ef61d156 |
|
253 | | | | | | parent: 26:7f25b6c2f0b9 |
|
254 | | | | | | user: test |
|
255 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
256 | | | | | | summary: (28) merge zero known |
|
257 | | | | | | |
|
258 o | | | | | changeset: 27:886ed638191b |
|
259 |/ / / / / parent: 21:d42a756af44d |
|
260 | | | | | user: test |
|
261 | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
262 | | | | | summary: (27) collapse |
|
263 | | | | | |
|
264 | | o---+ changeset: 26:7f25b6c2f0b9 |
|
265 | | | | | parent: 18:1aa84d96232a |
|
266 | | | | | parent: 25:91da8ed57247 |
|
267 | | | | | user: test |
|
268 | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
269 | | | | | summary: (26) merge one known; far right |
|
270 | | | | | |
|
271 +---o | | changeset: 25:91da8ed57247 |
|
272 | | | | | parent: 21:d42a756af44d |
|
273 | | | | | parent: 24:a9c19a3d96b7 |
|
274 | | | | | user: test |
|
275 | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
276 | | | | | summary: (25) merge one known; far left |
|
277 | | | | | |
|
278 | | o | | changeset: 24:a9c19a3d96b7 |
|
279 | | |\| | parent: 0:e6eb3150255d |
|
280 | | | | | parent: 23:a01cddf0766d |
|
281 | | | | | user: test |
|
282 | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
283 | | | | | summary: (24) merge one known; immediate right |
|
284 | | | | | |
|
285 | | o | | changeset: 23:a01cddf0766d |
|
286 | |/| | | parent: 1:6db2ef61d156 |
|
287 | | | | | parent: 22:e0d9cccacb5d |
|
288 | | | | | user: test |
|
289 | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
290 | | | | | summary: (23) merge one known; immediate left |
|
291 | | | | | |
|
292 +---o---+ changeset: 22:e0d9cccacb5d |
|
293 | | | | parent: 18:1aa84d96232a |
|
294 | | / / parent: 21:d42a756af44d |
|
295 | | | | user: test |
|
296 | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
297 | | | | summary: (22) merge two known; one far left, one far right |
|
298 | | | | |
|
299 o | | | changeset: 21:d42a756af44d |
|
300 |\ \ \ \ parent: 19:31ddc2c1573b |
|
301 | | | | | parent: 20:d30ed6450e32 |
|
302 | | | | | user: test |
|
303 | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
304 | | | | | summary: (21) expand |
|
305 | | | | | |
|
306 | o---+-+ changeset: 20:d30ed6450e32 |
|
307 | | | | parent: 0:e6eb3150255d |
|
308 | / / / parent: 18:1aa84d96232a |
|
309 | | | | user: test |
|
310 | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
311 | | | | summary: (20) merge two known; two far right |
|
312 | | | | |
|
313 o | | | changeset: 19:31ddc2c1573b |
|
314 |\ \ \ \ parent: 15:1dda3f72782d |
|
315 | | | | | parent: 17:44765d7c06e0 |
|
316 | | | | | user: test |
|
317 | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
318 | | | | | summary: (19) expand |
|
319 | | | | | |
|
320 +---+---o changeset: 18:1aa84d96232a |
|
321 | | | | parent: 1:6db2ef61d156 |
|
322 | | | | parent: 15:1dda3f72782d |
|
323 | | | | user: test |
|
324 | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
325 | | | | summary: (18) merge two known; two far left |
|
326 | | | | |
|
327 | o | | changeset: 17:44765d7c06e0 |
|
328 | |\ \ \ parent: 12:86b91144a6e9 |
|
329 | | | | | parent: 16:3677d192927d |
|
330 | | | | | user: test |
|
331 | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
332 | | | | | summary: (17) expand |
|
333 | | | | | |
|
334 | | o---+ changeset: 16:3677d192927d |
|
335 | | | | | parent: 0:e6eb3150255d |
|
336 | | |/ / parent: 1:6db2ef61d156 |
|
337 | | | | user: test |
|
338 | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
339 | | | | summary: (16) merge two known; one immediate right, one near right |
|
340 | | | | |
|
341 o | | | changeset: 15:1dda3f72782d |
|
342 |\ \ \ \ parent: 13:22d8966a97e3 |
|
343 | | | | | parent: 14:8eac370358ef |
|
344 | | | | | user: test |
|
345 | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
346 | | | | | summary: (15) expand |
|
347 | | | | | |
|
348 | o-----+ changeset: 14:8eac370358ef |
|
349 | | | | | parent: 0:e6eb3150255d |
|
350 | |/ / / parent: 12:86b91144a6e9 |
|
351 | | | | user: test |
|
352 | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
353 | | | | summary: (14) merge two known; one immediate right, one far right |
|
354 | | | | |
|
355 o | | | changeset: 13:22d8966a97e3 |
|
356 |\ \ \ \ parent: 9:7010c0af0a35 |
|
357 | | | | | parent: 11:832d76e6bdf2 |
|
358 | | | | | user: test |
|
359 | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
360 | | | | | summary: (13) expand |
|
361 | | | | | |
|
362 +---o | | changeset: 12:86b91144a6e9 |
|
363 | | |/ / parent: 1:6db2ef61d156 |
|
364 | | | | parent: 9:7010c0af0a35 |
|
365 | | | | user: test |
|
366 | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
367 | | | | summary: (12) merge two known; one immediate right, one far left |
|
368 | | | | |
|
369 | o | | changeset: 11:832d76e6bdf2 |
|
370 | |\ \ \ parent: 6:b105a072e251 |
|
371 | | | | | parent: 10:74c64d036d72 |
|
372 | | | | | user: test |
|
373 | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
374 | | | | | summary: (11) expand |
|
375 | | | | | |
|
376 | | o---+ changeset: 10:74c64d036d72 |
|
377 | | | | | parent: 0:e6eb3150255d |
|
378 | |/ / / parent: 6:b105a072e251 |
|
379 | | | | user: test |
|
380 | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
381 | | | | summary: (10) merge two known; one immediate left, one near right |
|
382 | | | | |
|
383 o | | | changeset: 9:7010c0af0a35 |
|
384 |\ \ \ \ parent: 7:b632bb1b1224 |
|
385 | | | | | parent: 8:7a0b11f71937 |
|
386 | | | | | user: test |
|
387 | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
388 | | | | | summary: (9) expand |
|
389 | | | | | |
|
390 | o-----+ changeset: 8:7a0b11f71937 |
|
391 | | | | | parent: 0:e6eb3150255d |
|
392 |/ / / / parent: 7:b632bb1b1224 |
|
393 | | | | user: test |
|
394 | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
395 | | | | summary: (8) merge two known; one immediate left, one far right |
|
396 | | | | |
|
397 o | | | changeset: 7:b632bb1b1224 |
|
398 |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
399 | | | | | parent: 5:4409d547b708 |
|
400 | | | | | user: test |
|
401 | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
402 | | | | | summary: (7) expand |
|
403 | | | | | |
|
404 +---o | | changeset: 6:b105a072e251 |
|
405 | |/ / / parent: 2:3d9a33b8d1e1 |
|
406 | | | | parent: 5:4409d547b708 |
|
407 | | | | user: test |
|
408 | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
409 | | | | summary: (6) merge two known; one immediate left, one far left |
|
410 | | | | |
|
411 | o | | changeset: 5:4409d547b708 |
|
412 | |\ \ \ parent: 3:27eef8ed80b4 |
|
413 | | | | | parent: 4:26a8bac39d9f |
|
414 | | | | | user: test |
|
415 | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
416 | | | | | summary: (5) expand |
|
417 | | | | | |
|
418 | | o | | changeset: 4:26a8bac39d9f |
|
419 | |/|/ / parent: 1:6db2ef61d156 |
|
420 | | | | parent: 3:27eef8ed80b4 |
|
421 | | | | user: test |
|
422 | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
423 | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
424 | | | | |
|
425 | o | | changeset: 3:27eef8ed80b4 |
|
426 |/ / / user: test |
|
427 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
428 | | | summary: (3) collapse |
|
429 | | | |
|
430 o | | changeset: 2:3d9a33b8d1e1 |
|
431 |/ / user: test |
|
432 | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
433 | | summary: (2) collapse |
|
434 | | |
|
435 o | changeset: 1:6db2ef61d156 |
|
436 |/ user: test |
|
437 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
438 | summary: (1) collapse |
|
439 | |
|
440 o changeset: 0:e6eb3150255d |
|
441 user: test |
|
442 date: Thu Jan 01 00:00:00 1970 +0000 |
|
443 summary: (0) root |
|
444 |
|
445 |
|
446 File glog: |
|
447 $ hg glog a |
|
448 @ changeset: 34:fea3ac5810e0 |
|
449 | tag: tip |
|
450 | parent: 32:d06dffa21a31 |
|
451 | user: test |
|
452 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
453 | summary: (34) head |
|
454 | |
|
455 | o changeset: 33:68608f5145f9 |
|
456 | | parent: 18:1aa84d96232a |
|
457 | | user: test |
|
458 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
459 | | summary: (33) head |
|
460 | | |
|
461 o | changeset: 32:d06dffa21a31 |
|
462 |\ \ parent: 27:886ed638191b |
|
463 | | | parent: 31:621d83e11f67 |
|
464 | | | user: test |
|
465 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
466 | | | summary: (32) expand |
|
467 | | | |
|
468 | o | changeset: 31:621d83e11f67 |
|
469 | | | parent: 21:d42a756af44d |
|
470 | | | parent: 30:6e11cd4b648f |
|
471 | | | user: test |
|
472 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
473 | | | summary: (31) expand |
|
474 | | | |
|
475 | o | changeset: 30:6e11cd4b648f |
|
476 | |\ \ parent: 28:44ecd0b9ae99 |
|
477 | | | | parent: 29:cd9bb2be7593 |
|
478 | | | | user: test |
|
479 | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
480 | | | | summary: (30) expand |
|
481 | | | | |
|
482 | | o | changeset: 29:cd9bb2be7593 |
|
483 | | | | parent: 0:e6eb3150255d |
|
484 | | | | user: test |
|
485 | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
486 | | | | summary: (29) regular commit |
|
487 | | | | |
|
488 | o | | changeset: 28:44ecd0b9ae99 |
|
489 | | | | parent: 1:6db2ef61d156 |
|
490 | | | | parent: 26:7f25b6c2f0b9 |
|
491 | | | | user: test |
|
492 | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
493 | | | | summary: (28) merge zero known |
|
494 | | | | |
|
495 o | | | changeset: 27:886ed638191b |
|
496 | | | | parent: 21:d42a756af44d |
|
497 | | | | user: test |
|
498 | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
499 | | | | summary: (27) collapse |
|
500 | | | | |
|
501 | o | | changeset: 26:7f25b6c2f0b9 |
|
502 | | | | parent: 18:1aa84d96232a |
|
503 | | | | parent: 25:91da8ed57247 |
|
504 | | | | user: test |
|
505 | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
506 | | | | summary: (26) merge one known; far right |
|
507 | | | | |
|
508 | o | | changeset: 25:91da8ed57247 |
|
509 | | | | parent: 21:d42a756af44d |
|
510 | | | | parent: 24:a9c19a3d96b7 |
|
511 | | | | user: test |
|
512 | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
513 | | | | summary: (25) merge one known; far left |
|
514 | | | | |
|
515 | o | | changeset: 24:a9c19a3d96b7 |
|
516 | | | | parent: 0:e6eb3150255d |
|
517 | | | | parent: 23:a01cddf0766d |
|
518 | | | | user: test |
|
519 | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
520 | | | | summary: (24) merge one known; immediate right |
|
521 | | | | |
|
522 | o | | changeset: 23:a01cddf0766d |
|
523 | | | | parent: 1:6db2ef61d156 |
|
524 | | | | parent: 22:e0d9cccacb5d |
|
525 | | | | user: test |
|
526 | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
527 | | | | summary: (23) merge one known; immediate left |
|
528 | | | | |
|
529 | o | | changeset: 22:e0d9cccacb5d |
|
530 |/ / / parent: 18:1aa84d96232a |
|
531 | | | parent: 21:d42a756af44d |
|
532 | | | user: test |
|
533 | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
534 | | | summary: (22) merge two known; one far left, one far right |
|
535 | | | |
|
536 o | | changeset: 21:d42a756af44d |
|
537 |\ \ \ parent: 19:31ddc2c1573b |
|
538 | | | | parent: 20:d30ed6450e32 |
|
539 | | | | user: test |
|
540 | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
541 | | | | summary: (21) expand |
|
542 | | | | |
|
543 | o---+ changeset: 20:d30ed6450e32 |
|
544 | | | parent: 0:e6eb3150255d |
|
545 | / / parent: 18:1aa84d96232a |
|
546 | | | user: test |
|
547 | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
548 | | | summary: (20) merge two known; two far right |
|
549 | | | |
|
550 o | | changeset: 19:31ddc2c1573b |
|
551 |\ \ \ parent: 15:1dda3f72782d |
|
552 | | | | parent: 17:44765d7c06e0 |
|
553 | | | | user: test |
|
554 | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
555 | | | | summary: (19) expand |
|
556 | | | | |
|
557 +-----o changeset: 18:1aa84d96232a |
|
558 | | | parent: 1:6db2ef61d156 |
|
559 | | | parent: 15:1dda3f72782d |
|
560 | | | user: test |
|
561 | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
562 | | | summary: (18) merge two known; two far left |
|
563 | | | |
|
564 | o | changeset: 17:44765d7c06e0 |
|
565 | |\ \ parent: 12:86b91144a6e9 |
|
566 | | | | parent: 16:3677d192927d |
|
567 | | | | user: test |
|
568 | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
569 | | | | summary: (17) expand |
|
570 | | | | |
|
571 | | o | changeset: 16:3677d192927d |
|
572 | | | | parent: 0:e6eb3150255d |
|
573 | | | | parent: 1:6db2ef61d156 |
|
574 | | | | user: test |
|
575 | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
576 | | | | summary: (16) merge two known; one immediate right, one near right |
|
577 | | | | |
|
578 o | | | changeset: 15:1dda3f72782d |
|
579 |\ \ \ \ parent: 13:22d8966a97e3 |
|
580 | | | | | parent: 14:8eac370358ef |
|
581 | | | | | user: test |
|
582 | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
583 | | | | | summary: (15) expand |
|
584 | | | | | |
|
585 | o | | | changeset: 14:8eac370358ef |
|
586 | |/ / / parent: 0:e6eb3150255d |
|
587 | | | | parent: 12:86b91144a6e9 |
|
588 | | | | user: test |
|
589 | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
590 | | | | summary: (14) merge two known; one immediate right, one far right |
|
591 | | | | |
|
592 o | | | changeset: 13:22d8966a97e3 |
|
593 |\ \ \ \ parent: 9:7010c0af0a35 |
|
594 | | | | | parent: 11:832d76e6bdf2 |
|
595 | | | | | user: test |
|
596 | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
597 | | | | | summary: (13) expand |
|
598 | | | | | |
|
599 +---o | | changeset: 12:86b91144a6e9 |
|
600 | | / / parent: 1:6db2ef61d156 |
|
601 | | | | parent: 9:7010c0af0a35 |
|
602 | | | | user: test |
|
603 | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
604 | | | | summary: (12) merge two known; one immediate right, one far left |
|
605 | | | | |
|
606 | o | | changeset: 11:832d76e6bdf2 |
|
607 | | | | parent: 6:b105a072e251 |
|
608 | | | | parent: 10:74c64d036d72 |
|
609 | | | | user: test |
|
610 | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
611 | | | | summary: (11) expand |
|
612 | | | | |
|
613 | o | | changeset: 10:74c64d036d72 |
|
614 | | | | parent: 0:e6eb3150255d |
|
615 | | | | parent: 6:b105a072e251 |
|
616 | | | | user: test |
|
617 | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
618 | | | | summary: (10) merge two known; one immediate left, one near right |
|
619 | | | | |
|
620 o | | | changeset: 9:7010c0af0a35 |
|
621 | | | | parent: 7:b632bb1b1224 |
|
622 | | | | parent: 8:7a0b11f71937 |
|
623 | | | | user: test |
|
624 | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
625 | | | | summary: (9) expand |
|
626 | | | | |
|
627 o | | | changeset: 8:7a0b11f71937 |
|
628 | | | | parent: 0:e6eb3150255d |
|
629 | | | | parent: 7:b632bb1b1224 |
|
630 | | | | user: test |
|
631 | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
632 | | | | summary: (8) merge two known; one immediate left, one far right |
|
633 | | | | |
|
634 o | | | changeset: 7:b632bb1b1224 |
|
635 | | | | parent: 2:3d9a33b8d1e1 |
|
636 | | | | parent: 5:4409d547b708 |
|
637 | | | | user: test |
|
638 | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
639 | | | | summary: (7) expand |
|
640 | | | | |
|
641 | o | | changeset: 6:b105a072e251 |
|
642 |/ / / parent: 2:3d9a33b8d1e1 |
|
643 | | | parent: 5:4409d547b708 |
|
644 | | | user: test |
|
645 | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
646 | | | summary: (6) merge two known; one immediate left, one far left |
|
647 | | | |
|
648 o | | changeset: 5:4409d547b708 |
|
649 | | | parent: 3:27eef8ed80b4 |
|
650 | | | parent: 4:26a8bac39d9f |
|
651 | | | user: test |
|
652 | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
653 | | | summary: (5) expand |
|
654 | | | |
|
655 o | | changeset: 4:26a8bac39d9f |
|
656 | | | parent: 1:6db2ef61d156 |
|
657 | | | parent: 3:27eef8ed80b4 |
|
658 | | | user: test |
|
659 | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
660 | | | summary: (4) merge two known; one immediate left, one immediate right |
|
661 | | | |
|
662 o | | changeset: 3:27eef8ed80b4 |
|
663 | | | user: test |
|
664 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
665 | | | summary: (3) collapse |
|
666 | | | |
|
667 o | | changeset: 2:3d9a33b8d1e1 |
|
668 |/ / user: test |
|
669 | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
670 | | summary: (2) collapse |
|
671 | | |
|
672 o | changeset: 1:6db2ef61d156 |
|
673 |/ user: test |
|
674 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
675 | summary: (1) collapse |
|
676 | |
|
677 o changeset: 0:e6eb3150255d |
|
678 user: test |
|
679 date: Thu Jan 01 00:00:00 1970 +0000 |
|
680 summary: (0) root |
|
681 |
|
682 |
|
683 Unused arguments: |
|
684 $ hg glog -q foo bar || echo failed |
|
685 hg glog: invalid arguments |
|
686 hg glog [OPTION]... [FILE] |
|
687 |
|
688 show revision history alongside an ASCII revision graph |
|
689 failed |
|
690 |
|
691 Empty revision range - display nothing: |
|
692 $ hg glog -r 1..0 |
|
693 |
|
694 From outer space: |
|
695 $ cd .. |
|
696 $ hg glog -l1 repo |
|
697 @ changeset: 34:fea3ac5810e0 |
|
698 | tag: tip |
|
699 | parent: 32:d06dffa21a31 |
|
700 | user: test |
|
701 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
702 | summary: (34) head |
|
703 | |
|
704 $ hg glog -l1 repo/a |
|
705 @ changeset: 34:fea3ac5810e0 |
|
706 | tag: tip |
|
707 | parent: 32:d06dffa21a31 |
|
708 | user: test |
|
709 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
710 | summary: (34) head |
|
711 | |
|
712 $ hg glog -l1 repo/missing |
|
713 |
|
714 File log with revs != cset revs: |
|
715 $ hg init flog |
|
716 $ cd flog |
|
717 $ echo one >one |
|
718 $ hg add one |
|
719 $ hg commit -mone |
|
720 $ echo two >two |
|
721 $ hg add two |
|
722 $ hg commit -mtwo |
|
723 $ echo more >two |
|
724 $ hg commit -mmore |
|
725 $ hg glog two |
|
726 @ changeset: 2:12c28321755b |
|
727 | tag: tip |
|
728 | user: test |
|
729 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
730 | summary: more |
|
731 | |
|
732 o changeset: 1:5ac72c0599bf |
|
733 user: test |
|
734 date: Thu Jan 01 00:00:00 1970 +0000 |
|
735 summary: two |
|
736 |
|
737 |
|
738 File log with explicit style (issue 1896): |
|
739 $ hg glog --style=default one |
|
740 o changeset: 0:3d578b4a1f53 |
|
741 user: test |
|
742 date: Thu Jan 01 00:00:00 1970 +0000 |
|
743 summary: one |
|
744 |
|
745 $ cd .. |
|
746 |
|
747 Incoming and outgoing: |
|
748 |
|
749 $ hg clone -U -r31 repo repo2 |
|
750 requesting all changes |
|
751 adding changesets |
|
752 adding manifests |
|
753 adding file changes |
|
754 added 31 changesets with 31 changes to 1 files |
|
755 $ cd repo2 |
|
756 |
|
757 $ hg incoming --graph ../repo |
|
758 comparing with ../repo |
|
759 searching for changes |
|
760 o changeset: 34:fea3ac5810e0 |
|
761 | tag: tip |
|
762 | parent: 32:d06dffa21a31 |
|
763 | user: test |
|
764 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
765 | summary: (34) head |
|
766 | |
|
767 | o changeset: 33:68608f5145f9 |
|
768 | parent: 18:1aa84d96232a |
|
769 | user: test |
|
770 | date: Thu Jan 01 00:00:33 1970 +0000 |
|
771 | summary: (33) head |
|
772 | |
|
773 o changeset: 32:d06dffa21a31 |
|
774 | parent: 27:886ed638191b |
|
775 | parent: 31:621d83e11f67 |
|
776 | user: test |
|
777 | date: Thu Jan 01 00:00:32 1970 +0000 |
|
778 | summary: (32) expand |
|
779 | |
|
780 o changeset: 27:886ed638191b |
|
781 parent: 21:d42a756af44d |
|
782 user: test |
|
783 date: Thu Jan 01 00:00:27 1970 +0000 |
|
784 summary: (27) collapse |
|
785 |
|
786 $ cd .. |
|
787 |
|
788 $ hg -R repo outgoing --graph repo2 |
|
789 comparing with repo2 |
|
790 searching for changes |
|
791 @ changeset: 34:fea3ac5810e0 |
|
792 | tag: tip |
|
793 | parent: 32:d06dffa21a31 |
|
794 | user: test |
|
795 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
796 | summary: (34) head |
|
797 | |
|
798 | o changeset: 33:68608f5145f9 |
|
799 | parent: 18:1aa84d96232a |
|
800 | user: test |
|
801 | date: Thu Jan 01 00:00:33 1970 +0000 |
|
802 | summary: (33) head |
|
803 | |
|
804 o changeset: 32:d06dffa21a31 |
|
805 | parent: 27:886ed638191b |
|
806 | parent: 31:621d83e11f67 |
|
807 | user: test |
|
808 | date: Thu Jan 01 00:00:32 1970 +0000 |
|
809 | summary: (32) expand |
|
810 | |
|
811 o changeset: 27:886ed638191b |
|
812 parent: 21:d42a756af44d |
|
813 user: test |
|
814 date: Thu Jan 01 00:00:27 1970 +0000 |
|
815 summary: (27) collapse |
|
816 |
|
817 |
|
818 File + limit with revs != cset revs: |
|
819 $ cd repo |
|
820 $ touch b |
|
821 $ hg ci -Aqm0 |
|
822 $ hg glog -l2 a |
|
823 o changeset: 34:fea3ac5810e0 |
|
824 | parent: 32:d06dffa21a31 |
|
825 | user: test |
|
826 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
827 | summary: (34) head |
|
828 | |
|
829 | o changeset: 33:68608f5145f9 |
|
830 | | parent: 18:1aa84d96232a |
|
831 | | user: test |
|
832 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
833 | | summary: (33) head |
|
834 | | |
|
835 |
|
836 File + limit + -ra:b, (b - a) < limit: |
|
837 $ hg glog -l3000 -r32:tip a |
|
838 o changeset: 34:fea3ac5810e0 |
|
839 | parent: 32:d06dffa21a31 |
|
840 | user: test |
|
841 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
842 | summary: (34) head |
|
843 | |
|
844 | o changeset: 33:68608f5145f9 |
|
845 | | parent: 18:1aa84d96232a |
|
846 | | user: test |
|
847 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
848 | | summary: (33) head |
|
849 | | |
|
850 o | changeset: 32:d06dffa21a31 |
|
851 |\ \ parent: 27:886ed638191b |
|
852 | | | parent: 31:621d83e11f67 |
|
853 | | | user: test |
|
854 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
855 | | | summary: (32) expand |
|
856 | | | |
|
857 |
|
858 File + limit + -ra:b, b < tip: |
|
859 $ hg glog -l1 -r32:34 a |
|
860 o changeset: 34:fea3ac5810e0 |
|
861 | parent: 32:d06dffa21a31 |
|
862 | user: test |
|
863 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
864 | summary: (34) head |
|
865 | |
|
866 |
|
867 File + limit + -ra:b, b < tip, (b - a) < limit: |
|
868 $ hg glog -l10 -r33:34 a |
|
869 o changeset: 34:fea3ac5810e0 |
|
870 | parent: 32:d06dffa21a31 |
|
871 | user: test |
|
872 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
873 | summary: (34) head |
|
874 | |
|
875 | o changeset: 33:68608f5145f9 |
|
876 | | parent: 18:1aa84d96232a |
|
877 | | user: test |
|
878 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
879 | | summary: (33) head |
|
880 | | |
|
881 |