##// END OF EJS Templates
test-glog.t: use printrevset extension to trace rewritten revsets...
Patrick Mezard -
r16146:267cebac default
parent child Browse files
Show More
@@ -1,1471 +1,1490 b''
1 @ (34) head
1 @ (34) head
2 |
2 |
3 | o (33) head
3 | o (33) head
4 | |
4 | |
5 o | (32) expand
5 o | (32) expand
6 |\ \
6 |\ \
7 | o \ (31) expand
7 | o \ (31) expand
8 | |\ \
8 | |\ \
9 | | o \ (30) expand
9 | | o \ (30) expand
10 | | |\ \
10 | | |\ \
11 | | | o | (29) regular commit
11 | | | o | (29) regular commit
12 | | | | |
12 | | | | |
13 | | o | | (28) merge zero known
13 | | o | | (28) merge zero known
14 | | |\ \ \
14 | | |\ \ \
15 o | | | | | (27) collapse
15 o | | | | | (27) collapse
16 |/ / / / /
16 |/ / / / /
17 | | o---+ (26) merge one known; far right
17 | | o---+ (26) merge one known; far right
18 | | | | |
18 | | | | |
19 +---o | | (25) merge one known; far left
19 +---o | | (25) merge one known; far left
20 | | | | |
20 | | | | |
21 | | o | | (24) merge one known; immediate right
21 | | o | | (24) merge one known; immediate right
22 | | |\| |
22 | | |\| |
23 | | o | | (23) merge one known; immediate left
23 | | o | | (23) merge one known; immediate left
24 | |/| | |
24 | |/| | |
25 +---o---+ (22) merge two known; one far left, one far right
25 +---o---+ (22) merge two known; one far left, one far right
26 | | / /
26 | | / /
27 o | | | (21) expand
27 o | | | (21) expand
28 |\ \ \ \
28 |\ \ \ \
29 | o---+-+ (20) merge two known; two far right
29 | o---+-+ (20) merge two known; two far right
30 | / / /
30 | / / /
31 o | | | (19) expand
31 o | | | (19) expand
32 |\ \ \ \
32 |\ \ \ \
33 +---+---o (18) merge two known; two far left
33 +---+---o (18) merge two known; two far left
34 | | | |
34 | | | |
35 | o | | (17) expand
35 | o | | (17) expand
36 | |\ \ \
36 | |\ \ \
37 | | o---+ (16) merge two known; one immediate right, one near right
37 | | o---+ (16) merge two known; one immediate right, one near right
38 | | |/ /
38 | | |/ /
39 o | | | (15) expand
39 o | | | (15) expand
40 |\ \ \ \
40 |\ \ \ \
41 | o-----+ (14) merge two known; one immediate right, one far right
41 | o-----+ (14) merge two known; one immediate right, one far right
42 | |/ / /
42 | |/ / /
43 o | | | (13) expand
43 o | | | (13) expand
44 |\ \ \ \
44 |\ \ \ \
45 +---o | | (12) merge two known; one immediate right, one far left
45 +---o | | (12) merge two known; one immediate right, one far left
46 | | |/ /
46 | | |/ /
47 | o | | (11) expand
47 | o | | (11) expand
48 | |\ \ \
48 | |\ \ \
49 | | o---+ (10) merge two known; one immediate left, one near right
49 | | o---+ (10) merge two known; one immediate left, one near right
50 | |/ / /
50 | |/ / /
51 o | | | (9) expand
51 o | | | (9) expand
52 |\ \ \ \
52 |\ \ \ \
53 | o-----+ (8) merge two known; one immediate left, one far right
53 | o-----+ (8) merge two known; one immediate left, one far right
54 |/ / / /
54 |/ / / /
55 o | | | (7) expand
55 o | | | (7) expand
56 |\ \ \ \
56 |\ \ \ \
57 +---o | | (6) merge two known; one immediate left, one far left
57 +---o | | (6) merge two known; one immediate left, one far left
58 | |/ / /
58 | |/ / /
59 | o | | (5) expand
59 | o | | (5) expand
60 | |\ \ \
60 | |\ \ \
61 | | o | | (4) merge two known; one immediate left, one immediate right
61 | | o | | (4) merge two known; one immediate left, one immediate right
62 | |/|/ /
62 | |/|/ /
63 | o / / (3) collapse
63 | o / / (3) collapse
64 |/ / /
64 |/ / /
65 o / / (2) collapse
65 o / / (2) collapse
66 |/ /
66 |/ /
67 o / (1) collapse
67 o / (1) collapse
68 |/
68 |/
69 o (0) root
69 o (0) root
70
70
71
71
72 $ "$TESTDIR/hghave" no-outer-repo || exit 80
72 $ "$TESTDIR/hghave" no-outer-repo || exit 80
73
73
74 $ commit()
74 $ commit()
75 > {
75 > {
76 > rev=$1
76 > rev=$1
77 > msg=$2
77 > msg=$2
78 > shift 2
78 > shift 2
79 > if [ "$#" -gt 0 ]; then
79 > if [ "$#" -gt 0 ]; then
80 > hg debugsetparents "$@"
80 > hg debugsetparents "$@"
81 > fi
81 > fi
82 > echo $rev > a
82 > echo $rev > a
83 > hg commit -Aqd "$rev 0" -m "($rev) $msg"
83 > hg commit -Aqd "$rev 0" -m "($rev) $msg"
84 > }
84 > }
85
85
86 $ cat > printrevset.py <<EOF
87 > from mercurial import extensions, revset, commands
88 > from hgext import graphlog
89 >
90 > def uisetup(ui):
91 > def printrevset(orig, ui, repo, *pats, **opts):
92 > if opts.get('print_revset'):
93 > expr = graphlog.revset(pats, opts)
94 > tree = revset.parse(expr)[0]
95 > ui.write(tree, "\n")
96 > return 0
97 > return orig(ui, repo, *pats, **opts)
98 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
99 > entry[1].append(('', 'print-revset', False,
100 > 'print generated revset and exit (DEPRECATED)'))
101 > EOF
102
86 $ echo "[extensions]" >> $HGRCPATH
103 $ echo "[extensions]" >> $HGRCPATH
87 $ echo "graphlog=" >> $HGRCPATH
104 $ echo "graphlog=" >> $HGRCPATH
105 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
88
106
89 $ hg init repo
107 $ hg init repo
90 $ cd repo
108 $ cd repo
91
109
92 Empty repo:
110 Empty repo:
93
111
94 $ hg glog
112 $ hg glog
95
113
96
114
97 Building DAG:
115 Building DAG:
98
116
99 $ commit 0 "root"
117 $ commit 0 "root"
100 $ commit 1 "collapse" 0
118 $ commit 1 "collapse" 0
101 $ commit 2 "collapse" 1
119 $ commit 2 "collapse" 1
102 $ commit 3 "collapse" 2
120 $ commit 3 "collapse" 2
103 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
121 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
104 $ commit 5 "expand" 3 4
122 $ commit 5 "expand" 3 4
105 $ commit 6 "merge two known; one immediate left, one far left" 2 5
123 $ commit 6 "merge two known; one immediate left, one far left" 2 5
106 $ commit 7 "expand" 2 5
124 $ commit 7 "expand" 2 5
107 $ commit 8 "merge two known; one immediate left, one far right" 0 7
125 $ commit 8 "merge two known; one immediate left, one far right" 0 7
108 $ commit 9 "expand" 7 8
126 $ commit 9 "expand" 7 8
109 $ commit 10 "merge two known; one immediate left, one near right" 0 6
127 $ commit 10 "merge two known; one immediate left, one near right" 0 6
110 $ commit 11 "expand" 6 10
128 $ commit 11 "expand" 6 10
111 $ commit 12 "merge two known; one immediate right, one far left" 1 9
129 $ commit 12 "merge two known; one immediate right, one far left" 1 9
112 $ commit 13 "expand" 9 11
130 $ commit 13 "expand" 9 11
113 $ commit 14 "merge two known; one immediate right, one far right" 0 12
131 $ commit 14 "merge two known; one immediate right, one far right" 0 12
114 $ commit 15 "expand" 13 14
132 $ commit 15 "expand" 13 14
115 $ commit 16 "merge two known; one immediate right, one near right" 0 1
133 $ commit 16 "merge two known; one immediate right, one near right" 0 1
116 $ commit 17 "expand" 12 16
134 $ commit 17 "expand" 12 16
117 $ commit 18 "merge two known; two far left" 1 15
135 $ commit 18 "merge two known; two far left" 1 15
118 $ commit 19 "expand" 15 17
136 $ commit 19 "expand" 15 17
119 $ commit 20 "merge two known; two far right" 0 18
137 $ commit 20 "merge two known; two far right" 0 18
120 $ commit 21 "expand" 19 20
138 $ commit 21 "expand" 19 20
121 $ commit 22 "merge two known; one far left, one far right" 18 21
139 $ commit 22 "merge two known; one far left, one far right" 18 21
122 $ commit 23 "merge one known; immediate left" 1 22
140 $ commit 23 "merge one known; immediate left" 1 22
123 $ commit 24 "merge one known; immediate right" 0 23
141 $ commit 24 "merge one known; immediate right" 0 23
124 $ commit 25 "merge one known; far left" 21 24
142 $ commit 25 "merge one known; far left" 21 24
125 $ commit 26 "merge one known; far right" 18 25
143 $ commit 26 "merge one known; far right" 18 25
126 $ commit 27 "collapse" 21
144 $ commit 27 "collapse" 21
127 $ commit 28 "merge zero known" 1 26
145 $ commit 28 "merge zero known" 1 26
128 $ commit 29 "regular commit" 0
146 $ commit 29 "regular commit" 0
129 $ commit 30 "expand" 28 29
147 $ commit 30 "expand" 28 29
130 $ commit 31 "expand" 21 30
148 $ commit 31 "expand" 21 30
131 $ commit 32 "expand" 27 31
149 $ commit 32 "expand" 27 31
132 $ commit 33 "head" 18
150 $ commit 33 "head" 18
133 $ commit 34 "head" 32
151 $ commit 34 "head" 32
134
152
135
153
136 $ hg glog -q
154 $ hg glog -q
137 @ 34:fea3ac5810e0
155 @ 34:fea3ac5810e0
138 |
156 |
139 | o 33:68608f5145f9
157 | o 33:68608f5145f9
140 | |
158 | |
141 o | 32:d06dffa21a31
159 o | 32:d06dffa21a31
142 |\ \
160 |\ \
143 | o \ 31:621d83e11f67
161 | o \ 31:621d83e11f67
144 | |\ \
162 | |\ \
145 | | o \ 30:6e11cd4b648f
163 | | o \ 30:6e11cd4b648f
146 | | |\ \
164 | | |\ \
147 | | | o | 29:cd9bb2be7593
165 | | | o | 29:cd9bb2be7593
148 | | | | |
166 | | | | |
149 | | o | | 28:44ecd0b9ae99
167 | | o | | 28:44ecd0b9ae99
150 | | |\ \ \
168 | | |\ \ \
151 o | | | | | 27:886ed638191b
169 o | | | | | 27:886ed638191b
152 |/ / / / /
170 |/ / / / /
153 | | o---+ 26:7f25b6c2f0b9
171 | | o---+ 26:7f25b6c2f0b9
154 | | | | |
172 | | | | |
155 +---o | | 25:91da8ed57247
173 +---o | | 25:91da8ed57247
156 | | | | |
174 | | | | |
157 | | o | | 24:a9c19a3d96b7
175 | | o | | 24:a9c19a3d96b7
158 | | |\| |
176 | | |\| |
159 | | o | | 23:a01cddf0766d
177 | | o | | 23:a01cddf0766d
160 | |/| | |
178 | |/| | |
161 +---o---+ 22:e0d9cccacb5d
179 +---o---+ 22:e0d9cccacb5d
162 | | / /
180 | | / /
163 o | | | 21:d42a756af44d
181 o | | | 21:d42a756af44d
164 |\ \ \ \
182 |\ \ \ \
165 | o---+-+ 20:d30ed6450e32
183 | o---+-+ 20:d30ed6450e32
166 | / / /
184 | / / /
167 o | | | 19:31ddc2c1573b
185 o | | | 19:31ddc2c1573b
168 |\ \ \ \
186 |\ \ \ \
169 +---+---o 18:1aa84d96232a
187 +---+---o 18:1aa84d96232a
170 | | | |
188 | | | |
171 | o | | 17:44765d7c06e0
189 | o | | 17:44765d7c06e0
172 | |\ \ \
190 | |\ \ \
173 | | o---+ 16:3677d192927d
191 | | o---+ 16:3677d192927d
174 | | |/ /
192 | | |/ /
175 o | | | 15:1dda3f72782d
193 o | | | 15:1dda3f72782d
176 |\ \ \ \
194 |\ \ \ \
177 | o-----+ 14:8eac370358ef
195 | o-----+ 14:8eac370358ef
178 | |/ / /
196 | |/ / /
179 o | | | 13:22d8966a97e3
197 o | | | 13:22d8966a97e3
180 |\ \ \ \
198 |\ \ \ \
181 +---o | | 12:86b91144a6e9
199 +---o | | 12:86b91144a6e9
182 | | |/ /
200 | | |/ /
183 | o | | 11:832d76e6bdf2
201 | o | | 11:832d76e6bdf2
184 | |\ \ \
202 | |\ \ \
185 | | o---+ 10:74c64d036d72
203 | | o---+ 10:74c64d036d72
186 | |/ / /
204 | |/ / /
187 o | | | 9:7010c0af0a35
205 o | | | 9:7010c0af0a35
188 |\ \ \ \
206 |\ \ \ \
189 | o-----+ 8:7a0b11f71937
207 | o-----+ 8:7a0b11f71937
190 |/ / / /
208 |/ / / /
191 o | | | 7:b632bb1b1224
209 o | | | 7:b632bb1b1224
192 |\ \ \ \
210 |\ \ \ \
193 +---o | | 6:b105a072e251
211 +---o | | 6:b105a072e251
194 | |/ / /
212 | |/ / /
195 | o | | 5:4409d547b708
213 | o | | 5:4409d547b708
196 | |\ \ \
214 | |\ \ \
197 | | o | | 4:26a8bac39d9f
215 | | o | | 4:26a8bac39d9f
198 | |/|/ /
216 | |/|/ /
199 | o / / 3:27eef8ed80b4
217 | o / / 3:27eef8ed80b4
200 |/ / /
218 |/ / /
201 o / / 2:3d9a33b8d1e1
219 o / / 2:3d9a33b8d1e1
202 |/ /
220 |/ /
203 o / 1:6db2ef61d156
221 o / 1:6db2ef61d156
204 |/
222 |/
205 o 0:e6eb3150255d
223 o 0:e6eb3150255d
206
224
207
225
208 $ hg glog
226 $ hg glog
209 @ changeset: 34:fea3ac5810e0
227 @ changeset: 34:fea3ac5810e0
210 | tag: tip
228 | tag: tip
211 | parent: 32:d06dffa21a31
229 | parent: 32:d06dffa21a31
212 | user: test
230 | user: test
213 | date: Thu Jan 01 00:00:34 1970 +0000
231 | date: Thu Jan 01 00:00:34 1970 +0000
214 | summary: (34) head
232 | summary: (34) head
215 |
233 |
216 | o changeset: 33:68608f5145f9
234 | o changeset: 33:68608f5145f9
217 | | parent: 18:1aa84d96232a
235 | | parent: 18:1aa84d96232a
218 | | user: test
236 | | user: test
219 | | date: Thu Jan 01 00:00:33 1970 +0000
237 | | date: Thu Jan 01 00:00:33 1970 +0000
220 | | summary: (33) head
238 | | summary: (33) head
221 | |
239 | |
222 o | changeset: 32:d06dffa21a31
240 o | changeset: 32:d06dffa21a31
223 |\ \ parent: 27:886ed638191b
241 |\ \ parent: 27:886ed638191b
224 | | | parent: 31:621d83e11f67
242 | | | parent: 31:621d83e11f67
225 | | | user: test
243 | | | user: test
226 | | | date: Thu Jan 01 00:00:32 1970 +0000
244 | | | date: Thu Jan 01 00:00:32 1970 +0000
227 | | | summary: (32) expand
245 | | | summary: (32) expand
228 | | |
246 | | |
229 | o | changeset: 31:621d83e11f67
247 | o | changeset: 31:621d83e11f67
230 | |\ \ parent: 21:d42a756af44d
248 | |\ \ parent: 21:d42a756af44d
231 | | | | parent: 30:6e11cd4b648f
249 | | | | parent: 30:6e11cd4b648f
232 | | | | user: test
250 | | | | user: test
233 | | | | date: Thu Jan 01 00:00:31 1970 +0000
251 | | | | date: Thu Jan 01 00:00:31 1970 +0000
234 | | | | summary: (31) expand
252 | | | | summary: (31) expand
235 | | | |
253 | | | |
236 | | o | changeset: 30:6e11cd4b648f
254 | | o | changeset: 30:6e11cd4b648f
237 | | |\ \ parent: 28:44ecd0b9ae99
255 | | |\ \ parent: 28:44ecd0b9ae99
238 | | | | | parent: 29:cd9bb2be7593
256 | | | | | parent: 29:cd9bb2be7593
239 | | | | | user: test
257 | | | | | user: test
240 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
258 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
241 | | | | | summary: (30) expand
259 | | | | | summary: (30) expand
242 | | | | |
260 | | | | |
243 | | | o | changeset: 29:cd9bb2be7593
261 | | | o | changeset: 29:cd9bb2be7593
244 | | | | | parent: 0:e6eb3150255d
262 | | | | | parent: 0:e6eb3150255d
245 | | | | | user: test
263 | | | | | user: test
246 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
264 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
247 | | | | | summary: (29) regular commit
265 | | | | | summary: (29) regular commit
248 | | | | |
266 | | | | |
249 | | o | | changeset: 28:44ecd0b9ae99
267 | | o | | changeset: 28:44ecd0b9ae99
250 | | |\ \ \ parent: 1:6db2ef61d156
268 | | |\ \ \ parent: 1:6db2ef61d156
251 | | | | | | parent: 26:7f25b6c2f0b9
269 | | | | | | parent: 26:7f25b6c2f0b9
252 | | | | | | user: test
270 | | | | | | user: test
253 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
271 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
254 | | | | | | summary: (28) merge zero known
272 | | | | | | summary: (28) merge zero known
255 | | | | | |
273 | | | | | |
256 o | | | | | changeset: 27:886ed638191b
274 o | | | | | changeset: 27:886ed638191b
257 |/ / / / / parent: 21:d42a756af44d
275 |/ / / / / parent: 21:d42a756af44d
258 | | | | | user: test
276 | | | | | user: test
259 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
277 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
260 | | | | | summary: (27) collapse
278 | | | | | summary: (27) collapse
261 | | | | |
279 | | | | |
262 | | o---+ changeset: 26:7f25b6c2f0b9
280 | | o---+ changeset: 26:7f25b6c2f0b9
263 | | | | | parent: 18:1aa84d96232a
281 | | | | | parent: 18:1aa84d96232a
264 | | | | | parent: 25:91da8ed57247
282 | | | | | parent: 25:91da8ed57247
265 | | | | | user: test
283 | | | | | user: test
266 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
284 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
267 | | | | | summary: (26) merge one known; far right
285 | | | | | summary: (26) merge one known; far right
268 | | | | |
286 | | | | |
269 +---o | | changeset: 25:91da8ed57247
287 +---o | | changeset: 25:91da8ed57247
270 | | | | | parent: 21:d42a756af44d
288 | | | | | parent: 21:d42a756af44d
271 | | | | | parent: 24:a9c19a3d96b7
289 | | | | | parent: 24:a9c19a3d96b7
272 | | | | | user: test
290 | | | | | user: test
273 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
291 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
274 | | | | | summary: (25) merge one known; far left
292 | | | | | summary: (25) merge one known; far left
275 | | | | |
293 | | | | |
276 | | o | | changeset: 24:a9c19a3d96b7
294 | | o | | changeset: 24:a9c19a3d96b7
277 | | |\| | parent: 0:e6eb3150255d
295 | | |\| | parent: 0:e6eb3150255d
278 | | | | | parent: 23:a01cddf0766d
296 | | | | | parent: 23:a01cddf0766d
279 | | | | | user: test
297 | | | | | user: test
280 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
298 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
281 | | | | | summary: (24) merge one known; immediate right
299 | | | | | summary: (24) merge one known; immediate right
282 | | | | |
300 | | | | |
283 | | o | | changeset: 23:a01cddf0766d
301 | | o | | changeset: 23:a01cddf0766d
284 | |/| | | parent: 1:6db2ef61d156
302 | |/| | | parent: 1:6db2ef61d156
285 | | | | | parent: 22:e0d9cccacb5d
303 | | | | | parent: 22:e0d9cccacb5d
286 | | | | | user: test
304 | | | | | user: test
287 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
305 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
288 | | | | | summary: (23) merge one known; immediate left
306 | | | | | summary: (23) merge one known; immediate left
289 | | | | |
307 | | | | |
290 +---o---+ changeset: 22:e0d9cccacb5d
308 +---o---+ changeset: 22:e0d9cccacb5d
291 | | | | parent: 18:1aa84d96232a
309 | | | | parent: 18:1aa84d96232a
292 | | / / parent: 21:d42a756af44d
310 | | / / parent: 21:d42a756af44d
293 | | | | user: test
311 | | | | user: test
294 | | | | date: Thu Jan 01 00:00:22 1970 +0000
312 | | | | date: Thu Jan 01 00:00:22 1970 +0000
295 | | | | summary: (22) merge two known; one far left, one far right
313 | | | | summary: (22) merge two known; one far left, one far right
296 | | | |
314 | | | |
297 o | | | changeset: 21:d42a756af44d
315 o | | | changeset: 21:d42a756af44d
298 |\ \ \ \ parent: 19:31ddc2c1573b
316 |\ \ \ \ parent: 19:31ddc2c1573b
299 | | | | | parent: 20:d30ed6450e32
317 | | | | | parent: 20:d30ed6450e32
300 | | | | | user: test
318 | | | | | user: test
301 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
319 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
302 | | | | | summary: (21) expand
320 | | | | | summary: (21) expand
303 | | | | |
321 | | | | |
304 | o---+-+ changeset: 20:d30ed6450e32
322 | o---+-+ changeset: 20:d30ed6450e32
305 | | | | parent: 0:e6eb3150255d
323 | | | | parent: 0:e6eb3150255d
306 | / / / parent: 18:1aa84d96232a
324 | / / / parent: 18:1aa84d96232a
307 | | | | user: test
325 | | | | user: test
308 | | | | date: Thu Jan 01 00:00:20 1970 +0000
326 | | | | date: Thu Jan 01 00:00:20 1970 +0000
309 | | | | summary: (20) merge two known; two far right
327 | | | | summary: (20) merge two known; two far right
310 | | | |
328 | | | |
311 o | | | changeset: 19:31ddc2c1573b
329 o | | | changeset: 19:31ddc2c1573b
312 |\ \ \ \ parent: 15:1dda3f72782d
330 |\ \ \ \ parent: 15:1dda3f72782d
313 | | | | | parent: 17:44765d7c06e0
331 | | | | | parent: 17:44765d7c06e0
314 | | | | | user: test
332 | | | | | user: test
315 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
333 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
316 | | | | | summary: (19) expand
334 | | | | | summary: (19) expand
317 | | | | |
335 | | | | |
318 +---+---o changeset: 18:1aa84d96232a
336 +---+---o changeset: 18:1aa84d96232a
319 | | | | parent: 1:6db2ef61d156
337 | | | | parent: 1:6db2ef61d156
320 | | | | parent: 15:1dda3f72782d
338 | | | | parent: 15:1dda3f72782d
321 | | | | user: test
339 | | | | user: test
322 | | | | date: Thu Jan 01 00:00:18 1970 +0000
340 | | | | date: Thu Jan 01 00:00:18 1970 +0000
323 | | | | summary: (18) merge two known; two far left
341 | | | | summary: (18) merge two known; two far left
324 | | | |
342 | | | |
325 | o | | changeset: 17:44765d7c06e0
343 | o | | changeset: 17:44765d7c06e0
326 | |\ \ \ parent: 12:86b91144a6e9
344 | |\ \ \ parent: 12:86b91144a6e9
327 | | | | | parent: 16:3677d192927d
345 | | | | | parent: 16:3677d192927d
328 | | | | | user: test
346 | | | | | user: test
329 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
347 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
330 | | | | | summary: (17) expand
348 | | | | | summary: (17) expand
331 | | | | |
349 | | | | |
332 | | o---+ changeset: 16:3677d192927d
350 | | o---+ changeset: 16:3677d192927d
333 | | | | | parent: 0:e6eb3150255d
351 | | | | | parent: 0:e6eb3150255d
334 | | |/ / parent: 1:6db2ef61d156
352 | | |/ / parent: 1:6db2ef61d156
335 | | | | user: test
353 | | | | user: test
336 | | | | date: Thu Jan 01 00:00:16 1970 +0000
354 | | | | date: Thu Jan 01 00:00:16 1970 +0000
337 | | | | summary: (16) merge two known; one immediate right, one near right
355 | | | | summary: (16) merge two known; one immediate right, one near right
338 | | | |
356 | | | |
339 o | | | changeset: 15:1dda3f72782d
357 o | | | changeset: 15:1dda3f72782d
340 |\ \ \ \ parent: 13:22d8966a97e3
358 |\ \ \ \ parent: 13:22d8966a97e3
341 | | | | | parent: 14:8eac370358ef
359 | | | | | parent: 14:8eac370358ef
342 | | | | | user: test
360 | | | | | user: test
343 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
361 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
344 | | | | | summary: (15) expand
362 | | | | | summary: (15) expand
345 | | | | |
363 | | | | |
346 | o-----+ changeset: 14:8eac370358ef
364 | o-----+ changeset: 14:8eac370358ef
347 | | | | | parent: 0:e6eb3150255d
365 | | | | | parent: 0:e6eb3150255d
348 | |/ / / parent: 12:86b91144a6e9
366 | |/ / / parent: 12:86b91144a6e9
349 | | | | user: test
367 | | | | user: test
350 | | | | date: Thu Jan 01 00:00:14 1970 +0000
368 | | | | date: Thu Jan 01 00:00:14 1970 +0000
351 | | | | summary: (14) merge two known; one immediate right, one far right
369 | | | | summary: (14) merge two known; one immediate right, one far right
352 | | | |
370 | | | |
353 o | | | changeset: 13:22d8966a97e3
371 o | | | changeset: 13:22d8966a97e3
354 |\ \ \ \ parent: 9:7010c0af0a35
372 |\ \ \ \ parent: 9:7010c0af0a35
355 | | | | | parent: 11:832d76e6bdf2
373 | | | | | parent: 11:832d76e6bdf2
356 | | | | | user: test
374 | | | | | user: test
357 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
375 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
358 | | | | | summary: (13) expand
376 | | | | | summary: (13) expand
359 | | | | |
377 | | | | |
360 +---o | | changeset: 12:86b91144a6e9
378 +---o | | changeset: 12:86b91144a6e9
361 | | |/ / parent: 1:6db2ef61d156
379 | | |/ / parent: 1:6db2ef61d156
362 | | | | parent: 9:7010c0af0a35
380 | | | | parent: 9:7010c0af0a35
363 | | | | user: test
381 | | | | user: test
364 | | | | date: Thu Jan 01 00:00:12 1970 +0000
382 | | | | date: Thu Jan 01 00:00:12 1970 +0000
365 | | | | summary: (12) merge two known; one immediate right, one far left
383 | | | | summary: (12) merge two known; one immediate right, one far left
366 | | | |
384 | | | |
367 | o | | changeset: 11:832d76e6bdf2
385 | o | | changeset: 11:832d76e6bdf2
368 | |\ \ \ parent: 6:b105a072e251
386 | |\ \ \ parent: 6:b105a072e251
369 | | | | | parent: 10:74c64d036d72
387 | | | | | parent: 10:74c64d036d72
370 | | | | | user: test
388 | | | | | user: test
371 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
389 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
372 | | | | | summary: (11) expand
390 | | | | | summary: (11) expand
373 | | | | |
391 | | | | |
374 | | o---+ changeset: 10:74c64d036d72
392 | | o---+ changeset: 10:74c64d036d72
375 | | | | | parent: 0:e6eb3150255d
393 | | | | | parent: 0:e6eb3150255d
376 | |/ / / parent: 6:b105a072e251
394 | |/ / / parent: 6:b105a072e251
377 | | | | user: test
395 | | | | user: test
378 | | | | date: Thu Jan 01 00:00:10 1970 +0000
396 | | | | date: Thu Jan 01 00:00:10 1970 +0000
379 | | | | summary: (10) merge two known; one immediate left, one near right
397 | | | | summary: (10) merge two known; one immediate left, one near right
380 | | | |
398 | | | |
381 o | | | changeset: 9:7010c0af0a35
399 o | | | changeset: 9:7010c0af0a35
382 |\ \ \ \ parent: 7:b632bb1b1224
400 |\ \ \ \ parent: 7:b632bb1b1224
383 | | | | | parent: 8:7a0b11f71937
401 | | | | | parent: 8:7a0b11f71937
384 | | | | | user: test
402 | | | | | user: test
385 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
403 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
386 | | | | | summary: (9) expand
404 | | | | | summary: (9) expand
387 | | | | |
405 | | | | |
388 | o-----+ changeset: 8:7a0b11f71937
406 | o-----+ changeset: 8:7a0b11f71937
389 | | | | | parent: 0:e6eb3150255d
407 | | | | | parent: 0:e6eb3150255d
390 |/ / / / parent: 7:b632bb1b1224
408 |/ / / / parent: 7:b632bb1b1224
391 | | | | user: test
409 | | | | user: test
392 | | | | date: Thu Jan 01 00:00:08 1970 +0000
410 | | | | date: Thu Jan 01 00:00:08 1970 +0000
393 | | | | summary: (8) merge two known; one immediate left, one far right
411 | | | | summary: (8) merge two known; one immediate left, one far right
394 | | | |
412 | | | |
395 o | | | changeset: 7:b632bb1b1224
413 o | | | changeset: 7:b632bb1b1224
396 |\ \ \ \ parent: 2:3d9a33b8d1e1
414 |\ \ \ \ parent: 2:3d9a33b8d1e1
397 | | | | | parent: 5:4409d547b708
415 | | | | | parent: 5:4409d547b708
398 | | | | | user: test
416 | | | | | user: test
399 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
417 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
400 | | | | | summary: (7) expand
418 | | | | | summary: (7) expand
401 | | | | |
419 | | | | |
402 +---o | | changeset: 6:b105a072e251
420 +---o | | changeset: 6:b105a072e251
403 | |/ / / parent: 2:3d9a33b8d1e1
421 | |/ / / parent: 2:3d9a33b8d1e1
404 | | | | parent: 5:4409d547b708
422 | | | | parent: 5:4409d547b708
405 | | | | user: test
423 | | | | user: test
406 | | | | date: Thu Jan 01 00:00:06 1970 +0000
424 | | | | date: Thu Jan 01 00:00:06 1970 +0000
407 | | | | summary: (6) merge two known; one immediate left, one far left
425 | | | | summary: (6) merge two known; one immediate left, one far left
408 | | | |
426 | | | |
409 | o | | changeset: 5:4409d547b708
427 | o | | changeset: 5:4409d547b708
410 | |\ \ \ parent: 3:27eef8ed80b4
428 | |\ \ \ parent: 3:27eef8ed80b4
411 | | | | | parent: 4:26a8bac39d9f
429 | | | | | parent: 4:26a8bac39d9f
412 | | | | | user: test
430 | | | | | user: test
413 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
431 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
414 | | | | | summary: (5) expand
432 | | | | | summary: (5) expand
415 | | | | |
433 | | | | |
416 | | o | | changeset: 4:26a8bac39d9f
434 | | o | | changeset: 4:26a8bac39d9f
417 | |/|/ / parent: 1:6db2ef61d156
435 | |/|/ / parent: 1:6db2ef61d156
418 | | | | parent: 3:27eef8ed80b4
436 | | | | parent: 3:27eef8ed80b4
419 | | | | user: test
437 | | | | user: test
420 | | | | date: Thu Jan 01 00:00:04 1970 +0000
438 | | | | date: Thu Jan 01 00:00:04 1970 +0000
421 | | | | summary: (4) merge two known; one immediate left, one immediate right
439 | | | | summary: (4) merge two known; one immediate left, one immediate right
422 | | | |
440 | | | |
423 | o | | changeset: 3:27eef8ed80b4
441 | o | | changeset: 3:27eef8ed80b4
424 |/ / / user: test
442 |/ / / user: test
425 | | | date: Thu Jan 01 00:00:03 1970 +0000
443 | | | date: Thu Jan 01 00:00:03 1970 +0000
426 | | | summary: (3) collapse
444 | | | summary: (3) collapse
427 | | |
445 | | |
428 o | | changeset: 2:3d9a33b8d1e1
446 o | | changeset: 2:3d9a33b8d1e1
429 |/ / user: test
447 |/ / user: test
430 | | date: Thu Jan 01 00:00:02 1970 +0000
448 | | date: Thu Jan 01 00:00:02 1970 +0000
431 | | summary: (2) collapse
449 | | summary: (2) collapse
432 | |
450 | |
433 o | changeset: 1:6db2ef61d156
451 o | changeset: 1:6db2ef61d156
434 |/ user: test
452 |/ user: test
435 | date: Thu Jan 01 00:00:01 1970 +0000
453 | date: Thu Jan 01 00:00:01 1970 +0000
436 | summary: (1) collapse
454 | summary: (1) collapse
437 |
455 |
438 o changeset: 0:e6eb3150255d
456 o changeset: 0:e6eb3150255d
439 user: test
457 user: test
440 date: Thu Jan 01 00:00:00 1970 +0000
458 date: Thu Jan 01 00:00:00 1970 +0000
441 summary: (0) root
459 summary: (0) root
442
460
443
461
444 File glog:
462 File glog:
445 $ hg glog a
463 $ hg glog a
446 @ changeset: 34:fea3ac5810e0
464 @ changeset: 34:fea3ac5810e0
447 | tag: tip
465 | tag: tip
448 | parent: 32:d06dffa21a31
466 | parent: 32:d06dffa21a31
449 | user: test
467 | user: test
450 | date: Thu Jan 01 00:00:34 1970 +0000
468 | date: Thu Jan 01 00:00:34 1970 +0000
451 | summary: (34) head
469 | summary: (34) head
452 |
470 |
453 | o changeset: 33:68608f5145f9
471 | o changeset: 33:68608f5145f9
454 | | parent: 18:1aa84d96232a
472 | | parent: 18:1aa84d96232a
455 | | user: test
473 | | user: test
456 | | date: Thu Jan 01 00:00:33 1970 +0000
474 | | date: Thu Jan 01 00:00:33 1970 +0000
457 | | summary: (33) head
475 | | summary: (33) head
458 | |
476 | |
459 o | changeset: 32:d06dffa21a31
477 o | changeset: 32:d06dffa21a31
460 |\ \ parent: 27:886ed638191b
478 |\ \ parent: 27:886ed638191b
461 | | | parent: 31:621d83e11f67
479 | | | parent: 31:621d83e11f67
462 | | | user: test
480 | | | user: test
463 | | | date: Thu Jan 01 00:00:32 1970 +0000
481 | | | date: Thu Jan 01 00:00:32 1970 +0000
464 | | | summary: (32) expand
482 | | | summary: (32) expand
465 | | |
483 | | |
466 | o | changeset: 31:621d83e11f67
484 | o | changeset: 31:621d83e11f67
467 | |\ \ parent: 21:d42a756af44d
485 | |\ \ parent: 21:d42a756af44d
468 | | | | parent: 30:6e11cd4b648f
486 | | | | parent: 30:6e11cd4b648f
469 | | | | user: test
487 | | | | user: test
470 | | | | date: Thu Jan 01 00:00:31 1970 +0000
488 | | | | date: Thu Jan 01 00:00:31 1970 +0000
471 | | | | summary: (31) expand
489 | | | | summary: (31) expand
472 | | | |
490 | | | |
473 | | o | changeset: 30:6e11cd4b648f
491 | | o | changeset: 30:6e11cd4b648f
474 | | |\ \ parent: 28:44ecd0b9ae99
492 | | |\ \ parent: 28:44ecd0b9ae99
475 | | | | | parent: 29:cd9bb2be7593
493 | | | | | parent: 29:cd9bb2be7593
476 | | | | | user: test
494 | | | | | user: test
477 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
495 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
478 | | | | | summary: (30) expand
496 | | | | | summary: (30) expand
479 | | | | |
497 | | | | |
480 | | | o | changeset: 29:cd9bb2be7593
498 | | | o | changeset: 29:cd9bb2be7593
481 | | | | | parent: 0:e6eb3150255d
499 | | | | | parent: 0:e6eb3150255d
482 | | | | | user: test
500 | | | | | user: test
483 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
501 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
484 | | | | | summary: (29) regular commit
502 | | | | | summary: (29) regular commit
485 | | | | |
503 | | | | |
486 | | o | | changeset: 28:44ecd0b9ae99
504 | | o | | changeset: 28:44ecd0b9ae99
487 | | |\ \ \ parent: 1:6db2ef61d156
505 | | |\ \ \ parent: 1:6db2ef61d156
488 | | | | | | parent: 26:7f25b6c2f0b9
506 | | | | | | parent: 26:7f25b6c2f0b9
489 | | | | | | user: test
507 | | | | | | user: test
490 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
508 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
491 | | | | | | summary: (28) merge zero known
509 | | | | | | summary: (28) merge zero known
492 | | | | | |
510 | | | | | |
493 o | | | | | changeset: 27:886ed638191b
511 o | | | | | changeset: 27:886ed638191b
494 |/ / / / / parent: 21:d42a756af44d
512 |/ / / / / parent: 21:d42a756af44d
495 | | | | | user: test
513 | | | | | user: test
496 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
514 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
497 | | | | | summary: (27) collapse
515 | | | | | summary: (27) collapse
498 | | | | |
516 | | | | |
499 | | o---+ changeset: 26:7f25b6c2f0b9
517 | | o---+ changeset: 26:7f25b6c2f0b9
500 | | | | | parent: 18:1aa84d96232a
518 | | | | | parent: 18:1aa84d96232a
501 | | | | | parent: 25:91da8ed57247
519 | | | | | parent: 25:91da8ed57247
502 | | | | | user: test
520 | | | | | user: test
503 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
521 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
504 | | | | | summary: (26) merge one known; far right
522 | | | | | summary: (26) merge one known; far right
505 | | | | |
523 | | | | |
506 +---o | | changeset: 25:91da8ed57247
524 +---o | | changeset: 25:91da8ed57247
507 | | | | | parent: 21:d42a756af44d
525 | | | | | parent: 21:d42a756af44d
508 | | | | | parent: 24:a9c19a3d96b7
526 | | | | | parent: 24:a9c19a3d96b7
509 | | | | | user: test
527 | | | | | user: test
510 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
528 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
511 | | | | | summary: (25) merge one known; far left
529 | | | | | summary: (25) merge one known; far left
512 | | | | |
530 | | | | |
513 | | o | | changeset: 24:a9c19a3d96b7
531 | | o | | changeset: 24:a9c19a3d96b7
514 | | |\| | parent: 0:e6eb3150255d
532 | | |\| | parent: 0:e6eb3150255d
515 | | | | | parent: 23:a01cddf0766d
533 | | | | | parent: 23:a01cddf0766d
516 | | | | | user: test
534 | | | | | user: test
517 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
535 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
518 | | | | | summary: (24) merge one known; immediate right
536 | | | | | summary: (24) merge one known; immediate right
519 | | | | |
537 | | | | |
520 | | o | | changeset: 23:a01cddf0766d
538 | | o | | changeset: 23:a01cddf0766d
521 | |/| | | parent: 1:6db2ef61d156
539 | |/| | | parent: 1:6db2ef61d156
522 | | | | | parent: 22:e0d9cccacb5d
540 | | | | | parent: 22:e0d9cccacb5d
523 | | | | | user: test
541 | | | | | user: test
524 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
542 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
525 | | | | | summary: (23) merge one known; immediate left
543 | | | | | summary: (23) merge one known; immediate left
526 | | | | |
544 | | | | |
527 +---o---+ changeset: 22:e0d9cccacb5d
545 +---o---+ changeset: 22:e0d9cccacb5d
528 | | | | parent: 18:1aa84d96232a
546 | | | | parent: 18:1aa84d96232a
529 | | / / parent: 21:d42a756af44d
547 | | / / parent: 21:d42a756af44d
530 | | | | user: test
548 | | | | user: test
531 | | | | date: Thu Jan 01 00:00:22 1970 +0000
549 | | | | date: Thu Jan 01 00:00:22 1970 +0000
532 | | | | summary: (22) merge two known; one far left, one far right
550 | | | | summary: (22) merge two known; one far left, one far right
533 | | | |
551 | | | |
534 o | | | changeset: 21:d42a756af44d
552 o | | | changeset: 21:d42a756af44d
535 |\ \ \ \ parent: 19:31ddc2c1573b
553 |\ \ \ \ parent: 19:31ddc2c1573b
536 | | | | | parent: 20:d30ed6450e32
554 | | | | | parent: 20:d30ed6450e32
537 | | | | | user: test
555 | | | | | user: test
538 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
556 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
539 | | | | | summary: (21) expand
557 | | | | | summary: (21) expand
540 | | | | |
558 | | | | |
541 | o---+-+ changeset: 20:d30ed6450e32
559 | o---+-+ changeset: 20:d30ed6450e32
542 | | | | parent: 0:e6eb3150255d
560 | | | | parent: 0:e6eb3150255d
543 | / / / parent: 18:1aa84d96232a
561 | / / / parent: 18:1aa84d96232a
544 | | | | user: test
562 | | | | user: test
545 | | | | date: Thu Jan 01 00:00:20 1970 +0000
563 | | | | date: Thu Jan 01 00:00:20 1970 +0000
546 | | | | summary: (20) merge two known; two far right
564 | | | | summary: (20) merge two known; two far right
547 | | | |
565 | | | |
548 o | | | changeset: 19:31ddc2c1573b
566 o | | | changeset: 19:31ddc2c1573b
549 |\ \ \ \ parent: 15:1dda3f72782d
567 |\ \ \ \ parent: 15:1dda3f72782d
550 | | | | | parent: 17:44765d7c06e0
568 | | | | | parent: 17:44765d7c06e0
551 | | | | | user: test
569 | | | | | user: test
552 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
570 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
553 | | | | | summary: (19) expand
571 | | | | | summary: (19) expand
554 | | | | |
572 | | | | |
555 +---+---o changeset: 18:1aa84d96232a
573 +---+---o changeset: 18:1aa84d96232a
556 | | | | parent: 1:6db2ef61d156
574 | | | | parent: 1:6db2ef61d156
557 | | | | parent: 15:1dda3f72782d
575 | | | | parent: 15:1dda3f72782d
558 | | | | user: test
576 | | | | user: test
559 | | | | date: Thu Jan 01 00:00:18 1970 +0000
577 | | | | date: Thu Jan 01 00:00:18 1970 +0000
560 | | | | summary: (18) merge two known; two far left
578 | | | | summary: (18) merge two known; two far left
561 | | | |
579 | | | |
562 | o | | changeset: 17:44765d7c06e0
580 | o | | changeset: 17:44765d7c06e0
563 | |\ \ \ parent: 12:86b91144a6e9
581 | |\ \ \ parent: 12:86b91144a6e9
564 | | | | | parent: 16:3677d192927d
582 | | | | | parent: 16:3677d192927d
565 | | | | | user: test
583 | | | | | user: test
566 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
584 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
567 | | | | | summary: (17) expand
585 | | | | | summary: (17) expand
568 | | | | |
586 | | | | |
569 | | o---+ changeset: 16:3677d192927d
587 | | o---+ changeset: 16:3677d192927d
570 | | | | | parent: 0:e6eb3150255d
588 | | | | | parent: 0:e6eb3150255d
571 | | |/ / parent: 1:6db2ef61d156
589 | | |/ / parent: 1:6db2ef61d156
572 | | | | user: test
590 | | | | user: test
573 | | | | date: Thu Jan 01 00:00:16 1970 +0000
591 | | | | date: Thu Jan 01 00:00:16 1970 +0000
574 | | | | summary: (16) merge two known; one immediate right, one near right
592 | | | | summary: (16) merge two known; one immediate right, one near right
575 | | | |
593 | | | |
576 o | | | changeset: 15:1dda3f72782d
594 o | | | changeset: 15:1dda3f72782d
577 |\ \ \ \ parent: 13:22d8966a97e3
595 |\ \ \ \ parent: 13:22d8966a97e3
578 | | | | | parent: 14:8eac370358ef
596 | | | | | parent: 14:8eac370358ef
579 | | | | | user: test
597 | | | | | user: test
580 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
598 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
581 | | | | | summary: (15) expand
599 | | | | | summary: (15) expand
582 | | | | |
600 | | | | |
583 | o-----+ changeset: 14:8eac370358ef
601 | o-----+ changeset: 14:8eac370358ef
584 | | | | | parent: 0:e6eb3150255d
602 | | | | | parent: 0:e6eb3150255d
585 | |/ / / parent: 12:86b91144a6e9
603 | |/ / / parent: 12:86b91144a6e9
586 | | | | user: test
604 | | | | user: test
587 | | | | date: Thu Jan 01 00:00:14 1970 +0000
605 | | | | date: Thu Jan 01 00:00:14 1970 +0000
588 | | | | summary: (14) merge two known; one immediate right, one far right
606 | | | | summary: (14) merge two known; one immediate right, one far right
589 | | | |
607 | | | |
590 o | | | changeset: 13:22d8966a97e3
608 o | | | changeset: 13:22d8966a97e3
591 |\ \ \ \ parent: 9:7010c0af0a35
609 |\ \ \ \ parent: 9:7010c0af0a35
592 | | | | | parent: 11:832d76e6bdf2
610 | | | | | parent: 11:832d76e6bdf2
593 | | | | | user: test
611 | | | | | user: test
594 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
612 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
595 | | | | | summary: (13) expand
613 | | | | | summary: (13) expand
596 | | | | |
614 | | | | |
597 +---o | | changeset: 12:86b91144a6e9
615 +---o | | changeset: 12:86b91144a6e9
598 | | |/ / parent: 1:6db2ef61d156
616 | | |/ / parent: 1:6db2ef61d156
599 | | | | parent: 9:7010c0af0a35
617 | | | | parent: 9:7010c0af0a35
600 | | | | user: test
618 | | | | user: test
601 | | | | date: Thu Jan 01 00:00:12 1970 +0000
619 | | | | date: Thu Jan 01 00:00:12 1970 +0000
602 | | | | summary: (12) merge two known; one immediate right, one far left
620 | | | | summary: (12) merge two known; one immediate right, one far left
603 | | | |
621 | | | |
604 | o | | changeset: 11:832d76e6bdf2
622 | o | | changeset: 11:832d76e6bdf2
605 | |\ \ \ parent: 6:b105a072e251
623 | |\ \ \ parent: 6:b105a072e251
606 | | | | | parent: 10:74c64d036d72
624 | | | | | parent: 10:74c64d036d72
607 | | | | | user: test
625 | | | | | user: test
608 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
626 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
609 | | | | | summary: (11) expand
627 | | | | | summary: (11) expand
610 | | | | |
628 | | | | |
611 | | o---+ changeset: 10:74c64d036d72
629 | | o---+ changeset: 10:74c64d036d72
612 | | | | | parent: 0:e6eb3150255d
630 | | | | | parent: 0:e6eb3150255d
613 | |/ / / parent: 6:b105a072e251
631 | |/ / / parent: 6:b105a072e251
614 | | | | user: test
632 | | | | user: test
615 | | | | date: Thu Jan 01 00:00:10 1970 +0000
633 | | | | date: Thu Jan 01 00:00:10 1970 +0000
616 | | | | summary: (10) merge two known; one immediate left, one near right
634 | | | | summary: (10) merge two known; one immediate left, one near right
617 | | | |
635 | | | |
618 o | | | changeset: 9:7010c0af0a35
636 o | | | changeset: 9:7010c0af0a35
619 |\ \ \ \ parent: 7:b632bb1b1224
637 |\ \ \ \ parent: 7:b632bb1b1224
620 | | | | | parent: 8:7a0b11f71937
638 | | | | | parent: 8:7a0b11f71937
621 | | | | | user: test
639 | | | | | user: test
622 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
640 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
623 | | | | | summary: (9) expand
641 | | | | | summary: (9) expand
624 | | | | |
642 | | | | |
625 | o-----+ changeset: 8:7a0b11f71937
643 | o-----+ changeset: 8:7a0b11f71937
626 | | | | | parent: 0:e6eb3150255d
644 | | | | | parent: 0:e6eb3150255d
627 |/ / / / parent: 7:b632bb1b1224
645 |/ / / / parent: 7:b632bb1b1224
628 | | | | user: test
646 | | | | user: test
629 | | | | date: Thu Jan 01 00:00:08 1970 +0000
647 | | | | date: Thu Jan 01 00:00:08 1970 +0000
630 | | | | summary: (8) merge two known; one immediate left, one far right
648 | | | | summary: (8) merge two known; one immediate left, one far right
631 | | | |
649 | | | |
632 o | | | changeset: 7:b632bb1b1224
650 o | | | changeset: 7:b632bb1b1224
633 |\ \ \ \ parent: 2:3d9a33b8d1e1
651 |\ \ \ \ parent: 2:3d9a33b8d1e1
634 | | | | | parent: 5:4409d547b708
652 | | | | | parent: 5:4409d547b708
635 | | | | | user: test
653 | | | | | user: test
636 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
654 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
637 | | | | | summary: (7) expand
655 | | | | | summary: (7) expand
638 | | | | |
656 | | | | |
639 +---o | | changeset: 6:b105a072e251
657 +---o | | changeset: 6:b105a072e251
640 | |/ / / parent: 2:3d9a33b8d1e1
658 | |/ / / parent: 2:3d9a33b8d1e1
641 | | | | parent: 5:4409d547b708
659 | | | | parent: 5:4409d547b708
642 | | | | user: test
660 | | | | user: test
643 | | | | date: Thu Jan 01 00:00:06 1970 +0000
661 | | | | date: Thu Jan 01 00:00:06 1970 +0000
644 | | | | summary: (6) merge two known; one immediate left, one far left
662 | | | | summary: (6) merge two known; one immediate left, one far left
645 | | | |
663 | | | |
646 | o | | changeset: 5:4409d547b708
664 | o | | changeset: 5:4409d547b708
647 | |\ \ \ parent: 3:27eef8ed80b4
665 | |\ \ \ parent: 3:27eef8ed80b4
648 | | | | | parent: 4:26a8bac39d9f
666 | | | | | parent: 4:26a8bac39d9f
649 | | | | | user: test
667 | | | | | user: test
650 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
668 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
651 | | | | | summary: (5) expand
669 | | | | | summary: (5) expand
652 | | | | |
670 | | | | |
653 | | o | | changeset: 4:26a8bac39d9f
671 | | o | | changeset: 4:26a8bac39d9f
654 | |/|/ / parent: 1:6db2ef61d156
672 | |/|/ / parent: 1:6db2ef61d156
655 | | | | parent: 3:27eef8ed80b4
673 | | | | parent: 3:27eef8ed80b4
656 | | | | user: test
674 | | | | user: test
657 | | | | date: Thu Jan 01 00:00:04 1970 +0000
675 | | | | date: Thu Jan 01 00:00:04 1970 +0000
658 | | | | summary: (4) merge two known; one immediate left, one immediate right
676 | | | | summary: (4) merge two known; one immediate left, one immediate right
659 | | | |
677 | | | |
660 | o | | changeset: 3:27eef8ed80b4
678 | o | | changeset: 3:27eef8ed80b4
661 |/ / / user: test
679 |/ / / user: test
662 | | | date: Thu Jan 01 00:00:03 1970 +0000
680 | | | date: Thu Jan 01 00:00:03 1970 +0000
663 | | | summary: (3) collapse
681 | | | summary: (3) collapse
664 | | |
682 | | |
665 o | | changeset: 2:3d9a33b8d1e1
683 o | | changeset: 2:3d9a33b8d1e1
666 |/ / user: test
684 |/ / user: test
667 | | date: Thu Jan 01 00:00:02 1970 +0000
685 | | date: Thu Jan 01 00:00:02 1970 +0000
668 | | summary: (2) collapse
686 | | summary: (2) collapse
669 | |
687 | |
670 o | changeset: 1:6db2ef61d156
688 o | changeset: 1:6db2ef61d156
671 |/ user: test
689 |/ user: test
672 | date: Thu Jan 01 00:00:01 1970 +0000
690 | date: Thu Jan 01 00:00:01 1970 +0000
673 | summary: (1) collapse
691 | summary: (1) collapse
674 |
692 |
675 o changeset: 0:e6eb3150255d
693 o changeset: 0:e6eb3150255d
676 user: test
694 user: test
677 date: Thu Jan 01 00:00:00 1970 +0000
695 date: Thu Jan 01 00:00:00 1970 +0000
678 summary: (0) root
696 summary: (0) root
679
697
680
698
681 File glog per revset:
699 File glog per revset:
682
700
683 $ hg glog -r 'file("a")'
701 $ hg glog -r 'file("a")'
684 @ changeset: 34:fea3ac5810e0
702 @ changeset: 34:fea3ac5810e0
685 | tag: tip
703 | tag: tip
686 | parent: 32:d06dffa21a31
704 | parent: 32:d06dffa21a31
687 | user: test
705 | user: test
688 | date: Thu Jan 01 00:00:34 1970 +0000
706 | date: Thu Jan 01 00:00:34 1970 +0000
689 | summary: (34) head
707 | summary: (34) head
690 |
708 |
691 | o changeset: 33:68608f5145f9
709 | o changeset: 33:68608f5145f9
692 | | parent: 18:1aa84d96232a
710 | | parent: 18:1aa84d96232a
693 | | user: test
711 | | user: test
694 | | date: Thu Jan 01 00:00:33 1970 +0000
712 | | date: Thu Jan 01 00:00:33 1970 +0000
695 | | summary: (33) head
713 | | summary: (33) head
696 | |
714 | |
697 o | changeset: 32:d06dffa21a31
715 o | changeset: 32:d06dffa21a31
698 |\ \ parent: 27:886ed638191b
716 |\ \ parent: 27:886ed638191b
699 | | | parent: 31:621d83e11f67
717 | | | parent: 31:621d83e11f67
700 | | | user: test
718 | | | user: test
701 | | | date: Thu Jan 01 00:00:32 1970 +0000
719 | | | date: Thu Jan 01 00:00:32 1970 +0000
702 | | | summary: (32) expand
720 | | | summary: (32) expand
703 | | |
721 | | |
704 | o | changeset: 31:621d83e11f67
722 | o | changeset: 31:621d83e11f67
705 | |\ \ parent: 21:d42a756af44d
723 | |\ \ parent: 21:d42a756af44d
706 | | | | parent: 30:6e11cd4b648f
724 | | | | parent: 30:6e11cd4b648f
707 | | | | user: test
725 | | | | user: test
708 | | | | date: Thu Jan 01 00:00:31 1970 +0000
726 | | | | date: Thu Jan 01 00:00:31 1970 +0000
709 | | | | summary: (31) expand
727 | | | | summary: (31) expand
710 | | | |
728 | | | |
711 | | o | changeset: 30:6e11cd4b648f
729 | | o | changeset: 30:6e11cd4b648f
712 | | |\ \ parent: 28:44ecd0b9ae99
730 | | |\ \ parent: 28:44ecd0b9ae99
713 | | | | | parent: 29:cd9bb2be7593
731 | | | | | parent: 29:cd9bb2be7593
714 | | | | | user: test
732 | | | | | user: test
715 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
733 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
716 | | | | | summary: (30) expand
734 | | | | | summary: (30) expand
717 | | | | |
735 | | | | |
718 | | | o | changeset: 29:cd9bb2be7593
736 | | | o | changeset: 29:cd9bb2be7593
719 | | | | | parent: 0:e6eb3150255d
737 | | | | | parent: 0:e6eb3150255d
720 | | | | | user: test
738 | | | | | user: test
721 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
739 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
722 | | | | | summary: (29) regular commit
740 | | | | | summary: (29) regular commit
723 | | | | |
741 | | | | |
724 | | o | | changeset: 28:44ecd0b9ae99
742 | | o | | changeset: 28:44ecd0b9ae99
725 | | |\ \ \ parent: 1:6db2ef61d156
743 | | |\ \ \ parent: 1:6db2ef61d156
726 | | | | | | parent: 26:7f25b6c2f0b9
744 | | | | | | parent: 26:7f25b6c2f0b9
727 | | | | | | user: test
745 | | | | | | user: test
728 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
746 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
729 | | | | | | summary: (28) merge zero known
747 | | | | | | summary: (28) merge zero known
730 | | | | | |
748 | | | | | |
731 o | | | | | changeset: 27:886ed638191b
749 o | | | | | changeset: 27:886ed638191b
732 |/ / / / / parent: 21:d42a756af44d
750 |/ / / / / parent: 21:d42a756af44d
733 | | | | | user: test
751 | | | | | user: test
734 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
752 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
735 | | | | | summary: (27) collapse
753 | | | | | summary: (27) collapse
736 | | | | |
754 | | | | |
737 | | o---+ changeset: 26:7f25b6c2f0b9
755 | | o---+ changeset: 26:7f25b6c2f0b9
738 | | | | | parent: 18:1aa84d96232a
756 | | | | | parent: 18:1aa84d96232a
739 | | | | | parent: 25:91da8ed57247
757 | | | | | parent: 25:91da8ed57247
740 | | | | | user: test
758 | | | | | user: test
741 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
759 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
742 | | | | | summary: (26) merge one known; far right
760 | | | | | summary: (26) merge one known; far right
743 | | | | |
761 | | | | |
744 +---o | | changeset: 25:91da8ed57247
762 +---o | | changeset: 25:91da8ed57247
745 | | | | | parent: 21:d42a756af44d
763 | | | | | parent: 21:d42a756af44d
746 | | | | | parent: 24:a9c19a3d96b7
764 | | | | | parent: 24:a9c19a3d96b7
747 | | | | | user: test
765 | | | | | user: test
748 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
766 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
749 | | | | | summary: (25) merge one known; far left
767 | | | | | summary: (25) merge one known; far left
750 | | | | |
768 | | | | |
751 | | o | | changeset: 24:a9c19a3d96b7
769 | | o | | changeset: 24:a9c19a3d96b7
752 | | |\| | parent: 0:e6eb3150255d
770 | | |\| | parent: 0:e6eb3150255d
753 | | | | | parent: 23:a01cddf0766d
771 | | | | | parent: 23:a01cddf0766d
754 | | | | | user: test
772 | | | | | user: test
755 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
773 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
756 | | | | | summary: (24) merge one known; immediate right
774 | | | | | summary: (24) merge one known; immediate right
757 | | | | |
775 | | | | |
758 | | o | | changeset: 23:a01cddf0766d
776 | | o | | changeset: 23:a01cddf0766d
759 | |/| | | parent: 1:6db2ef61d156
777 | |/| | | parent: 1:6db2ef61d156
760 | | | | | parent: 22:e0d9cccacb5d
778 | | | | | parent: 22:e0d9cccacb5d
761 | | | | | user: test
779 | | | | | user: test
762 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
780 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
763 | | | | | summary: (23) merge one known; immediate left
781 | | | | | summary: (23) merge one known; immediate left
764 | | | | |
782 | | | | |
765 +---o---+ changeset: 22:e0d9cccacb5d
783 +---o---+ changeset: 22:e0d9cccacb5d
766 | | | | parent: 18:1aa84d96232a
784 | | | | parent: 18:1aa84d96232a
767 | | / / parent: 21:d42a756af44d
785 | | / / parent: 21:d42a756af44d
768 | | | | user: test
786 | | | | user: test
769 | | | | date: Thu Jan 01 00:00:22 1970 +0000
787 | | | | date: Thu Jan 01 00:00:22 1970 +0000
770 | | | | summary: (22) merge two known; one far left, one far right
788 | | | | summary: (22) merge two known; one far left, one far right
771 | | | |
789 | | | |
772 o | | | changeset: 21:d42a756af44d
790 o | | | changeset: 21:d42a756af44d
773 |\ \ \ \ parent: 19:31ddc2c1573b
791 |\ \ \ \ parent: 19:31ddc2c1573b
774 | | | | | parent: 20:d30ed6450e32
792 | | | | | parent: 20:d30ed6450e32
775 | | | | | user: test
793 | | | | | user: test
776 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
794 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
777 | | | | | summary: (21) expand
795 | | | | | summary: (21) expand
778 | | | | |
796 | | | | |
779 | o---+-+ changeset: 20:d30ed6450e32
797 | o---+-+ changeset: 20:d30ed6450e32
780 | | | | parent: 0:e6eb3150255d
798 | | | | parent: 0:e6eb3150255d
781 | / / / parent: 18:1aa84d96232a
799 | / / / parent: 18:1aa84d96232a
782 | | | | user: test
800 | | | | user: test
783 | | | | date: Thu Jan 01 00:00:20 1970 +0000
801 | | | | date: Thu Jan 01 00:00:20 1970 +0000
784 | | | | summary: (20) merge two known; two far right
802 | | | | summary: (20) merge two known; two far right
785 | | | |
803 | | | |
786 o | | | changeset: 19:31ddc2c1573b
804 o | | | changeset: 19:31ddc2c1573b
787 |\ \ \ \ parent: 15:1dda3f72782d
805 |\ \ \ \ parent: 15:1dda3f72782d
788 | | | | | parent: 17:44765d7c06e0
806 | | | | | parent: 17:44765d7c06e0
789 | | | | | user: test
807 | | | | | user: test
790 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
808 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
791 | | | | | summary: (19) expand
809 | | | | | summary: (19) expand
792 | | | | |
810 | | | | |
793 +---+---o changeset: 18:1aa84d96232a
811 +---+---o changeset: 18:1aa84d96232a
794 | | | | parent: 1:6db2ef61d156
812 | | | | parent: 1:6db2ef61d156
795 | | | | parent: 15:1dda3f72782d
813 | | | | parent: 15:1dda3f72782d
796 | | | | user: test
814 | | | | user: test
797 | | | | date: Thu Jan 01 00:00:18 1970 +0000
815 | | | | date: Thu Jan 01 00:00:18 1970 +0000
798 | | | | summary: (18) merge two known; two far left
816 | | | | summary: (18) merge two known; two far left
799 | | | |
817 | | | |
800 | o | | changeset: 17:44765d7c06e0
818 | o | | changeset: 17:44765d7c06e0
801 | |\ \ \ parent: 12:86b91144a6e9
819 | |\ \ \ parent: 12:86b91144a6e9
802 | | | | | parent: 16:3677d192927d
820 | | | | | parent: 16:3677d192927d
803 | | | | | user: test
821 | | | | | user: test
804 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
822 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
805 | | | | | summary: (17) expand
823 | | | | | summary: (17) expand
806 | | | | |
824 | | | | |
807 | | o---+ changeset: 16:3677d192927d
825 | | o---+ changeset: 16:3677d192927d
808 | | | | | parent: 0:e6eb3150255d
826 | | | | | parent: 0:e6eb3150255d
809 | | |/ / parent: 1:6db2ef61d156
827 | | |/ / parent: 1:6db2ef61d156
810 | | | | user: test
828 | | | | user: test
811 | | | | date: Thu Jan 01 00:00:16 1970 +0000
829 | | | | date: Thu Jan 01 00:00:16 1970 +0000
812 | | | | summary: (16) merge two known; one immediate right, one near right
830 | | | | summary: (16) merge two known; one immediate right, one near right
813 | | | |
831 | | | |
814 o | | | changeset: 15:1dda3f72782d
832 o | | | changeset: 15:1dda3f72782d
815 |\ \ \ \ parent: 13:22d8966a97e3
833 |\ \ \ \ parent: 13:22d8966a97e3
816 | | | | | parent: 14:8eac370358ef
834 | | | | | parent: 14:8eac370358ef
817 | | | | | user: test
835 | | | | | user: test
818 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
836 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
819 | | | | | summary: (15) expand
837 | | | | | summary: (15) expand
820 | | | | |
838 | | | | |
821 | o-----+ changeset: 14:8eac370358ef
839 | o-----+ changeset: 14:8eac370358ef
822 | | | | | parent: 0:e6eb3150255d
840 | | | | | parent: 0:e6eb3150255d
823 | |/ / / parent: 12:86b91144a6e9
841 | |/ / / parent: 12:86b91144a6e9
824 | | | | user: test
842 | | | | user: test
825 | | | | date: Thu Jan 01 00:00:14 1970 +0000
843 | | | | date: Thu Jan 01 00:00:14 1970 +0000
826 | | | | summary: (14) merge two known; one immediate right, one far right
844 | | | | summary: (14) merge two known; one immediate right, one far right
827 | | | |
845 | | | |
828 o | | | changeset: 13:22d8966a97e3
846 o | | | changeset: 13:22d8966a97e3
829 |\ \ \ \ parent: 9:7010c0af0a35
847 |\ \ \ \ parent: 9:7010c0af0a35
830 | | | | | parent: 11:832d76e6bdf2
848 | | | | | parent: 11:832d76e6bdf2
831 | | | | | user: test
849 | | | | | user: test
832 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
850 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
833 | | | | | summary: (13) expand
851 | | | | | summary: (13) expand
834 | | | | |
852 | | | | |
835 +---o | | changeset: 12:86b91144a6e9
853 +---o | | changeset: 12:86b91144a6e9
836 | | |/ / parent: 1:6db2ef61d156
854 | | |/ / parent: 1:6db2ef61d156
837 | | | | parent: 9:7010c0af0a35
855 | | | | parent: 9:7010c0af0a35
838 | | | | user: test
856 | | | | user: test
839 | | | | date: Thu Jan 01 00:00:12 1970 +0000
857 | | | | date: Thu Jan 01 00:00:12 1970 +0000
840 | | | | summary: (12) merge two known; one immediate right, one far left
858 | | | | summary: (12) merge two known; one immediate right, one far left
841 | | | |
859 | | | |
842 | o | | changeset: 11:832d76e6bdf2
860 | o | | changeset: 11:832d76e6bdf2
843 | |\ \ \ parent: 6:b105a072e251
861 | |\ \ \ parent: 6:b105a072e251
844 | | | | | parent: 10:74c64d036d72
862 | | | | | parent: 10:74c64d036d72
845 | | | | | user: test
863 | | | | | user: test
846 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
864 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
847 | | | | | summary: (11) expand
865 | | | | | summary: (11) expand
848 | | | | |
866 | | | | |
849 | | o---+ changeset: 10:74c64d036d72
867 | | o---+ changeset: 10:74c64d036d72
850 | | | | | parent: 0:e6eb3150255d
868 | | | | | parent: 0:e6eb3150255d
851 | |/ / / parent: 6:b105a072e251
869 | |/ / / parent: 6:b105a072e251
852 | | | | user: test
870 | | | | user: test
853 | | | | date: Thu Jan 01 00:00:10 1970 +0000
871 | | | | date: Thu Jan 01 00:00:10 1970 +0000
854 | | | | summary: (10) merge two known; one immediate left, one near right
872 | | | | summary: (10) merge two known; one immediate left, one near right
855 | | | |
873 | | | |
856 o | | | changeset: 9:7010c0af0a35
874 o | | | changeset: 9:7010c0af0a35
857 |\ \ \ \ parent: 7:b632bb1b1224
875 |\ \ \ \ parent: 7:b632bb1b1224
858 | | | | | parent: 8:7a0b11f71937
876 | | | | | parent: 8:7a0b11f71937
859 | | | | | user: test
877 | | | | | user: test
860 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
878 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
861 | | | | | summary: (9) expand
879 | | | | | summary: (9) expand
862 | | | | |
880 | | | | |
863 | o-----+ changeset: 8:7a0b11f71937
881 | o-----+ changeset: 8:7a0b11f71937
864 | | | | | parent: 0:e6eb3150255d
882 | | | | | parent: 0:e6eb3150255d
865 |/ / / / parent: 7:b632bb1b1224
883 |/ / / / parent: 7:b632bb1b1224
866 | | | | user: test
884 | | | | user: test
867 | | | | date: Thu Jan 01 00:00:08 1970 +0000
885 | | | | date: Thu Jan 01 00:00:08 1970 +0000
868 | | | | summary: (8) merge two known; one immediate left, one far right
886 | | | | summary: (8) merge two known; one immediate left, one far right
869 | | | |
887 | | | |
870 o | | | changeset: 7:b632bb1b1224
888 o | | | changeset: 7:b632bb1b1224
871 |\ \ \ \ parent: 2:3d9a33b8d1e1
889 |\ \ \ \ parent: 2:3d9a33b8d1e1
872 | | | | | parent: 5:4409d547b708
890 | | | | | parent: 5:4409d547b708
873 | | | | | user: test
891 | | | | | user: test
874 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
892 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
875 | | | | | summary: (7) expand
893 | | | | | summary: (7) expand
876 | | | | |
894 | | | | |
877 +---o | | changeset: 6:b105a072e251
895 +---o | | changeset: 6:b105a072e251
878 | |/ / / parent: 2:3d9a33b8d1e1
896 | |/ / / parent: 2:3d9a33b8d1e1
879 | | | | parent: 5:4409d547b708
897 | | | | parent: 5:4409d547b708
880 | | | | user: test
898 | | | | user: test
881 | | | | date: Thu Jan 01 00:00:06 1970 +0000
899 | | | | date: Thu Jan 01 00:00:06 1970 +0000
882 | | | | summary: (6) merge two known; one immediate left, one far left
900 | | | | summary: (6) merge two known; one immediate left, one far left
883 | | | |
901 | | | |
884 | o | | changeset: 5:4409d547b708
902 | o | | changeset: 5:4409d547b708
885 | |\ \ \ parent: 3:27eef8ed80b4
903 | |\ \ \ parent: 3:27eef8ed80b4
886 | | | | | parent: 4:26a8bac39d9f
904 | | | | | parent: 4:26a8bac39d9f
887 | | | | | user: test
905 | | | | | user: test
888 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
906 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
889 | | | | | summary: (5) expand
907 | | | | | summary: (5) expand
890 | | | | |
908 | | | | |
891 | | o | | changeset: 4:26a8bac39d9f
909 | | o | | changeset: 4:26a8bac39d9f
892 | |/|/ / parent: 1:6db2ef61d156
910 | |/|/ / parent: 1:6db2ef61d156
893 | | | | parent: 3:27eef8ed80b4
911 | | | | parent: 3:27eef8ed80b4
894 | | | | user: test
912 | | | | user: test
895 | | | | date: Thu Jan 01 00:00:04 1970 +0000
913 | | | | date: Thu Jan 01 00:00:04 1970 +0000
896 | | | | summary: (4) merge two known; one immediate left, one immediate right
914 | | | | summary: (4) merge two known; one immediate left, one immediate right
897 | | | |
915 | | | |
898 | o | | changeset: 3:27eef8ed80b4
916 | o | | changeset: 3:27eef8ed80b4
899 |/ / / user: test
917 |/ / / user: test
900 | | | date: Thu Jan 01 00:00:03 1970 +0000
918 | | | date: Thu Jan 01 00:00:03 1970 +0000
901 | | | summary: (3) collapse
919 | | | summary: (3) collapse
902 | | |
920 | | |
903 o | | changeset: 2:3d9a33b8d1e1
921 o | | changeset: 2:3d9a33b8d1e1
904 |/ / user: test
922 |/ / user: test
905 | | date: Thu Jan 01 00:00:02 1970 +0000
923 | | date: Thu Jan 01 00:00:02 1970 +0000
906 | | summary: (2) collapse
924 | | summary: (2) collapse
907 | |
925 | |
908 o | changeset: 1:6db2ef61d156
926 o | changeset: 1:6db2ef61d156
909 |/ user: test
927 |/ user: test
910 | date: Thu Jan 01 00:00:01 1970 +0000
928 | date: Thu Jan 01 00:00:01 1970 +0000
911 | summary: (1) collapse
929 | summary: (1) collapse
912 |
930 |
913 o changeset: 0:e6eb3150255d
931 o changeset: 0:e6eb3150255d
914 user: test
932 user: test
915 date: Thu Jan 01 00:00:00 1970 +0000
933 date: Thu Jan 01 00:00:00 1970 +0000
916 summary: (0) root
934 summary: (0) root
917
935
918
936
919
937
920 File glog per revset (only merges):
938 File glog per revset (only merges):
921
939
922 $ hg log -G -r 'file("a")' -m
940 $ hg log -G -r 'file("a")' -m
923 o changeset: 32:d06dffa21a31
941 o changeset: 32:d06dffa21a31
924 |\ parent: 27:886ed638191b
942 |\ parent: 27:886ed638191b
925 | | parent: 31:621d83e11f67
943 | | parent: 31:621d83e11f67
926 | | user: test
944 | | user: test
927 | | date: Thu Jan 01 00:00:32 1970 +0000
945 | | date: Thu Jan 01 00:00:32 1970 +0000
928 | | summary: (32) expand
946 | | summary: (32) expand
929 | |
947 | |
930 o | changeset: 31:621d83e11f67
948 o | changeset: 31:621d83e11f67
931 |\| parent: 21:d42a756af44d
949 |\| parent: 21:d42a756af44d
932 | | parent: 30:6e11cd4b648f
950 | | parent: 30:6e11cd4b648f
933 | | user: test
951 | | user: test
934 | | date: Thu Jan 01 00:00:31 1970 +0000
952 | | date: Thu Jan 01 00:00:31 1970 +0000
935 | | summary: (31) expand
953 | | summary: (31) expand
936 | |
954 | |
937 o | changeset: 30:6e11cd4b648f
955 o | changeset: 30:6e11cd4b648f
938 |\ \ parent: 28:44ecd0b9ae99
956 |\ \ parent: 28:44ecd0b9ae99
939 | | | parent: 29:cd9bb2be7593
957 | | | parent: 29:cd9bb2be7593
940 | | | user: test
958 | | | user: test
941 | | | date: Thu Jan 01 00:00:30 1970 +0000
959 | | | date: Thu Jan 01 00:00:30 1970 +0000
942 | | | summary: (30) expand
960 | | | summary: (30) expand
943 | | |
961 | | |
944 o | | changeset: 28:44ecd0b9ae99
962 o | | changeset: 28:44ecd0b9ae99
945 |\ \ \ parent: 1:6db2ef61d156
963 |\ \ \ parent: 1:6db2ef61d156
946 | | | | parent: 26:7f25b6c2f0b9
964 | | | | parent: 26:7f25b6c2f0b9
947 | | | | user: test
965 | | | | user: test
948 | | | | date: Thu Jan 01 00:00:28 1970 +0000
966 | | | | date: Thu Jan 01 00:00:28 1970 +0000
949 | | | | summary: (28) merge zero known
967 | | | | summary: (28) merge zero known
950 | | | |
968 | | | |
951 o | | | changeset: 26:7f25b6c2f0b9
969 o | | | changeset: 26:7f25b6c2f0b9
952 |\ \ \ \ parent: 18:1aa84d96232a
970 |\ \ \ \ parent: 18:1aa84d96232a
953 | | | | | parent: 25:91da8ed57247
971 | | | | | parent: 25:91da8ed57247
954 | | | | | user: test
972 | | | | | user: test
955 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
973 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
956 | | | | | summary: (26) merge one known; far right
974 | | | | | summary: (26) merge one known; far right
957 | | | | |
975 | | | | |
958 | o-----+ changeset: 25:91da8ed57247
976 | o-----+ changeset: 25:91da8ed57247
959 | | | | | parent: 21:d42a756af44d
977 | | | | | parent: 21:d42a756af44d
960 | | | | | parent: 24:a9c19a3d96b7
978 | | | | | parent: 24:a9c19a3d96b7
961 | | | | | user: test
979 | | | | | user: test
962 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
980 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
963 | | | | | summary: (25) merge one known; far left
981 | | | | | summary: (25) merge one known; far left
964 | | | | |
982 | | | | |
965 | o | | | changeset: 24:a9c19a3d96b7
983 | o | | | changeset: 24:a9c19a3d96b7
966 | |\ \ \ \ parent: 0:e6eb3150255d
984 | |\ \ \ \ parent: 0:e6eb3150255d
967 | | | | | | parent: 23:a01cddf0766d
985 | | | | | | parent: 23:a01cddf0766d
968 | | | | | | user: test
986 | | | | | | user: test
969 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
987 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
970 | | | | | | summary: (24) merge one known; immediate right
988 | | | | | | summary: (24) merge one known; immediate right
971 | | | | | |
989 | | | | | |
972 | o---+ | | changeset: 23:a01cddf0766d
990 | o---+ | | changeset: 23:a01cddf0766d
973 | | | | | | parent: 1:6db2ef61d156
991 | | | | | | parent: 1:6db2ef61d156
974 | | | | | | parent: 22:e0d9cccacb5d
992 | | | | | | parent: 22:e0d9cccacb5d
975 | | | | | | user: test
993 | | | | | | user: test
976 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
994 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
977 | | | | | | summary: (23) merge one known; immediate left
995 | | | | | | summary: (23) merge one known; immediate left
978 | | | | | |
996 | | | | | |
979 | o-------+ changeset: 22:e0d9cccacb5d
997 | o-------+ changeset: 22:e0d9cccacb5d
980 | | | | | | parent: 18:1aa84d96232a
998 | | | | | | parent: 18:1aa84d96232a
981 |/ / / / / parent: 21:d42a756af44d
999 |/ / / / / parent: 21:d42a756af44d
982 | | | | | user: test
1000 | | | | | user: test
983 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
1001 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
984 | | | | | summary: (22) merge two known; one far left, one far right
1002 | | | | | summary: (22) merge two known; one far left, one far right
985 | | | | |
1003 | | | | |
986 | | | | o changeset: 21:d42a756af44d
1004 | | | | o changeset: 21:d42a756af44d
987 | | | | |\ parent: 19:31ddc2c1573b
1005 | | | | |\ parent: 19:31ddc2c1573b
988 | | | | | | parent: 20:d30ed6450e32
1006 | | | | | | parent: 20:d30ed6450e32
989 | | | | | | user: test
1007 | | | | | | user: test
990 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
1008 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
991 | | | | | | summary: (21) expand
1009 | | | | | | summary: (21) expand
992 | | | | | |
1010 | | | | | |
993 +-+-------o changeset: 20:d30ed6450e32
1011 +-+-------o changeset: 20:d30ed6450e32
994 | | | | | parent: 0:e6eb3150255d
1012 | | | | | parent: 0:e6eb3150255d
995 | | | | | parent: 18:1aa84d96232a
1013 | | | | | parent: 18:1aa84d96232a
996 | | | | | user: test
1014 | | | | | user: test
997 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
1015 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
998 | | | | | summary: (20) merge two known; two far right
1016 | | | | | summary: (20) merge two known; two far right
999 | | | | |
1017 | | | | |
1000 | | | | o changeset: 19:31ddc2c1573b
1018 | | | | o changeset: 19:31ddc2c1573b
1001 | | | | |\ parent: 15:1dda3f72782d
1019 | | | | |\ parent: 15:1dda3f72782d
1002 | | | | | | parent: 17:44765d7c06e0
1020 | | | | | | parent: 17:44765d7c06e0
1003 | | | | | | user: test
1021 | | | | | | user: test
1004 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
1022 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
1005 | | | | | | summary: (19) expand
1023 | | | | | | summary: (19) expand
1006 | | | | | |
1024 | | | | | |
1007 o---+---+ | changeset: 18:1aa84d96232a
1025 o---+---+ | changeset: 18:1aa84d96232a
1008 | | | | | parent: 1:6db2ef61d156
1026 | | | | | parent: 1:6db2ef61d156
1009 / / / / / parent: 15:1dda3f72782d
1027 / / / / / parent: 15:1dda3f72782d
1010 | | | | | user: test
1028 | | | | | user: test
1011 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
1029 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
1012 | | | | | summary: (18) merge two known; two far left
1030 | | | | | summary: (18) merge two known; two far left
1013 | | | | |
1031 | | | | |
1014 | | | | o changeset: 17:44765d7c06e0
1032 | | | | o changeset: 17:44765d7c06e0
1015 | | | | |\ parent: 12:86b91144a6e9
1033 | | | | |\ parent: 12:86b91144a6e9
1016 | | | | | | parent: 16:3677d192927d
1034 | | | | | | parent: 16:3677d192927d
1017 | | | | | | user: test
1035 | | | | | | user: test
1018 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
1036 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
1019 | | | | | | summary: (17) expand
1037 | | | | | | summary: (17) expand
1020 | | | | | |
1038 | | | | | |
1021 +-+-------o changeset: 16:3677d192927d
1039 +-+-------o changeset: 16:3677d192927d
1022 | | | | | parent: 0:e6eb3150255d
1040 | | | | | parent: 0:e6eb3150255d
1023 | | | | | parent: 1:6db2ef61d156
1041 | | | | | parent: 1:6db2ef61d156
1024 | | | | | user: test
1042 | | | | | user: test
1025 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
1043 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
1026 | | | | | summary: (16) merge two known; one immediate right, one near right
1044 | | | | | summary: (16) merge two known; one immediate right, one near right
1027 | | | | |
1045 | | | | |
1028 | | | o | changeset: 15:1dda3f72782d
1046 | | | o | changeset: 15:1dda3f72782d
1029 | | | |\ \ parent: 13:22d8966a97e3
1047 | | | |\ \ parent: 13:22d8966a97e3
1030 | | | | | | parent: 14:8eac370358ef
1048 | | | | | | parent: 14:8eac370358ef
1031 | | | | | | user: test
1049 | | | | | | user: test
1032 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
1050 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
1033 | | | | | | summary: (15) expand
1051 | | | | | | summary: (15) expand
1034 | | | | | |
1052 | | | | | |
1035 +-------o | changeset: 14:8eac370358ef
1053 +-------o | changeset: 14:8eac370358ef
1036 | | | | |/ parent: 0:e6eb3150255d
1054 | | | | |/ parent: 0:e6eb3150255d
1037 | | | | | parent: 12:86b91144a6e9
1055 | | | | | parent: 12:86b91144a6e9
1038 | | | | | user: test
1056 | | | | | user: test
1039 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
1057 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
1040 | | | | | summary: (14) merge two known; one immediate right, one far right
1058 | | | | | summary: (14) merge two known; one immediate right, one far right
1041 | | | | |
1059 | | | | |
1042 | | | o | changeset: 13:22d8966a97e3
1060 | | | o | changeset: 13:22d8966a97e3
1043 | | | |\ \ parent: 9:7010c0af0a35
1061 | | | |\ \ parent: 9:7010c0af0a35
1044 | | | | | | parent: 11:832d76e6bdf2
1062 | | | | | | parent: 11:832d76e6bdf2
1045 | | | | | | user: test
1063 | | | | | | user: test
1046 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
1064 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
1047 | | | | | | summary: (13) expand
1065 | | | | | | summary: (13) expand
1048 | | | | | |
1066 | | | | | |
1049 | +---+---o changeset: 12:86b91144a6e9
1067 | +---+---o changeset: 12:86b91144a6e9
1050 | | | | | parent: 1:6db2ef61d156
1068 | | | | | parent: 1:6db2ef61d156
1051 | | | | | parent: 9:7010c0af0a35
1069 | | | | | parent: 9:7010c0af0a35
1052 | | | | | user: test
1070 | | | | | user: test
1053 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
1071 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
1054 | | | | | summary: (12) merge two known; one immediate right, one far left
1072 | | | | | summary: (12) merge two known; one immediate right, one far left
1055 | | | | |
1073 | | | | |
1056 | | | | o changeset: 11:832d76e6bdf2
1074 | | | | o changeset: 11:832d76e6bdf2
1057 | | | | |\ parent: 6:b105a072e251
1075 | | | | |\ parent: 6:b105a072e251
1058 | | | | | | parent: 10:74c64d036d72
1076 | | | | | | parent: 10:74c64d036d72
1059 | | | | | | user: test
1077 | | | | | | user: test
1060 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
1078 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
1061 | | | | | | summary: (11) expand
1079 | | | | | | summary: (11) expand
1062 | | | | | |
1080 | | | | | |
1063 +---------o changeset: 10:74c64d036d72
1081 +---------o changeset: 10:74c64d036d72
1064 | | | | |/ parent: 0:e6eb3150255d
1082 | | | | |/ parent: 0:e6eb3150255d
1065 | | | | | parent: 6:b105a072e251
1083 | | | | | parent: 6:b105a072e251
1066 | | | | | user: test
1084 | | | | | user: test
1067 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
1085 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
1068 | | | | | summary: (10) merge two known; one immediate left, one near right
1086 | | | | | summary: (10) merge two known; one immediate left, one near right
1069 | | | | |
1087 | | | | |
1070 | | | o | changeset: 9:7010c0af0a35
1088 | | | o | changeset: 9:7010c0af0a35
1071 | | | |\ \ parent: 7:b632bb1b1224
1089 | | | |\ \ parent: 7:b632bb1b1224
1072 | | | | | | parent: 8:7a0b11f71937
1090 | | | | | | parent: 8:7a0b11f71937
1073 | | | | | | user: test
1091 | | | | | | user: test
1074 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
1092 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
1075 | | | | | | summary: (9) expand
1093 | | | | | | summary: (9) expand
1076 | | | | | |
1094 | | | | | |
1077 +-------o | changeset: 8:7a0b11f71937
1095 +-------o | changeset: 8:7a0b11f71937
1078 | | | |/ / parent: 0:e6eb3150255d
1096 | | | |/ / parent: 0:e6eb3150255d
1079 | | | | | parent: 7:b632bb1b1224
1097 | | | | | parent: 7:b632bb1b1224
1080 | | | | | user: test
1098 | | | | | user: test
1081 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
1099 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
1082 | | | | | summary: (8) merge two known; one immediate left, one far right
1100 | | | | | summary: (8) merge two known; one immediate left, one far right
1083 | | | | |
1101 | | | | |
1084 | | | o | changeset: 7:b632bb1b1224
1102 | | | o | changeset: 7:b632bb1b1224
1085 | | | |\ \ parent: 2:3d9a33b8d1e1
1103 | | | |\ \ parent: 2:3d9a33b8d1e1
1086 | | | | | | parent: 5:4409d547b708
1104 | | | | | | parent: 5:4409d547b708
1087 | | | | | | user: test
1105 | | | | | | user: test
1088 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
1106 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
1089 | | | | | | summary: (7) expand
1107 | | | | | | summary: (7) expand
1090 | | | | | |
1108 | | | | | |
1091 | | | +---o changeset: 6:b105a072e251
1109 | | | +---o changeset: 6:b105a072e251
1092 | | | | |/ parent: 2:3d9a33b8d1e1
1110 | | | | |/ parent: 2:3d9a33b8d1e1
1093 | | | | | parent: 5:4409d547b708
1111 | | | | | parent: 5:4409d547b708
1094 | | | | | user: test
1112 | | | | | user: test
1095 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
1113 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
1096 | | | | | summary: (6) merge two known; one immediate left, one far left
1114 | | | | | summary: (6) merge two known; one immediate left, one far left
1097 | | | | |
1115 | | | | |
1098 | | | o | changeset: 5:4409d547b708
1116 | | | o | changeset: 5:4409d547b708
1099 | | | |\ \ parent: 3:27eef8ed80b4
1117 | | | |\ \ parent: 3:27eef8ed80b4
1100 | | | | | | parent: 4:26a8bac39d9f
1118 | | | | | | parent: 4:26a8bac39d9f
1101 | | | | | | user: test
1119 | | | | | | user: test
1102 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
1120 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
1103 | | | | | | summary: (5) expand
1121 | | | | | | summary: (5) expand
1104 | | | | | |
1122 | | | | | |
1105 | +---o | | changeset: 4:26a8bac39d9f
1123 | +---o | | changeset: 4:26a8bac39d9f
1106 | | | |/ / parent: 1:6db2ef61d156
1124 | | | |/ / parent: 1:6db2ef61d156
1107 | | | | | parent: 3:27eef8ed80b4
1125 | | | | | parent: 3:27eef8ed80b4
1108 | | | | | user: test
1126 | | | | | user: test
1109 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
1127 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
1110 | | | | | summary: (4) merge two known; one immediate left, one immediate right
1128 | | | | | summary: (4) merge two known; one immediate left, one immediate right
1111 | | | | |
1129 | | | | |
1112
1130
1113
1131
1114 Empty revision range - display nothing:
1132 Empty revision range - display nothing:
1115 $ hg glog -r 1..0
1133 $ hg glog -r 1..0
1116
1134
1117 From outer space:
1135 From outer space:
1118 $ cd ..
1136 $ cd ..
1119 $ hg glog -l1 repo
1137 $ hg glog -l1 repo
1120 @ changeset: 34:fea3ac5810e0
1138 @ changeset: 34:fea3ac5810e0
1121 | tag: tip
1139 | tag: tip
1122 | parent: 32:d06dffa21a31
1140 | parent: 32:d06dffa21a31
1123 | user: test
1141 | user: test
1124 | date: Thu Jan 01 00:00:34 1970 +0000
1142 | date: Thu Jan 01 00:00:34 1970 +0000
1125 | summary: (34) head
1143 | summary: (34) head
1126 |
1144 |
1127 $ hg glog -l1 repo/a
1145 $ hg glog -l1 repo/a
1128 @ changeset: 34:fea3ac5810e0
1146 @ changeset: 34:fea3ac5810e0
1129 | tag: tip
1147 | tag: tip
1130 | parent: 32:d06dffa21a31
1148 | parent: 32:d06dffa21a31
1131 | user: test
1149 | user: test
1132 | date: Thu Jan 01 00:00:34 1970 +0000
1150 | date: Thu Jan 01 00:00:34 1970 +0000
1133 | summary: (34) head
1151 | summary: (34) head
1134 |
1152 |
1135 $ hg glog -l1 repo/missing
1153 $ hg glog -l1 repo/missing
1136
1154
1137 File log with revs != cset revs:
1155 File log with revs != cset revs:
1138 $ hg init flog
1156 $ hg init flog
1139 $ cd flog
1157 $ cd flog
1140 $ echo one >one
1158 $ echo one >one
1141 $ hg add one
1159 $ hg add one
1142 $ hg commit -mone
1160 $ hg commit -mone
1143 $ echo two >two
1161 $ echo two >two
1144 $ hg add two
1162 $ hg add two
1145 $ hg commit -mtwo
1163 $ hg commit -mtwo
1146 $ echo more >two
1164 $ echo more >two
1147 $ hg commit -mmore
1165 $ hg commit -mmore
1148 $ hg glog two
1166 $ hg glog two
1149 @ changeset: 2:12c28321755b
1167 @ changeset: 2:12c28321755b
1150 | tag: tip
1168 | tag: tip
1151 | user: test
1169 | user: test
1152 | date: Thu Jan 01 00:00:00 1970 +0000
1170 | date: Thu Jan 01 00:00:00 1970 +0000
1153 | summary: more
1171 | summary: more
1154 |
1172 |
1155 o changeset: 1:5ac72c0599bf
1173 o changeset: 1:5ac72c0599bf
1156 | user: test
1174 | user: test
1157 | date: Thu Jan 01 00:00:00 1970 +0000
1175 | date: Thu Jan 01 00:00:00 1970 +0000
1158 | summary: two
1176 | summary: two
1159 |
1177 |
1160
1178
1161 Issue1896: File log with explicit style
1179 Issue1896: File log with explicit style
1162 $ hg glog --style=default one
1180 $ hg glog --style=default one
1163 o changeset: 0:3d578b4a1f53
1181 o changeset: 0:3d578b4a1f53
1164 user: test
1182 user: test
1165 date: Thu Jan 01 00:00:00 1970 +0000
1183 date: Thu Jan 01 00:00:00 1970 +0000
1166 summary: one
1184 summary: one
1167
1185
1168 Issue2395: glog --style header and footer
1186 Issue2395: glog --style header and footer
1169 $ hg glog --style=xml one
1187 $ hg glog --style=xml one
1170 <?xml version="1.0"?>
1188 <?xml version="1.0"?>
1171 <log>
1189 <log>
1172 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1190 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1173 <author email="test">test</author>
1191 <author email="test">test</author>
1174 <date>1970-01-01T00:00:00+00:00</date>
1192 <date>1970-01-01T00:00:00+00:00</date>
1175 <msg xml:space="preserve">one</msg>
1193 <msg xml:space="preserve">one</msg>
1176 </logentry>
1194 </logentry>
1177 </log>
1195 </log>
1178
1196
1179 $ cd ..
1197 $ cd ..
1180
1198
1181 Incoming and outgoing:
1199 Incoming and outgoing:
1182
1200
1183 $ hg clone -U -r31 repo repo2
1201 $ hg clone -U -r31 repo repo2
1184 adding changesets
1202 adding changesets
1185 adding manifests
1203 adding manifests
1186 adding file changes
1204 adding file changes
1187 added 31 changesets with 31 changes to 1 files
1205 added 31 changesets with 31 changes to 1 files
1188 $ cd repo2
1206 $ cd repo2
1189
1207
1190 $ hg incoming --graph ../repo
1208 $ hg incoming --graph ../repo
1191 comparing with ../repo
1209 comparing with ../repo
1192 searching for changes
1210 searching for changes
1193 o changeset: 34:fea3ac5810e0
1211 o changeset: 34:fea3ac5810e0
1194 | tag: tip
1212 | tag: tip
1195 | parent: 32:d06dffa21a31
1213 | parent: 32:d06dffa21a31
1196 | user: test
1214 | user: test
1197 | date: Thu Jan 01 00:00:34 1970 +0000
1215 | date: Thu Jan 01 00:00:34 1970 +0000
1198 | summary: (34) head
1216 | summary: (34) head
1199 |
1217 |
1200 | o changeset: 33:68608f5145f9
1218 | o changeset: 33:68608f5145f9
1201 | parent: 18:1aa84d96232a
1219 | parent: 18:1aa84d96232a
1202 | user: test
1220 | user: test
1203 | date: Thu Jan 01 00:00:33 1970 +0000
1221 | date: Thu Jan 01 00:00:33 1970 +0000
1204 | summary: (33) head
1222 | summary: (33) head
1205 |
1223 |
1206 o changeset: 32:d06dffa21a31
1224 o changeset: 32:d06dffa21a31
1207 | parent: 27:886ed638191b
1225 | parent: 27:886ed638191b
1208 | parent: 31:621d83e11f67
1226 | parent: 31:621d83e11f67
1209 | user: test
1227 | user: test
1210 | date: Thu Jan 01 00:00:32 1970 +0000
1228 | date: Thu Jan 01 00:00:32 1970 +0000
1211 | summary: (32) expand
1229 | summary: (32) expand
1212 |
1230 |
1213 o changeset: 27:886ed638191b
1231 o changeset: 27:886ed638191b
1214 parent: 21:d42a756af44d
1232 parent: 21:d42a756af44d
1215 user: test
1233 user: test
1216 date: Thu Jan 01 00:00:27 1970 +0000
1234 date: Thu Jan 01 00:00:27 1970 +0000
1217 summary: (27) collapse
1235 summary: (27) collapse
1218
1236
1219 $ cd ..
1237 $ cd ..
1220
1238
1221 $ hg -R repo outgoing --graph repo2
1239 $ hg -R repo outgoing --graph repo2
1222 comparing with repo2
1240 comparing with repo2
1223 searching for changes
1241 searching for changes
1224 @ changeset: 34:fea3ac5810e0
1242 @ changeset: 34:fea3ac5810e0
1225 | tag: tip
1243 | tag: tip
1226 | parent: 32:d06dffa21a31
1244 | parent: 32:d06dffa21a31
1227 | user: test
1245 | user: test
1228 | date: Thu Jan 01 00:00:34 1970 +0000
1246 | date: Thu Jan 01 00:00:34 1970 +0000
1229 | summary: (34) head
1247 | summary: (34) head
1230 |
1248 |
1231 | o changeset: 33:68608f5145f9
1249 | o changeset: 33:68608f5145f9
1232 | parent: 18:1aa84d96232a
1250 | parent: 18:1aa84d96232a
1233 | user: test
1251 | user: test
1234 | date: Thu Jan 01 00:00:33 1970 +0000
1252 | date: Thu Jan 01 00:00:33 1970 +0000
1235 | summary: (33) head
1253 | summary: (33) head
1236 |
1254 |
1237 o changeset: 32:d06dffa21a31
1255 o changeset: 32:d06dffa21a31
1238 | parent: 27:886ed638191b
1256 | parent: 27:886ed638191b
1239 | parent: 31:621d83e11f67
1257 | parent: 31:621d83e11f67
1240 | user: test
1258 | user: test
1241 | date: Thu Jan 01 00:00:32 1970 +0000
1259 | date: Thu Jan 01 00:00:32 1970 +0000
1242 | summary: (32) expand
1260 | summary: (32) expand
1243 |
1261 |
1244 o changeset: 27:886ed638191b
1262 o changeset: 27:886ed638191b
1245 parent: 21:d42a756af44d
1263 parent: 21:d42a756af44d
1246 user: test
1264 user: test
1247 date: Thu Jan 01 00:00:27 1970 +0000
1265 date: Thu Jan 01 00:00:27 1970 +0000
1248 summary: (27) collapse
1266 summary: (27) collapse
1249
1267
1250
1268
1251 File + limit with revs != cset revs:
1269 File + limit with revs != cset revs:
1252 $ cd repo
1270 $ cd repo
1253 $ touch b
1271 $ touch b
1254 $ hg ci -Aqm0
1272 $ hg ci -Aqm0
1255 $ hg glog -l2 a
1273 $ hg glog -l2 a
1256 o changeset: 34:fea3ac5810e0
1274 o changeset: 34:fea3ac5810e0
1257 | parent: 32:d06dffa21a31
1275 | parent: 32:d06dffa21a31
1258 | user: test
1276 | user: test
1259 | date: Thu Jan 01 00:00:34 1970 +0000
1277 | date: Thu Jan 01 00:00:34 1970 +0000
1260 | summary: (34) head
1278 | summary: (34) head
1261 |
1279 |
1262 | o changeset: 33:68608f5145f9
1280 | o changeset: 33:68608f5145f9
1263 | | parent: 18:1aa84d96232a
1281 | | parent: 18:1aa84d96232a
1264 | | user: test
1282 | | user: test
1265 | | date: Thu Jan 01 00:00:33 1970 +0000
1283 | | date: Thu Jan 01 00:00:33 1970 +0000
1266 | | summary: (33) head
1284 | | summary: (33) head
1267 | |
1285 | |
1268
1286
1269 File + limit + -ra:b, (b - a) < limit:
1287 File + limit + -ra:b, (b - a) < limit:
1270 $ hg glog -l3000 -r32:tip a
1288 $ hg glog -l3000 -r32:tip a
1271 o changeset: 34:fea3ac5810e0
1289 o changeset: 34:fea3ac5810e0
1272 | parent: 32:d06dffa21a31
1290 | parent: 32:d06dffa21a31
1273 | user: test
1291 | user: test
1274 | date: Thu Jan 01 00:00:34 1970 +0000
1292 | date: Thu Jan 01 00:00:34 1970 +0000
1275 | summary: (34) head
1293 | summary: (34) head
1276 |
1294 |
1277 | o changeset: 33:68608f5145f9
1295 | o changeset: 33:68608f5145f9
1278 | | parent: 18:1aa84d96232a
1296 | | parent: 18:1aa84d96232a
1279 | | user: test
1297 | | user: test
1280 | | date: Thu Jan 01 00:00:33 1970 +0000
1298 | | date: Thu Jan 01 00:00:33 1970 +0000
1281 | | summary: (33) head
1299 | | summary: (33) head
1282 | |
1300 | |
1283 o | changeset: 32:d06dffa21a31
1301 o | changeset: 32:d06dffa21a31
1284 |\ \ parent: 27:886ed638191b
1302 |\ \ parent: 27:886ed638191b
1285 | | | parent: 31:621d83e11f67
1303 | | | parent: 31:621d83e11f67
1286 | | | user: test
1304 | | | user: test
1287 | | | date: Thu Jan 01 00:00:32 1970 +0000
1305 | | | date: Thu Jan 01 00:00:32 1970 +0000
1288 | | | summary: (32) expand
1306 | | | summary: (32) expand
1289 | | |
1307 | | |
1290
1308
1291 Point out a common and an uncommon unshown parent
1309 Point out a common and an uncommon unshown parent
1292
1310
1293 $ hg glog -r 'rev(8) or rev(9)'
1311 $ hg glog -r 'rev(8) or rev(9)'
1294 o changeset: 9:7010c0af0a35
1312 o changeset: 9:7010c0af0a35
1295 |\ parent: 7:b632bb1b1224
1313 |\ parent: 7:b632bb1b1224
1296 | | parent: 8:7a0b11f71937
1314 | | parent: 8:7a0b11f71937
1297 | | user: test
1315 | | user: test
1298 | | date: Thu Jan 01 00:00:09 1970 +0000
1316 | | date: Thu Jan 01 00:00:09 1970 +0000
1299 | | summary: (9) expand
1317 | | summary: (9) expand
1300 | |
1318 | |
1301 o | changeset: 8:7a0b11f71937
1319 o | changeset: 8:7a0b11f71937
1302 |\| parent: 0:e6eb3150255d
1320 |\| parent: 0:e6eb3150255d
1303 | | parent: 7:b632bb1b1224
1321 | | parent: 7:b632bb1b1224
1304 | | user: test
1322 | | user: test
1305 | | date: Thu Jan 01 00:00:08 1970 +0000
1323 | | date: Thu Jan 01 00:00:08 1970 +0000
1306 | | summary: (8) merge two known; one immediate left, one far right
1324 | | summary: (8) merge two known; one immediate left, one far right
1307 | |
1325 | |
1308
1326
1309 File + limit + -ra:b, b < tip:
1327 File + limit + -ra:b, b < tip:
1310
1328
1311 $ hg glog -l1 -r32:34 a
1329 $ hg glog -l1 -r32:34 a
1312 o changeset: 34:fea3ac5810e0
1330 o changeset: 34:fea3ac5810e0
1313 | parent: 32:d06dffa21a31
1331 | parent: 32:d06dffa21a31
1314 | user: test
1332 | user: test
1315 | date: Thu Jan 01 00:00:34 1970 +0000
1333 | date: Thu Jan 01 00:00:34 1970 +0000
1316 | summary: (34) head
1334 | summary: (34) head
1317 |
1335 |
1318
1336
1319 file(File) + limit + -ra:b, b < tip:
1337 file(File) + limit + -ra:b, b < tip:
1320
1338
1321 $ hg glog -l1 -r32:34 -r 'file("a")'
1339 $ hg glog -l1 -r32:34 -r 'file("a")'
1322 o changeset: 34:fea3ac5810e0
1340 o changeset: 34:fea3ac5810e0
1323 | parent: 32:d06dffa21a31
1341 | parent: 32:d06dffa21a31
1324 | user: test
1342 | user: test
1325 | date: Thu Jan 01 00:00:34 1970 +0000
1343 | date: Thu Jan 01 00:00:34 1970 +0000
1326 | summary: (34) head
1344 | summary: (34) head
1327 |
1345 |
1328
1346
1329 limit(file(File) and a::b), b < tip:
1347 limit(file(File) and a::b), b < tip:
1330
1348
1331 $ hg glog -r 'limit(file("a") and 32::34, 1)'
1349 $ hg glog -r 'limit(file("a") and 32::34, 1)'
1332 o changeset: 32:d06dffa21a31
1350 o changeset: 32:d06dffa21a31
1333 |\ parent: 27:886ed638191b
1351 |\ parent: 27:886ed638191b
1334 | | parent: 31:621d83e11f67
1352 | | parent: 31:621d83e11f67
1335 | | user: test
1353 | | user: test
1336 | | date: Thu Jan 01 00:00:32 1970 +0000
1354 | | date: Thu Jan 01 00:00:32 1970 +0000
1337 | | summary: (32) expand
1355 | | summary: (32) expand
1338 | |
1356 | |
1339
1357
1340 File + limit + -ra:b, b < tip:
1358 File + limit + -ra:b, b < tip:
1341
1359
1342 $ hg glog -r 'limit(file("a") and 34::32, 1)'
1360 $ hg glog -r 'limit(file("a") and 34::32, 1)'
1343
1361
1344 File + limit + -ra:b, b < tip, (b - a) < limit:
1362 File + limit + -ra:b, b < tip, (b - a) < limit:
1345
1363
1346 $ hg glog -l10 -r33:34 a
1364 $ hg glog -l10 -r33:34 a
1347 o changeset: 34:fea3ac5810e0
1365 o changeset: 34:fea3ac5810e0
1348 | parent: 32:d06dffa21a31
1366 | parent: 32:d06dffa21a31
1349 | user: test
1367 | user: test
1350 | date: Thu Jan 01 00:00:34 1970 +0000
1368 | date: Thu Jan 01 00:00:34 1970 +0000
1351 | summary: (34) head
1369 | summary: (34) head
1352 |
1370 |
1353 | o changeset: 33:68608f5145f9
1371 | o changeset: 33:68608f5145f9
1354 | | parent: 18:1aa84d96232a
1372 | | parent: 18:1aa84d96232a
1355 | | user: test
1373 | | user: test
1356 | | date: Thu Jan 01 00:00:33 1970 +0000
1374 | | date: Thu Jan 01 00:00:33 1970 +0000
1357 | | summary: (33) head
1375 | | summary: (33) head
1358 | |
1376 | |
1359
1377
1360 Do not crash or produce strange graphs if history is buggy
1378 Do not crash or produce strange graphs if history is buggy
1361
1379
1362 $ commit 36 "buggy merge: identical parents" 35 35
1380 $ commit 36 "buggy merge: identical parents" 35 35
1363 $ hg glog -l5
1381 $ hg glog -l5
1364 @ changeset: 36:95fa8febd08a
1382 @ changeset: 36:95fa8febd08a
1365 | tag: tip
1383 | tag: tip
1366 | parent: 35:9159c3644c5e
1384 | parent: 35:9159c3644c5e
1367 | parent: 35:9159c3644c5e
1385 | parent: 35:9159c3644c5e
1368 | user: test
1386 | user: test
1369 | date: Thu Jan 01 00:00:36 1970 +0000
1387 | date: Thu Jan 01 00:00:36 1970 +0000
1370 | summary: (36) buggy merge: identical parents
1388 | summary: (36) buggy merge: identical parents
1371 |
1389 |
1372 o changeset: 35:9159c3644c5e
1390 o changeset: 35:9159c3644c5e
1373 | user: test
1391 | user: test
1374 | date: Thu Jan 01 00:00:00 1970 +0000
1392 | date: Thu Jan 01 00:00:00 1970 +0000
1375 | summary: 0
1393 | summary: 0
1376 |
1394 |
1377 o changeset: 34:fea3ac5810e0
1395 o changeset: 34:fea3ac5810e0
1378 | parent: 32:d06dffa21a31
1396 | parent: 32:d06dffa21a31
1379 | user: test
1397 | user: test
1380 | date: Thu Jan 01 00:00:34 1970 +0000
1398 | date: Thu Jan 01 00:00:34 1970 +0000
1381 | summary: (34) head
1399 | summary: (34) head
1382 |
1400 |
1383 | o changeset: 33:68608f5145f9
1401 | o changeset: 33:68608f5145f9
1384 | | parent: 18:1aa84d96232a
1402 | | parent: 18:1aa84d96232a
1385 | | user: test
1403 | | user: test
1386 | | date: Thu Jan 01 00:00:33 1970 +0000
1404 | | date: Thu Jan 01 00:00:33 1970 +0000
1387 | | summary: (33) head
1405 | | summary: (33) head
1388 | |
1406 | |
1389 o | changeset: 32:d06dffa21a31
1407 o | changeset: 32:d06dffa21a31
1390 |\ \ parent: 27:886ed638191b
1408 |\ \ parent: 27:886ed638191b
1391 | | | parent: 31:621d83e11f67
1409 | | | parent: 31:621d83e11f67
1392 | | | user: test
1410 | | | user: test
1393 | | | date: Thu Jan 01 00:00:32 1970 +0000
1411 | | | date: Thu Jan 01 00:00:32 1970 +0000
1394 | | | summary: (32) expand
1412 | | | summary: (32) expand
1395 | | |
1413 | | |
1396
1414
1397 Test log -G options
1415 Test log -G options
1398
1416
1399 $ hg log -G -u 'something nice'
1417 $ hg log -G -u 'something nice'
1400 $ hg log -G -b 'something nice'
1418 $ hg log -G -b 'something nice'
1401 abort: unknown revision 'something nice'!
1419 abort: unknown revision 'something nice'!
1402 [255]
1420 [255]
1403 $ hg log -G -k 'something nice'
1421 $ hg log -G --print-revset -k 'something' -k 'nice'
1422 ('group', ('and', ('func', ('symbol', 'keyword'), ('string', 'something')), ('func', ('symbol', 'keyword'), ('string', 'nice'))))
1404 $ hg log -G --only-branch 'something nice'
1423 $ hg log -G --only-branch 'something nice'
1405 abort: unknown revision 'something nice'!
1424 abort: unknown revision 'something nice'!
1406 [255]
1425 [255]
1407 $ hg log -G --include 'some file' --exclude 'another file'
1426 $ hg log -G --include 'some file' --exclude 'another file'
1408 $ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l
1427 $ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l
1409 \s*36 (re)
1428 \s*36 (re)
1410 $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l
1429 $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l
1411 \s*0 (re)
1430 \s*0 (re)
1412 $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
1431 $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
1413 \s*28 (re)
1432 \s*28 (re)
1414 $ hg log -G --no-merges --template 'nodetag {rev}\n'
1433 $ hg log -G --no-merges --template 'nodetag {rev}\n'
1415 o nodetag 35
1434 o nodetag 35
1416 |
1435 |
1417 o nodetag 34
1436 o nodetag 34
1418 |\
1437 |\
1419 | \
1438 | \
1420 | |\
1439 | |\
1421 | | \
1440 | | \
1422 | | |\
1441 | | |\
1423 | | | \
1442 | | | \
1424 | | | |\
1443 | | | |\
1425 | | | | \
1444 | | | | \
1426 | | | | |\
1445 | | | | |\
1427 +-+-+-+-----o nodetag 33
1446 +-+-+-+-----o nodetag 33
1428 | | | | | |
1447 | | | | | |
1429 +---------o nodetag 29
1448 +---------o nodetag 29
1430 | | | | |
1449 | | | | |
1431 +-+-+---o nodetag 27
1450 +-+-+---o nodetag 27
1432 | | | |/
1451 | | | |/
1433 | | | o nodetag 3
1452 | | | o nodetag 3
1434 | | |/
1453 | | |/
1435 | | o nodetag 2
1454 | | o nodetag 2
1436 | |/
1455 | |/
1437 | o nodetag 1
1456 | o nodetag 1
1438 |/
1457 |/
1439 o nodetag 0
1458 o nodetag 0
1440
1459
1441 $ hg log -G -d 'brace ) in a date'
1460 $ hg log -G -d 'brace ) in a date'
1442 abort: invalid date: 'brace ) in a date'
1461 abort: invalid date: 'brace ) in a date'
1443 [255]
1462 [255]
1444 $ hg log -G -P 32 --template '{rev}\n'
1463 $ hg log -G -P 32 --template '{rev}\n'
1445 @ 36
1464 @ 36
1446 |
1465 |
1447 o 35
1466 o 35
1448 |
1467 |
1449 o 34
1468 o 34
1450 |
1469 |
1451 | o 33
1470 | o 33
1452 | |
1471 | |
1453 $ hg log -G --follow a
1472 $ hg log -G --follow a
1454 abort: -G/--graph option is incompatible with --follow with file argument
1473 abort: -G/--graph option is incompatible with --follow with file argument
1455 [255]
1474 [255]
1456
1475
1457 Test multiple revision specifications are correctly handled
1476 Test multiple revision specifications are correctly handled
1458
1477
1459 $ hg log -G -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 --template '{rev}\n'
1478 $ hg log -G -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 --template '{rev}\n'
1460 o 34
1479 o 34
1461 |
1480 |
1462 o 32
1481 o 32
1463 |\
1482 |\
1464 | o 31
1483 | o 31
1465 | |\
1484 | |\
1466 o | | 27
1485 o | | 27
1467 |/ /
1486 |/ /
1468 | o 25
1487 | o 25
1469 |/
1488 |/
1470 o 21
1489 o 21
1471 |\
1490 |\
General Comments 0
You need to be logged in to leave comments. Login now