##// END OF EJS Templates
test-glog: dump computed set...
Yuya Nishihara -
r35569:d984d9b3 default
parent child Browse files
Show More
@@ -1,3428 +1,3580
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 $ commit()
72 $ commit()
73 > {
73 > {
74 > rev=$1
74 > rev=$1
75 > msg=$2
75 > msg=$2
76 > shift 2
76 > shift 2
77 > if [ "$#" -gt 0 ]; then
77 > if [ "$#" -gt 0 ]; then
78 > hg debugsetparents "$@"
78 > hg debugsetparents "$@"
79 > fi
79 > fi
80 > echo $rev > a
80 > echo $rev > a
81 > hg commit -Aqd "$rev 0" -m "($rev) $msg"
81 > hg commit -Aqd "$rev 0" -m "($rev) $msg"
82 > }
82 > }
83
83
84 $ cat > printrevset.py <<EOF
84 $ cat > printrevset.py <<EOF
85 > from __future__ import absolute_import
85 > from __future__ import absolute_import
86 > from mercurial import (
86 > from mercurial import (
87 > cmdutil,
87 > cmdutil,
88 > commands,
88 > commands,
89 > extensions,
89 > extensions,
90 > revsetlang,
90 > revsetlang,
91 > smartset,
91 > )
92 > )
92 >
93 >
93 > def logrevset(repo, pats, opts):
94 > def logrevset(repo, pats, opts):
94 > revs = cmdutil._logrevs(repo, opts)
95 > revs = cmdutil._logrevs(repo, opts)
95 > if not revs:
96 > if not revs:
96 > return None
97 > return None
97 > return cmdutil._makelogrevset(repo, pats, opts, revs)[0]
98 > return cmdutil._makelogrevset(repo, pats, opts, revs)[0]
98 >
99 >
99 > def uisetup(ui):
100 > def uisetup(ui):
100 > def printrevset(orig, ui, repo, *pats, **opts):
101 > def printrevset(orig, ui, repo, *pats, **opts):
101 > if opts.get('print_revset'):
102 > if opts.get('print_revset'):
103 > revs = cmdutil.getlogrevs(repo, pats, opts)[0]
102 > expr = logrevset(repo, pats, opts)
104 > expr = logrevset(repo, pats, opts)
103 > if expr:
105 > if expr:
104 > tree = revsetlang.parse(expr)
106 > tree = revsetlang.parse(expr)
105 > tree = revsetlang.analyze(tree)
107 > tree = revsetlang.analyze(tree)
106 > else:
108 > else:
107 > tree = []
109 > tree = []
108 > ui.write('%r\n' % (opts.get('rev', []),))
110 > ui.write('%r\n' % (opts.get('rev', []),))
109 > ui.write(revsetlang.prettyformat(tree) + '\n')
111 > ui.write(revsetlang.prettyformat(tree) + '\n')
112 > ui.write(smartset.prettyformat(revs) + '\n')
110 > return 0
113 > return 0
111 > return orig(ui, repo, *pats, **opts)
114 > return orig(ui, repo, *pats, **opts)
112 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
115 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
113 > entry[1].append(('', 'print-revset', False,
116 > entry[1].append(('', 'print-revset', False,
114 > 'print generated revset and exit (DEPRECATED)'))
117 > 'print generated revset and exit (DEPRECATED)'))
115 > EOF
118 > EOF
116
119
117 $ echo "[extensions]" >> $HGRCPATH
120 $ echo "[extensions]" >> $HGRCPATH
118 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
121 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
119
122
120 $ hg init repo
123 $ hg init repo
121 $ cd repo
124 $ cd repo
122
125
123 Empty repo:
126 Empty repo:
124
127
125 $ hg log -G
128 $ hg log -G
126
129
127
130
128 Building DAG:
131 Building DAG:
129
132
130 $ commit 0 "root"
133 $ commit 0 "root"
131 $ commit 1 "collapse" 0
134 $ commit 1 "collapse" 0
132 $ commit 2 "collapse" 1
135 $ commit 2 "collapse" 1
133 $ commit 3 "collapse" 2
136 $ commit 3 "collapse" 2
134 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
137 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
135 $ commit 5 "expand" 3 4
138 $ commit 5 "expand" 3 4
136 $ commit 6 "merge two known; one immediate left, one far left" 2 5
139 $ commit 6 "merge two known; one immediate left, one far left" 2 5
137 $ commit 7 "expand" 2 5
140 $ commit 7 "expand" 2 5
138 $ commit 8 "merge two known; one immediate left, one far right" 0 7
141 $ commit 8 "merge two known; one immediate left, one far right" 0 7
139 $ commit 9 "expand" 7 8
142 $ commit 9 "expand" 7 8
140 $ commit 10 "merge two known; one immediate left, one near right" 0 6
143 $ commit 10 "merge two known; one immediate left, one near right" 0 6
141 $ commit 11 "expand" 6 10
144 $ commit 11 "expand" 6 10
142 $ commit 12 "merge two known; one immediate right, one far left" 1 9
145 $ commit 12 "merge two known; one immediate right, one far left" 1 9
143 $ commit 13 "expand" 9 11
146 $ commit 13 "expand" 9 11
144 $ commit 14 "merge two known; one immediate right, one far right" 0 12
147 $ commit 14 "merge two known; one immediate right, one far right" 0 12
145 $ commit 15 "expand" 13 14
148 $ commit 15 "expand" 13 14
146 $ commit 16 "merge two known; one immediate right, one near right" 0 1
149 $ commit 16 "merge two known; one immediate right, one near right" 0 1
147 $ commit 17 "expand" 12 16
150 $ commit 17 "expand" 12 16
148 $ commit 18 "merge two known; two far left" 1 15
151 $ commit 18 "merge two known; two far left" 1 15
149 $ commit 19 "expand" 15 17
152 $ commit 19 "expand" 15 17
150 $ commit 20 "merge two known; two far right" 0 18
153 $ commit 20 "merge two known; two far right" 0 18
151 $ commit 21 "expand" 19 20
154 $ commit 21 "expand" 19 20
152 $ commit 22 "merge two known; one far left, one far right" 18 21
155 $ commit 22 "merge two known; one far left, one far right" 18 21
153 $ commit 23 "merge one known; immediate left" 1 22
156 $ commit 23 "merge one known; immediate left" 1 22
154 $ commit 24 "merge one known; immediate right" 0 23
157 $ commit 24 "merge one known; immediate right" 0 23
155 $ commit 25 "merge one known; far left" 21 24
158 $ commit 25 "merge one known; far left" 21 24
156 $ commit 26 "merge one known; far right" 18 25
159 $ commit 26 "merge one known; far right" 18 25
157 $ commit 27 "collapse" 21
160 $ commit 27 "collapse" 21
158 $ commit 28 "merge zero known" 1 26
161 $ commit 28 "merge zero known" 1 26
159 $ commit 29 "regular commit" 0
162 $ commit 29 "regular commit" 0
160 $ commit 30 "expand" 28 29
163 $ commit 30 "expand" 28 29
161 $ commit 31 "expand" 21 30
164 $ commit 31 "expand" 21 30
162 $ commit 32 "expand" 27 31
165 $ commit 32 "expand" 27 31
163 $ commit 33 "head" 18
166 $ commit 33 "head" 18
164 $ commit 34 "head" 32
167 $ commit 34 "head" 32
165
168
166
169
167 $ hg log -G -q
170 $ hg log -G -q
168 @ 34:fea3ac5810e0
171 @ 34:fea3ac5810e0
169 |
172 |
170 | o 33:68608f5145f9
173 | o 33:68608f5145f9
171 | |
174 | |
172 o | 32:d06dffa21a31
175 o | 32:d06dffa21a31
173 |\ \
176 |\ \
174 | o \ 31:621d83e11f67
177 | o \ 31:621d83e11f67
175 | |\ \
178 | |\ \
176 | | o \ 30:6e11cd4b648f
179 | | o \ 30:6e11cd4b648f
177 | | |\ \
180 | | |\ \
178 | | | o | 29:cd9bb2be7593
181 | | | o | 29:cd9bb2be7593
179 | | | | |
182 | | | | |
180 | | o | | 28:44ecd0b9ae99
183 | | o | | 28:44ecd0b9ae99
181 | | |\ \ \
184 | | |\ \ \
182 o | | | | | 27:886ed638191b
185 o | | | | | 27:886ed638191b
183 |/ / / / /
186 |/ / / / /
184 | | o---+ 26:7f25b6c2f0b9
187 | | o---+ 26:7f25b6c2f0b9
185 | | | | |
188 | | | | |
186 +---o | | 25:91da8ed57247
189 +---o | | 25:91da8ed57247
187 | | | | |
190 | | | | |
188 | | o | | 24:a9c19a3d96b7
191 | | o | | 24:a9c19a3d96b7
189 | | |\| |
192 | | |\| |
190 | | o | | 23:a01cddf0766d
193 | | o | | 23:a01cddf0766d
191 | |/| | |
194 | |/| | |
192 +---o---+ 22:e0d9cccacb5d
195 +---o---+ 22:e0d9cccacb5d
193 | | / /
196 | | / /
194 o | | | 21:d42a756af44d
197 o | | | 21:d42a756af44d
195 |\ \ \ \
198 |\ \ \ \
196 | o---+-+ 20:d30ed6450e32
199 | o---+-+ 20:d30ed6450e32
197 | / / /
200 | / / /
198 o | | | 19:31ddc2c1573b
201 o | | | 19:31ddc2c1573b
199 |\ \ \ \
202 |\ \ \ \
200 +---+---o 18:1aa84d96232a
203 +---+---o 18:1aa84d96232a
201 | | | |
204 | | | |
202 | o | | 17:44765d7c06e0
205 | o | | 17:44765d7c06e0
203 | |\ \ \
206 | |\ \ \
204 | | o---+ 16:3677d192927d
207 | | o---+ 16:3677d192927d
205 | | |/ /
208 | | |/ /
206 o | | | 15:1dda3f72782d
209 o | | | 15:1dda3f72782d
207 |\ \ \ \
210 |\ \ \ \
208 | o-----+ 14:8eac370358ef
211 | o-----+ 14:8eac370358ef
209 | |/ / /
212 | |/ / /
210 o | | | 13:22d8966a97e3
213 o | | | 13:22d8966a97e3
211 |\ \ \ \
214 |\ \ \ \
212 +---o | | 12:86b91144a6e9
215 +---o | | 12:86b91144a6e9
213 | | |/ /
216 | | |/ /
214 | o | | 11:832d76e6bdf2
217 | o | | 11:832d76e6bdf2
215 | |\ \ \
218 | |\ \ \
216 | | o---+ 10:74c64d036d72
219 | | o---+ 10:74c64d036d72
217 | |/ / /
220 | |/ / /
218 o | | | 9:7010c0af0a35
221 o | | | 9:7010c0af0a35
219 |\ \ \ \
222 |\ \ \ \
220 | o-----+ 8:7a0b11f71937
223 | o-----+ 8:7a0b11f71937
221 |/ / / /
224 |/ / / /
222 o | | | 7:b632bb1b1224
225 o | | | 7:b632bb1b1224
223 |\ \ \ \
226 |\ \ \ \
224 +---o | | 6:b105a072e251
227 +---o | | 6:b105a072e251
225 | |/ / /
228 | |/ / /
226 | o | | 5:4409d547b708
229 | o | | 5:4409d547b708
227 | |\ \ \
230 | |\ \ \
228 | | o | | 4:26a8bac39d9f
231 | | o | | 4:26a8bac39d9f
229 | |/|/ /
232 | |/|/ /
230 | o / / 3:27eef8ed80b4
233 | o / / 3:27eef8ed80b4
231 |/ / /
234 |/ / /
232 o / / 2:3d9a33b8d1e1
235 o / / 2:3d9a33b8d1e1
233 |/ /
236 |/ /
234 o / 1:6db2ef61d156
237 o / 1:6db2ef61d156
235 |/
238 |/
236 o 0:e6eb3150255d
239 o 0:e6eb3150255d
237
240
238
241
239 $ hg log -G
242 $ hg log -G
240 @ changeset: 34:fea3ac5810e0
243 @ changeset: 34:fea3ac5810e0
241 | tag: tip
244 | tag: tip
242 | parent: 32:d06dffa21a31
245 | parent: 32:d06dffa21a31
243 | user: test
246 | user: test
244 | date: Thu Jan 01 00:00:34 1970 +0000
247 | date: Thu Jan 01 00:00:34 1970 +0000
245 | summary: (34) head
248 | summary: (34) head
246 |
249 |
247 | o changeset: 33:68608f5145f9
250 | o changeset: 33:68608f5145f9
248 | | parent: 18:1aa84d96232a
251 | | parent: 18:1aa84d96232a
249 | | user: test
252 | | user: test
250 | | date: Thu Jan 01 00:00:33 1970 +0000
253 | | date: Thu Jan 01 00:00:33 1970 +0000
251 | | summary: (33) head
254 | | summary: (33) head
252 | |
255 | |
253 o | changeset: 32:d06dffa21a31
256 o | changeset: 32:d06dffa21a31
254 |\ \ parent: 27:886ed638191b
257 |\ \ parent: 27:886ed638191b
255 | | | parent: 31:621d83e11f67
258 | | | parent: 31:621d83e11f67
256 | | | user: test
259 | | | user: test
257 | | | date: Thu Jan 01 00:00:32 1970 +0000
260 | | | date: Thu Jan 01 00:00:32 1970 +0000
258 | | | summary: (32) expand
261 | | | summary: (32) expand
259 | | |
262 | | |
260 | o | changeset: 31:621d83e11f67
263 | o | changeset: 31:621d83e11f67
261 | |\ \ parent: 21:d42a756af44d
264 | |\ \ parent: 21:d42a756af44d
262 | | | | parent: 30:6e11cd4b648f
265 | | | | parent: 30:6e11cd4b648f
263 | | | | user: test
266 | | | | user: test
264 | | | | date: Thu Jan 01 00:00:31 1970 +0000
267 | | | | date: Thu Jan 01 00:00:31 1970 +0000
265 | | | | summary: (31) expand
268 | | | | summary: (31) expand
266 | | | |
269 | | | |
267 | | o | changeset: 30:6e11cd4b648f
270 | | o | changeset: 30:6e11cd4b648f
268 | | |\ \ parent: 28:44ecd0b9ae99
271 | | |\ \ parent: 28:44ecd0b9ae99
269 | | | | | parent: 29:cd9bb2be7593
272 | | | | | parent: 29:cd9bb2be7593
270 | | | | | user: test
273 | | | | | user: test
271 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
274 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
272 | | | | | summary: (30) expand
275 | | | | | summary: (30) expand
273 | | | | |
276 | | | | |
274 | | | o | changeset: 29:cd9bb2be7593
277 | | | o | changeset: 29:cd9bb2be7593
275 | | | | | parent: 0:e6eb3150255d
278 | | | | | parent: 0:e6eb3150255d
276 | | | | | user: test
279 | | | | | user: test
277 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
280 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
278 | | | | | summary: (29) regular commit
281 | | | | | summary: (29) regular commit
279 | | | | |
282 | | | | |
280 | | o | | changeset: 28:44ecd0b9ae99
283 | | o | | changeset: 28:44ecd0b9ae99
281 | | |\ \ \ parent: 1:6db2ef61d156
284 | | |\ \ \ parent: 1:6db2ef61d156
282 | | | | | | parent: 26:7f25b6c2f0b9
285 | | | | | | parent: 26:7f25b6c2f0b9
283 | | | | | | user: test
286 | | | | | | user: test
284 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
287 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
285 | | | | | | summary: (28) merge zero known
288 | | | | | | summary: (28) merge zero known
286 | | | | | |
289 | | | | | |
287 o | | | | | changeset: 27:886ed638191b
290 o | | | | | changeset: 27:886ed638191b
288 |/ / / / / parent: 21:d42a756af44d
291 |/ / / / / parent: 21:d42a756af44d
289 | | | | | user: test
292 | | | | | user: test
290 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
293 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
291 | | | | | summary: (27) collapse
294 | | | | | summary: (27) collapse
292 | | | | |
295 | | | | |
293 | | o---+ changeset: 26:7f25b6c2f0b9
296 | | o---+ changeset: 26:7f25b6c2f0b9
294 | | | | | parent: 18:1aa84d96232a
297 | | | | | parent: 18:1aa84d96232a
295 | | | | | parent: 25:91da8ed57247
298 | | | | | parent: 25:91da8ed57247
296 | | | | | user: test
299 | | | | | user: test
297 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
300 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
298 | | | | | summary: (26) merge one known; far right
301 | | | | | summary: (26) merge one known; far right
299 | | | | |
302 | | | | |
300 +---o | | changeset: 25:91da8ed57247
303 +---o | | changeset: 25:91da8ed57247
301 | | | | | parent: 21:d42a756af44d
304 | | | | | parent: 21:d42a756af44d
302 | | | | | parent: 24:a9c19a3d96b7
305 | | | | | parent: 24:a9c19a3d96b7
303 | | | | | user: test
306 | | | | | user: test
304 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
307 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
305 | | | | | summary: (25) merge one known; far left
308 | | | | | summary: (25) merge one known; far left
306 | | | | |
309 | | | | |
307 | | o | | changeset: 24:a9c19a3d96b7
310 | | o | | changeset: 24:a9c19a3d96b7
308 | | |\| | parent: 0:e6eb3150255d
311 | | |\| | parent: 0:e6eb3150255d
309 | | | | | parent: 23:a01cddf0766d
312 | | | | | parent: 23:a01cddf0766d
310 | | | | | user: test
313 | | | | | user: test
311 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
314 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
312 | | | | | summary: (24) merge one known; immediate right
315 | | | | | summary: (24) merge one known; immediate right
313 | | | | |
316 | | | | |
314 | | o | | changeset: 23:a01cddf0766d
317 | | o | | changeset: 23:a01cddf0766d
315 | |/| | | parent: 1:6db2ef61d156
318 | |/| | | parent: 1:6db2ef61d156
316 | | | | | parent: 22:e0d9cccacb5d
319 | | | | | parent: 22:e0d9cccacb5d
317 | | | | | user: test
320 | | | | | user: test
318 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
321 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
319 | | | | | summary: (23) merge one known; immediate left
322 | | | | | summary: (23) merge one known; immediate left
320 | | | | |
323 | | | | |
321 +---o---+ changeset: 22:e0d9cccacb5d
324 +---o---+ changeset: 22:e0d9cccacb5d
322 | | | | parent: 18:1aa84d96232a
325 | | | | parent: 18:1aa84d96232a
323 | | / / parent: 21:d42a756af44d
326 | | / / parent: 21:d42a756af44d
324 | | | | user: test
327 | | | | user: test
325 | | | | date: Thu Jan 01 00:00:22 1970 +0000
328 | | | | date: Thu Jan 01 00:00:22 1970 +0000
326 | | | | summary: (22) merge two known; one far left, one far right
329 | | | | summary: (22) merge two known; one far left, one far right
327 | | | |
330 | | | |
328 o | | | changeset: 21:d42a756af44d
331 o | | | changeset: 21:d42a756af44d
329 |\ \ \ \ parent: 19:31ddc2c1573b
332 |\ \ \ \ parent: 19:31ddc2c1573b
330 | | | | | parent: 20:d30ed6450e32
333 | | | | | parent: 20:d30ed6450e32
331 | | | | | user: test
334 | | | | | user: test
332 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
335 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
333 | | | | | summary: (21) expand
336 | | | | | summary: (21) expand
334 | | | | |
337 | | | | |
335 | o---+-+ changeset: 20:d30ed6450e32
338 | o---+-+ changeset: 20:d30ed6450e32
336 | | | | parent: 0:e6eb3150255d
339 | | | | parent: 0:e6eb3150255d
337 | / / / parent: 18:1aa84d96232a
340 | / / / parent: 18:1aa84d96232a
338 | | | | user: test
341 | | | | user: test
339 | | | | date: Thu Jan 01 00:00:20 1970 +0000
342 | | | | date: Thu Jan 01 00:00:20 1970 +0000
340 | | | | summary: (20) merge two known; two far right
343 | | | | summary: (20) merge two known; two far right
341 | | | |
344 | | | |
342 o | | | changeset: 19:31ddc2c1573b
345 o | | | changeset: 19:31ddc2c1573b
343 |\ \ \ \ parent: 15:1dda3f72782d
346 |\ \ \ \ parent: 15:1dda3f72782d
344 | | | | | parent: 17:44765d7c06e0
347 | | | | | parent: 17:44765d7c06e0
345 | | | | | user: test
348 | | | | | user: test
346 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
349 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
347 | | | | | summary: (19) expand
350 | | | | | summary: (19) expand
348 | | | | |
351 | | | | |
349 +---+---o changeset: 18:1aa84d96232a
352 +---+---o changeset: 18:1aa84d96232a
350 | | | | parent: 1:6db2ef61d156
353 | | | | parent: 1:6db2ef61d156
351 | | | | parent: 15:1dda3f72782d
354 | | | | parent: 15:1dda3f72782d
352 | | | | user: test
355 | | | | user: test
353 | | | | date: Thu Jan 01 00:00:18 1970 +0000
356 | | | | date: Thu Jan 01 00:00:18 1970 +0000
354 | | | | summary: (18) merge two known; two far left
357 | | | | summary: (18) merge two known; two far left
355 | | | |
358 | | | |
356 | o | | changeset: 17:44765d7c06e0
359 | o | | changeset: 17:44765d7c06e0
357 | |\ \ \ parent: 12:86b91144a6e9
360 | |\ \ \ parent: 12:86b91144a6e9
358 | | | | | parent: 16:3677d192927d
361 | | | | | parent: 16:3677d192927d
359 | | | | | user: test
362 | | | | | user: test
360 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
363 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
361 | | | | | summary: (17) expand
364 | | | | | summary: (17) expand
362 | | | | |
365 | | | | |
363 | | o---+ changeset: 16:3677d192927d
366 | | o---+ changeset: 16:3677d192927d
364 | | | | | parent: 0:e6eb3150255d
367 | | | | | parent: 0:e6eb3150255d
365 | | |/ / parent: 1:6db2ef61d156
368 | | |/ / parent: 1:6db2ef61d156
366 | | | | user: test
369 | | | | user: test
367 | | | | date: Thu Jan 01 00:00:16 1970 +0000
370 | | | | date: Thu Jan 01 00:00:16 1970 +0000
368 | | | | summary: (16) merge two known; one immediate right, one near right
371 | | | | summary: (16) merge two known; one immediate right, one near right
369 | | | |
372 | | | |
370 o | | | changeset: 15:1dda3f72782d
373 o | | | changeset: 15:1dda3f72782d
371 |\ \ \ \ parent: 13:22d8966a97e3
374 |\ \ \ \ parent: 13:22d8966a97e3
372 | | | | | parent: 14:8eac370358ef
375 | | | | | parent: 14:8eac370358ef
373 | | | | | user: test
376 | | | | | user: test
374 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
377 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
375 | | | | | summary: (15) expand
378 | | | | | summary: (15) expand
376 | | | | |
379 | | | | |
377 | o-----+ changeset: 14:8eac370358ef
380 | o-----+ changeset: 14:8eac370358ef
378 | | | | | parent: 0:e6eb3150255d
381 | | | | | parent: 0:e6eb3150255d
379 | |/ / / parent: 12:86b91144a6e9
382 | |/ / / parent: 12:86b91144a6e9
380 | | | | user: test
383 | | | | user: test
381 | | | | date: Thu Jan 01 00:00:14 1970 +0000
384 | | | | date: Thu Jan 01 00:00:14 1970 +0000
382 | | | | summary: (14) merge two known; one immediate right, one far right
385 | | | | summary: (14) merge two known; one immediate right, one far right
383 | | | |
386 | | | |
384 o | | | changeset: 13:22d8966a97e3
387 o | | | changeset: 13:22d8966a97e3
385 |\ \ \ \ parent: 9:7010c0af0a35
388 |\ \ \ \ parent: 9:7010c0af0a35
386 | | | | | parent: 11:832d76e6bdf2
389 | | | | | parent: 11:832d76e6bdf2
387 | | | | | user: test
390 | | | | | user: test
388 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
391 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
389 | | | | | summary: (13) expand
392 | | | | | summary: (13) expand
390 | | | | |
393 | | | | |
391 +---o | | changeset: 12:86b91144a6e9
394 +---o | | changeset: 12:86b91144a6e9
392 | | |/ / parent: 1:6db2ef61d156
395 | | |/ / parent: 1:6db2ef61d156
393 | | | | parent: 9:7010c0af0a35
396 | | | | parent: 9:7010c0af0a35
394 | | | | user: test
397 | | | | user: test
395 | | | | date: Thu Jan 01 00:00:12 1970 +0000
398 | | | | date: Thu Jan 01 00:00:12 1970 +0000
396 | | | | summary: (12) merge two known; one immediate right, one far left
399 | | | | summary: (12) merge two known; one immediate right, one far left
397 | | | |
400 | | | |
398 | o | | changeset: 11:832d76e6bdf2
401 | o | | changeset: 11:832d76e6bdf2
399 | |\ \ \ parent: 6:b105a072e251
402 | |\ \ \ parent: 6:b105a072e251
400 | | | | | parent: 10:74c64d036d72
403 | | | | | parent: 10:74c64d036d72
401 | | | | | user: test
404 | | | | | user: test
402 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
405 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
403 | | | | | summary: (11) expand
406 | | | | | summary: (11) expand
404 | | | | |
407 | | | | |
405 | | o---+ changeset: 10:74c64d036d72
408 | | o---+ changeset: 10:74c64d036d72
406 | | | | | parent: 0:e6eb3150255d
409 | | | | | parent: 0:e6eb3150255d
407 | |/ / / parent: 6:b105a072e251
410 | |/ / / parent: 6:b105a072e251
408 | | | | user: test
411 | | | | user: test
409 | | | | date: Thu Jan 01 00:00:10 1970 +0000
412 | | | | date: Thu Jan 01 00:00:10 1970 +0000
410 | | | | summary: (10) merge two known; one immediate left, one near right
413 | | | | summary: (10) merge two known; one immediate left, one near right
411 | | | |
414 | | | |
412 o | | | changeset: 9:7010c0af0a35
415 o | | | changeset: 9:7010c0af0a35
413 |\ \ \ \ parent: 7:b632bb1b1224
416 |\ \ \ \ parent: 7:b632bb1b1224
414 | | | | | parent: 8:7a0b11f71937
417 | | | | | parent: 8:7a0b11f71937
415 | | | | | user: test
418 | | | | | user: test
416 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
419 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
417 | | | | | summary: (9) expand
420 | | | | | summary: (9) expand
418 | | | | |
421 | | | | |
419 | o-----+ changeset: 8:7a0b11f71937
422 | o-----+ changeset: 8:7a0b11f71937
420 | | | | | parent: 0:e6eb3150255d
423 | | | | | parent: 0:e6eb3150255d
421 |/ / / / parent: 7:b632bb1b1224
424 |/ / / / parent: 7:b632bb1b1224
422 | | | | user: test
425 | | | | user: test
423 | | | | date: Thu Jan 01 00:00:08 1970 +0000
426 | | | | date: Thu Jan 01 00:00:08 1970 +0000
424 | | | | summary: (8) merge two known; one immediate left, one far right
427 | | | | summary: (8) merge two known; one immediate left, one far right
425 | | | |
428 | | | |
426 o | | | changeset: 7:b632bb1b1224
429 o | | | changeset: 7:b632bb1b1224
427 |\ \ \ \ parent: 2:3d9a33b8d1e1
430 |\ \ \ \ parent: 2:3d9a33b8d1e1
428 | | | | | parent: 5:4409d547b708
431 | | | | | parent: 5:4409d547b708
429 | | | | | user: test
432 | | | | | user: test
430 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
433 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
431 | | | | | summary: (7) expand
434 | | | | | summary: (7) expand
432 | | | | |
435 | | | | |
433 +---o | | changeset: 6:b105a072e251
436 +---o | | changeset: 6:b105a072e251
434 | |/ / / parent: 2:3d9a33b8d1e1
437 | |/ / / parent: 2:3d9a33b8d1e1
435 | | | | parent: 5:4409d547b708
438 | | | | parent: 5:4409d547b708
436 | | | | user: test
439 | | | | user: test
437 | | | | date: Thu Jan 01 00:00:06 1970 +0000
440 | | | | date: Thu Jan 01 00:00:06 1970 +0000
438 | | | | summary: (6) merge two known; one immediate left, one far left
441 | | | | summary: (6) merge two known; one immediate left, one far left
439 | | | |
442 | | | |
440 | o | | changeset: 5:4409d547b708
443 | o | | changeset: 5:4409d547b708
441 | |\ \ \ parent: 3:27eef8ed80b4
444 | |\ \ \ parent: 3:27eef8ed80b4
442 | | | | | parent: 4:26a8bac39d9f
445 | | | | | parent: 4:26a8bac39d9f
443 | | | | | user: test
446 | | | | | user: test
444 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
447 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
445 | | | | | summary: (5) expand
448 | | | | | summary: (5) expand
446 | | | | |
449 | | | | |
447 | | o | | changeset: 4:26a8bac39d9f
450 | | o | | changeset: 4:26a8bac39d9f
448 | |/|/ / parent: 1:6db2ef61d156
451 | |/|/ / parent: 1:6db2ef61d156
449 | | | | parent: 3:27eef8ed80b4
452 | | | | parent: 3:27eef8ed80b4
450 | | | | user: test
453 | | | | user: test
451 | | | | date: Thu Jan 01 00:00:04 1970 +0000
454 | | | | date: Thu Jan 01 00:00:04 1970 +0000
452 | | | | summary: (4) merge two known; one immediate left, one immediate right
455 | | | | summary: (4) merge two known; one immediate left, one immediate right
453 | | | |
456 | | | |
454 | o | | changeset: 3:27eef8ed80b4
457 | o | | changeset: 3:27eef8ed80b4
455 |/ / / user: test
458 |/ / / user: test
456 | | | date: Thu Jan 01 00:00:03 1970 +0000
459 | | | date: Thu Jan 01 00:00:03 1970 +0000
457 | | | summary: (3) collapse
460 | | | summary: (3) collapse
458 | | |
461 | | |
459 o | | changeset: 2:3d9a33b8d1e1
462 o | | changeset: 2:3d9a33b8d1e1
460 |/ / user: test
463 |/ / user: test
461 | | date: Thu Jan 01 00:00:02 1970 +0000
464 | | date: Thu Jan 01 00:00:02 1970 +0000
462 | | summary: (2) collapse
465 | | summary: (2) collapse
463 | |
466 | |
464 o | changeset: 1:6db2ef61d156
467 o | changeset: 1:6db2ef61d156
465 |/ user: test
468 |/ user: test
466 | date: Thu Jan 01 00:00:01 1970 +0000
469 | date: Thu Jan 01 00:00:01 1970 +0000
467 | summary: (1) collapse
470 | summary: (1) collapse
468 |
471 |
469 o changeset: 0:e6eb3150255d
472 o changeset: 0:e6eb3150255d
470 user: test
473 user: test
471 date: Thu Jan 01 00:00:00 1970 +0000
474 date: Thu Jan 01 00:00:00 1970 +0000
472 summary: (0) root
475 summary: (0) root
473
476
474
477
475 File glog:
478 File glog:
476 $ hg log -G a
479 $ hg log -G a
477 @ changeset: 34:fea3ac5810e0
480 @ changeset: 34:fea3ac5810e0
478 | tag: tip
481 | tag: tip
479 | parent: 32:d06dffa21a31
482 | parent: 32:d06dffa21a31
480 | user: test
483 | user: test
481 | date: Thu Jan 01 00:00:34 1970 +0000
484 | date: Thu Jan 01 00:00:34 1970 +0000
482 | summary: (34) head
485 | summary: (34) head
483 |
486 |
484 | o changeset: 33:68608f5145f9
487 | o changeset: 33:68608f5145f9
485 | | parent: 18:1aa84d96232a
488 | | parent: 18:1aa84d96232a
486 | | user: test
489 | | user: test
487 | | date: Thu Jan 01 00:00:33 1970 +0000
490 | | date: Thu Jan 01 00:00:33 1970 +0000
488 | | summary: (33) head
491 | | summary: (33) head
489 | |
492 | |
490 o | changeset: 32:d06dffa21a31
493 o | changeset: 32:d06dffa21a31
491 |\ \ parent: 27:886ed638191b
494 |\ \ parent: 27:886ed638191b
492 | | | parent: 31:621d83e11f67
495 | | | parent: 31:621d83e11f67
493 | | | user: test
496 | | | user: test
494 | | | date: Thu Jan 01 00:00:32 1970 +0000
497 | | | date: Thu Jan 01 00:00:32 1970 +0000
495 | | | summary: (32) expand
498 | | | summary: (32) expand
496 | | |
499 | | |
497 | o | changeset: 31:621d83e11f67
500 | o | changeset: 31:621d83e11f67
498 | |\ \ parent: 21:d42a756af44d
501 | |\ \ parent: 21:d42a756af44d
499 | | | | parent: 30:6e11cd4b648f
502 | | | | parent: 30:6e11cd4b648f
500 | | | | user: test
503 | | | | user: test
501 | | | | date: Thu Jan 01 00:00:31 1970 +0000
504 | | | | date: Thu Jan 01 00:00:31 1970 +0000
502 | | | | summary: (31) expand
505 | | | | summary: (31) expand
503 | | | |
506 | | | |
504 | | o | changeset: 30:6e11cd4b648f
507 | | o | changeset: 30:6e11cd4b648f
505 | | |\ \ parent: 28:44ecd0b9ae99
508 | | |\ \ parent: 28:44ecd0b9ae99
506 | | | | | parent: 29:cd9bb2be7593
509 | | | | | parent: 29:cd9bb2be7593
507 | | | | | user: test
510 | | | | | user: test
508 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
511 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
509 | | | | | summary: (30) expand
512 | | | | | summary: (30) expand
510 | | | | |
513 | | | | |
511 | | | o | changeset: 29:cd9bb2be7593
514 | | | o | changeset: 29:cd9bb2be7593
512 | | | | | parent: 0:e6eb3150255d
515 | | | | | parent: 0:e6eb3150255d
513 | | | | | user: test
516 | | | | | user: test
514 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
517 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
515 | | | | | summary: (29) regular commit
518 | | | | | summary: (29) regular commit
516 | | | | |
519 | | | | |
517 | | o | | changeset: 28:44ecd0b9ae99
520 | | o | | changeset: 28:44ecd0b9ae99
518 | | |\ \ \ parent: 1:6db2ef61d156
521 | | |\ \ \ parent: 1:6db2ef61d156
519 | | | | | | parent: 26:7f25b6c2f0b9
522 | | | | | | parent: 26:7f25b6c2f0b9
520 | | | | | | user: test
523 | | | | | | user: test
521 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
524 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
522 | | | | | | summary: (28) merge zero known
525 | | | | | | summary: (28) merge zero known
523 | | | | | |
526 | | | | | |
524 o | | | | | changeset: 27:886ed638191b
527 o | | | | | changeset: 27:886ed638191b
525 |/ / / / / parent: 21:d42a756af44d
528 |/ / / / / parent: 21:d42a756af44d
526 | | | | | user: test
529 | | | | | user: test
527 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
530 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
528 | | | | | summary: (27) collapse
531 | | | | | summary: (27) collapse
529 | | | | |
532 | | | | |
530 | | o---+ changeset: 26:7f25b6c2f0b9
533 | | o---+ changeset: 26:7f25b6c2f0b9
531 | | | | | parent: 18:1aa84d96232a
534 | | | | | parent: 18:1aa84d96232a
532 | | | | | parent: 25:91da8ed57247
535 | | | | | parent: 25:91da8ed57247
533 | | | | | user: test
536 | | | | | user: test
534 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
537 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
535 | | | | | summary: (26) merge one known; far right
538 | | | | | summary: (26) merge one known; far right
536 | | | | |
539 | | | | |
537 +---o | | changeset: 25:91da8ed57247
540 +---o | | changeset: 25:91da8ed57247
538 | | | | | parent: 21:d42a756af44d
541 | | | | | parent: 21:d42a756af44d
539 | | | | | parent: 24:a9c19a3d96b7
542 | | | | | parent: 24:a9c19a3d96b7
540 | | | | | user: test
543 | | | | | user: test
541 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
544 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
542 | | | | | summary: (25) merge one known; far left
545 | | | | | summary: (25) merge one known; far left
543 | | | | |
546 | | | | |
544 | | o | | changeset: 24:a9c19a3d96b7
547 | | o | | changeset: 24:a9c19a3d96b7
545 | | |\| | parent: 0:e6eb3150255d
548 | | |\| | parent: 0:e6eb3150255d
546 | | | | | parent: 23:a01cddf0766d
549 | | | | | parent: 23:a01cddf0766d
547 | | | | | user: test
550 | | | | | user: test
548 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
551 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
549 | | | | | summary: (24) merge one known; immediate right
552 | | | | | summary: (24) merge one known; immediate right
550 | | | | |
553 | | | | |
551 | | o | | changeset: 23:a01cddf0766d
554 | | o | | changeset: 23:a01cddf0766d
552 | |/| | | parent: 1:6db2ef61d156
555 | |/| | | parent: 1:6db2ef61d156
553 | | | | | parent: 22:e0d9cccacb5d
556 | | | | | parent: 22:e0d9cccacb5d
554 | | | | | user: test
557 | | | | | user: test
555 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
558 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
556 | | | | | summary: (23) merge one known; immediate left
559 | | | | | summary: (23) merge one known; immediate left
557 | | | | |
560 | | | | |
558 +---o---+ changeset: 22:e0d9cccacb5d
561 +---o---+ changeset: 22:e0d9cccacb5d
559 | | | | parent: 18:1aa84d96232a
562 | | | | parent: 18:1aa84d96232a
560 | | / / parent: 21:d42a756af44d
563 | | / / parent: 21:d42a756af44d
561 | | | | user: test
564 | | | | user: test
562 | | | | date: Thu Jan 01 00:00:22 1970 +0000
565 | | | | date: Thu Jan 01 00:00:22 1970 +0000
563 | | | | summary: (22) merge two known; one far left, one far right
566 | | | | summary: (22) merge two known; one far left, one far right
564 | | | |
567 | | | |
565 o | | | changeset: 21:d42a756af44d
568 o | | | changeset: 21:d42a756af44d
566 |\ \ \ \ parent: 19:31ddc2c1573b
569 |\ \ \ \ parent: 19:31ddc2c1573b
567 | | | | | parent: 20:d30ed6450e32
570 | | | | | parent: 20:d30ed6450e32
568 | | | | | user: test
571 | | | | | user: test
569 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
572 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
570 | | | | | summary: (21) expand
573 | | | | | summary: (21) expand
571 | | | | |
574 | | | | |
572 | o---+-+ changeset: 20:d30ed6450e32
575 | o---+-+ changeset: 20:d30ed6450e32
573 | | | | parent: 0:e6eb3150255d
576 | | | | parent: 0:e6eb3150255d
574 | / / / parent: 18:1aa84d96232a
577 | / / / parent: 18:1aa84d96232a
575 | | | | user: test
578 | | | | user: test
576 | | | | date: Thu Jan 01 00:00:20 1970 +0000
579 | | | | date: Thu Jan 01 00:00:20 1970 +0000
577 | | | | summary: (20) merge two known; two far right
580 | | | | summary: (20) merge two known; two far right
578 | | | |
581 | | | |
579 o | | | changeset: 19:31ddc2c1573b
582 o | | | changeset: 19:31ddc2c1573b
580 |\ \ \ \ parent: 15:1dda3f72782d
583 |\ \ \ \ parent: 15:1dda3f72782d
581 | | | | | parent: 17:44765d7c06e0
584 | | | | | parent: 17:44765d7c06e0
582 | | | | | user: test
585 | | | | | user: test
583 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
586 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
584 | | | | | summary: (19) expand
587 | | | | | summary: (19) expand
585 | | | | |
588 | | | | |
586 +---+---o changeset: 18:1aa84d96232a
589 +---+---o changeset: 18:1aa84d96232a
587 | | | | parent: 1:6db2ef61d156
590 | | | | parent: 1:6db2ef61d156
588 | | | | parent: 15:1dda3f72782d
591 | | | | parent: 15:1dda3f72782d
589 | | | | user: test
592 | | | | user: test
590 | | | | date: Thu Jan 01 00:00:18 1970 +0000
593 | | | | date: Thu Jan 01 00:00:18 1970 +0000
591 | | | | summary: (18) merge two known; two far left
594 | | | | summary: (18) merge two known; two far left
592 | | | |
595 | | | |
593 | o | | changeset: 17:44765d7c06e0
596 | o | | changeset: 17:44765d7c06e0
594 | |\ \ \ parent: 12:86b91144a6e9
597 | |\ \ \ parent: 12:86b91144a6e9
595 | | | | | parent: 16:3677d192927d
598 | | | | | parent: 16:3677d192927d
596 | | | | | user: test
599 | | | | | user: test
597 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
600 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
598 | | | | | summary: (17) expand
601 | | | | | summary: (17) expand
599 | | | | |
602 | | | | |
600 | | o---+ changeset: 16:3677d192927d
603 | | o---+ changeset: 16:3677d192927d
601 | | | | | parent: 0:e6eb3150255d
604 | | | | | parent: 0:e6eb3150255d
602 | | |/ / parent: 1:6db2ef61d156
605 | | |/ / parent: 1:6db2ef61d156
603 | | | | user: test
606 | | | | user: test
604 | | | | date: Thu Jan 01 00:00:16 1970 +0000
607 | | | | date: Thu Jan 01 00:00:16 1970 +0000
605 | | | | summary: (16) merge two known; one immediate right, one near right
608 | | | | summary: (16) merge two known; one immediate right, one near right
606 | | | |
609 | | | |
607 o | | | changeset: 15:1dda3f72782d
610 o | | | changeset: 15:1dda3f72782d
608 |\ \ \ \ parent: 13:22d8966a97e3
611 |\ \ \ \ parent: 13:22d8966a97e3
609 | | | | | parent: 14:8eac370358ef
612 | | | | | parent: 14:8eac370358ef
610 | | | | | user: test
613 | | | | | user: test
611 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
614 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
612 | | | | | summary: (15) expand
615 | | | | | summary: (15) expand
613 | | | | |
616 | | | | |
614 | o-----+ changeset: 14:8eac370358ef
617 | o-----+ changeset: 14:8eac370358ef
615 | | | | | parent: 0:e6eb3150255d
618 | | | | | parent: 0:e6eb3150255d
616 | |/ / / parent: 12:86b91144a6e9
619 | |/ / / parent: 12:86b91144a6e9
617 | | | | user: test
620 | | | | user: test
618 | | | | date: Thu Jan 01 00:00:14 1970 +0000
621 | | | | date: Thu Jan 01 00:00:14 1970 +0000
619 | | | | summary: (14) merge two known; one immediate right, one far right
622 | | | | summary: (14) merge two known; one immediate right, one far right
620 | | | |
623 | | | |
621 o | | | changeset: 13:22d8966a97e3
624 o | | | changeset: 13:22d8966a97e3
622 |\ \ \ \ parent: 9:7010c0af0a35
625 |\ \ \ \ parent: 9:7010c0af0a35
623 | | | | | parent: 11:832d76e6bdf2
626 | | | | | parent: 11:832d76e6bdf2
624 | | | | | user: test
627 | | | | | user: test
625 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
628 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
626 | | | | | summary: (13) expand
629 | | | | | summary: (13) expand
627 | | | | |
630 | | | | |
628 +---o | | changeset: 12:86b91144a6e9
631 +---o | | changeset: 12:86b91144a6e9
629 | | |/ / parent: 1:6db2ef61d156
632 | | |/ / parent: 1:6db2ef61d156
630 | | | | parent: 9:7010c0af0a35
633 | | | | parent: 9:7010c0af0a35
631 | | | | user: test
634 | | | | user: test
632 | | | | date: Thu Jan 01 00:00:12 1970 +0000
635 | | | | date: Thu Jan 01 00:00:12 1970 +0000
633 | | | | summary: (12) merge two known; one immediate right, one far left
636 | | | | summary: (12) merge two known; one immediate right, one far left
634 | | | |
637 | | | |
635 | o | | changeset: 11:832d76e6bdf2
638 | o | | changeset: 11:832d76e6bdf2
636 | |\ \ \ parent: 6:b105a072e251
639 | |\ \ \ parent: 6:b105a072e251
637 | | | | | parent: 10:74c64d036d72
640 | | | | | parent: 10:74c64d036d72
638 | | | | | user: test
641 | | | | | user: test
639 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
642 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
640 | | | | | summary: (11) expand
643 | | | | | summary: (11) expand
641 | | | | |
644 | | | | |
642 | | o---+ changeset: 10:74c64d036d72
645 | | o---+ changeset: 10:74c64d036d72
643 | | | | | parent: 0:e6eb3150255d
646 | | | | | parent: 0:e6eb3150255d
644 | |/ / / parent: 6:b105a072e251
647 | |/ / / parent: 6:b105a072e251
645 | | | | user: test
648 | | | | user: test
646 | | | | date: Thu Jan 01 00:00:10 1970 +0000
649 | | | | date: Thu Jan 01 00:00:10 1970 +0000
647 | | | | summary: (10) merge two known; one immediate left, one near right
650 | | | | summary: (10) merge two known; one immediate left, one near right
648 | | | |
651 | | | |
649 o | | | changeset: 9:7010c0af0a35
652 o | | | changeset: 9:7010c0af0a35
650 |\ \ \ \ parent: 7:b632bb1b1224
653 |\ \ \ \ parent: 7:b632bb1b1224
651 | | | | | parent: 8:7a0b11f71937
654 | | | | | parent: 8:7a0b11f71937
652 | | | | | user: test
655 | | | | | user: test
653 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
656 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
654 | | | | | summary: (9) expand
657 | | | | | summary: (9) expand
655 | | | | |
658 | | | | |
656 | o-----+ changeset: 8:7a0b11f71937
659 | o-----+ changeset: 8:7a0b11f71937
657 | | | | | parent: 0:e6eb3150255d
660 | | | | | parent: 0:e6eb3150255d
658 |/ / / / parent: 7:b632bb1b1224
661 |/ / / / parent: 7:b632bb1b1224
659 | | | | user: test
662 | | | | user: test
660 | | | | date: Thu Jan 01 00:00:08 1970 +0000
663 | | | | date: Thu Jan 01 00:00:08 1970 +0000
661 | | | | summary: (8) merge two known; one immediate left, one far right
664 | | | | summary: (8) merge two known; one immediate left, one far right
662 | | | |
665 | | | |
663 o | | | changeset: 7:b632bb1b1224
666 o | | | changeset: 7:b632bb1b1224
664 |\ \ \ \ parent: 2:3d9a33b8d1e1
667 |\ \ \ \ parent: 2:3d9a33b8d1e1
665 | | | | | parent: 5:4409d547b708
668 | | | | | parent: 5:4409d547b708
666 | | | | | user: test
669 | | | | | user: test
667 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
670 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
668 | | | | | summary: (7) expand
671 | | | | | summary: (7) expand
669 | | | | |
672 | | | | |
670 +---o | | changeset: 6:b105a072e251
673 +---o | | changeset: 6:b105a072e251
671 | |/ / / parent: 2:3d9a33b8d1e1
674 | |/ / / parent: 2:3d9a33b8d1e1
672 | | | | parent: 5:4409d547b708
675 | | | | parent: 5:4409d547b708
673 | | | | user: test
676 | | | | user: test
674 | | | | date: Thu Jan 01 00:00:06 1970 +0000
677 | | | | date: Thu Jan 01 00:00:06 1970 +0000
675 | | | | summary: (6) merge two known; one immediate left, one far left
678 | | | | summary: (6) merge two known; one immediate left, one far left
676 | | | |
679 | | | |
677 | o | | changeset: 5:4409d547b708
680 | o | | changeset: 5:4409d547b708
678 | |\ \ \ parent: 3:27eef8ed80b4
681 | |\ \ \ parent: 3:27eef8ed80b4
679 | | | | | parent: 4:26a8bac39d9f
682 | | | | | parent: 4:26a8bac39d9f
680 | | | | | user: test
683 | | | | | user: test
681 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
684 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
682 | | | | | summary: (5) expand
685 | | | | | summary: (5) expand
683 | | | | |
686 | | | | |
684 | | o | | changeset: 4:26a8bac39d9f
687 | | o | | changeset: 4:26a8bac39d9f
685 | |/|/ / parent: 1:6db2ef61d156
688 | |/|/ / parent: 1:6db2ef61d156
686 | | | | parent: 3:27eef8ed80b4
689 | | | | parent: 3:27eef8ed80b4
687 | | | | user: test
690 | | | | user: test
688 | | | | date: Thu Jan 01 00:00:04 1970 +0000
691 | | | | date: Thu Jan 01 00:00:04 1970 +0000
689 | | | | summary: (4) merge two known; one immediate left, one immediate right
692 | | | | summary: (4) merge two known; one immediate left, one immediate right
690 | | | |
693 | | | |
691 | o | | changeset: 3:27eef8ed80b4
694 | o | | changeset: 3:27eef8ed80b4
692 |/ / / user: test
695 |/ / / user: test
693 | | | date: Thu Jan 01 00:00:03 1970 +0000
696 | | | date: Thu Jan 01 00:00:03 1970 +0000
694 | | | summary: (3) collapse
697 | | | summary: (3) collapse
695 | | |
698 | | |
696 o | | changeset: 2:3d9a33b8d1e1
699 o | | changeset: 2:3d9a33b8d1e1
697 |/ / user: test
700 |/ / user: test
698 | | date: Thu Jan 01 00:00:02 1970 +0000
701 | | date: Thu Jan 01 00:00:02 1970 +0000
699 | | summary: (2) collapse
702 | | summary: (2) collapse
700 | |
703 | |
701 o | changeset: 1:6db2ef61d156
704 o | changeset: 1:6db2ef61d156
702 |/ user: test
705 |/ user: test
703 | date: Thu Jan 01 00:00:01 1970 +0000
706 | date: Thu Jan 01 00:00:01 1970 +0000
704 | summary: (1) collapse
707 | summary: (1) collapse
705 |
708 |
706 o changeset: 0:e6eb3150255d
709 o changeset: 0:e6eb3150255d
707 user: test
710 user: test
708 date: Thu Jan 01 00:00:00 1970 +0000
711 date: Thu Jan 01 00:00:00 1970 +0000
709 summary: (0) root
712 summary: (0) root
710
713
711
714
712 File glog per revset:
715 File glog per revset:
713
716
714 $ hg log -G -r 'file("a")'
717 $ hg log -G -r 'file("a")'
715 @ changeset: 34:fea3ac5810e0
718 @ changeset: 34:fea3ac5810e0
716 | tag: tip
719 | tag: tip
717 | parent: 32:d06dffa21a31
720 | parent: 32:d06dffa21a31
718 | user: test
721 | user: test
719 | date: Thu Jan 01 00:00:34 1970 +0000
722 | date: Thu Jan 01 00:00:34 1970 +0000
720 | summary: (34) head
723 | summary: (34) head
721 |
724 |
722 | o changeset: 33:68608f5145f9
725 | o changeset: 33:68608f5145f9
723 | | parent: 18:1aa84d96232a
726 | | parent: 18:1aa84d96232a
724 | | user: test
727 | | user: test
725 | | date: Thu Jan 01 00:00:33 1970 +0000
728 | | date: Thu Jan 01 00:00:33 1970 +0000
726 | | summary: (33) head
729 | | summary: (33) head
727 | |
730 | |
728 o | changeset: 32:d06dffa21a31
731 o | changeset: 32:d06dffa21a31
729 |\ \ parent: 27:886ed638191b
732 |\ \ parent: 27:886ed638191b
730 | | | parent: 31:621d83e11f67
733 | | | parent: 31:621d83e11f67
731 | | | user: test
734 | | | user: test
732 | | | date: Thu Jan 01 00:00:32 1970 +0000
735 | | | date: Thu Jan 01 00:00:32 1970 +0000
733 | | | summary: (32) expand
736 | | | summary: (32) expand
734 | | |
737 | | |
735 | o | changeset: 31:621d83e11f67
738 | o | changeset: 31:621d83e11f67
736 | |\ \ parent: 21:d42a756af44d
739 | |\ \ parent: 21:d42a756af44d
737 | | | | parent: 30:6e11cd4b648f
740 | | | | parent: 30:6e11cd4b648f
738 | | | | user: test
741 | | | | user: test
739 | | | | date: Thu Jan 01 00:00:31 1970 +0000
742 | | | | date: Thu Jan 01 00:00:31 1970 +0000
740 | | | | summary: (31) expand
743 | | | | summary: (31) expand
741 | | | |
744 | | | |
742 | | o | changeset: 30:6e11cd4b648f
745 | | o | changeset: 30:6e11cd4b648f
743 | | |\ \ parent: 28:44ecd0b9ae99
746 | | |\ \ parent: 28:44ecd0b9ae99
744 | | | | | parent: 29:cd9bb2be7593
747 | | | | | parent: 29:cd9bb2be7593
745 | | | | | user: test
748 | | | | | user: test
746 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
749 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
747 | | | | | summary: (30) expand
750 | | | | | summary: (30) expand
748 | | | | |
751 | | | | |
749 | | | o | changeset: 29:cd9bb2be7593
752 | | | o | changeset: 29:cd9bb2be7593
750 | | | | | parent: 0:e6eb3150255d
753 | | | | | parent: 0:e6eb3150255d
751 | | | | | user: test
754 | | | | | user: test
752 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
755 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
753 | | | | | summary: (29) regular commit
756 | | | | | summary: (29) regular commit
754 | | | | |
757 | | | | |
755 | | o | | changeset: 28:44ecd0b9ae99
758 | | o | | changeset: 28:44ecd0b9ae99
756 | | |\ \ \ parent: 1:6db2ef61d156
759 | | |\ \ \ parent: 1:6db2ef61d156
757 | | | | | | parent: 26:7f25b6c2f0b9
760 | | | | | | parent: 26:7f25b6c2f0b9
758 | | | | | | user: test
761 | | | | | | user: test
759 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
762 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
760 | | | | | | summary: (28) merge zero known
763 | | | | | | summary: (28) merge zero known
761 | | | | | |
764 | | | | | |
762 o | | | | | changeset: 27:886ed638191b
765 o | | | | | changeset: 27:886ed638191b
763 |/ / / / / parent: 21:d42a756af44d
766 |/ / / / / parent: 21:d42a756af44d
764 | | | | | user: test
767 | | | | | user: test
765 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
768 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
766 | | | | | summary: (27) collapse
769 | | | | | summary: (27) collapse
767 | | | | |
770 | | | | |
768 | | o---+ changeset: 26:7f25b6c2f0b9
771 | | o---+ changeset: 26:7f25b6c2f0b9
769 | | | | | parent: 18:1aa84d96232a
772 | | | | | parent: 18:1aa84d96232a
770 | | | | | parent: 25:91da8ed57247
773 | | | | | parent: 25:91da8ed57247
771 | | | | | user: test
774 | | | | | user: test
772 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
775 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
773 | | | | | summary: (26) merge one known; far right
776 | | | | | summary: (26) merge one known; far right
774 | | | | |
777 | | | | |
775 +---o | | changeset: 25:91da8ed57247
778 +---o | | changeset: 25:91da8ed57247
776 | | | | | parent: 21:d42a756af44d
779 | | | | | parent: 21:d42a756af44d
777 | | | | | parent: 24:a9c19a3d96b7
780 | | | | | parent: 24:a9c19a3d96b7
778 | | | | | user: test
781 | | | | | user: test
779 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
782 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
780 | | | | | summary: (25) merge one known; far left
783 | | | | | summary: (25) merge one known; far left
781 | | | | |
784 | | | | |
782 | | o | | changeset: 24:a9c19a3d96b7
785 | | o | | changeset: 24:a9c19a3d96b7
783 | | |\| | parent: 0:e6eb3150255d
786 | | |\| | parent: 0:e6eb3150255d
784 | | | | | parent: 23:a01cddf0766d
787 | | | | | parent: 23:a01cddf0766d
785 | | | | | user: test
788 | | | | | user: test
786 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
789 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
787 | | | | | summary: (24) merge one known; immediate right
790 | | | | | summary: (24) merge one known; immediate right
788 | | | | |
791 | | | | |
789 | | o | | changeset: 23:a01cddf0766d
792 | | o | | changeset: 23:a01cddf0766d
790 | |/| | | parent: 1:6db2ef61d156
793 | |/| | | parent: 1:6db2ef61d156
791 | | | | | parent: 22:e0d9cccacb5d
794 | | | | | parent: 22:e0d9cccacb5d
792 | | | | | user: test
795 | | | | | user: test
793 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
796 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
794 | | | | | summary: (23) merge one known; immediate left
797 | | | | | summary: (23) merge one known; immediate left
795 | | | | |
798 | | | | |
796 +---o---+ changeset: 22:e0d9cccacb5d
799 +---o---+ changeset: 22:e0d9cccacb5d
797 | | | | parent: 18:1aa84d96232a
800 | | | | parent: 18:1aa84d96232a
798 | | / / parent: 21:d42a756af44d
801 | | / / parent: 21:d42a756af44d
799 | | | | user: test
802 | | | | user: test
800 | | | | date: Thu Jan 01 00:00:22 1970 +0000
803 | | | | date: Thu Jan 01 00:00:22 1970 +0000
801 | | | | summary: (22) merge two known; one far left, one far right
804 | | | | summary: (22) merge two known; one far left, one far right
802 | | | |
805 | | | |
803 o | | | changeset: 21:d42a756af44d
806 o | | | changeset: 21:d42a756af44d
804 |\ \ \ \ parent: 19:31ddc2c1573b
807 |\ \ \ \ parent: 19:31ddc2c1573b
805 | | | | | parent: 20:d30ed6450e32
808 | | | | | parent: 20:d30ed6450e32
806 | | | | | user: test
809 | | | | | user: test
807 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
810 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
808 | | | | | summary: (21) expand
811 | | | | | summary: (21) expand
809 | | | | |
812 | | | | |
810 | o---+-+ changeset: 20:d30ed6450e32
813 | o---+-+ changeset: 20:d30ed6450e32
811 | | | | parent: 0:e6eb3150255d
814 | | | | parent: 0:e6eb3150255d
812 | / / / parent: 18:1aa84d96232a
815 | / / / parent: 18:1aa84d96232a
813 | | | | user: test
816 | | | | user: test
814 | | | | date: Thu Jan 01 00:00:20 1970 +0000
817 | | | | date: Thu Jan 01 00:00:20 1970 +0000
815 | | | | summary: (20) merge two known; two far right
818 | | | | summary: (20) merge two known; two far right
816 | | | |
819 | | | |
817 o | | | changeset: 19:31ddc2c1573b
820 o | | | changeset: 19:31ddc2c1573b
818 |\ \ \ \ parent: 15:1dda3f72782d
821 |\ \ \ \ parent: 15:1dda3f72782d
819 | | | | | parent: 17:44765d7c06e0
822 | | | | | parent: 17:44765d7c06e0
820 | | | | | user: test
823 | | | | | user: test
821 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
824 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
822 | | | | | summary: (19) expand
825 | | | | | summary: (19) expand
823 | | | | |
826 | | | | |
824 +---+---o changeset: 18:1aa84d96232a
827 +---+---o changeset: 18:1aa84d96232a
825 | | | | parent: 1:6db2ef61d156
828 | | | | parent: 1:6db2ef61d156
826 | | | | parent: 15:1dda3f72782d
829 | | | | parent: 15:1dda3f72782d
827 | | | | user: test
830 | | | | user: test
828 | | | | date: Thu Jan 01 00:00:18 1970 +0000
831 | | | | date: Thu Jan 01 00:00:18 1970 +0000
829 | | | | summary: (18) merge two known; two far left
832 | | | | summary: (18) merge two known; two far left
830 | | | |
833 | | | |
831 | o | | changeset: 17:44765d7c06e0
834 | o | | changeset: 17:44765d7c06e0
832 | |\ \ \ parent: 12:86b91144a6e9
835 | |\ \ \ parent: 12:86b91144a6e9
833 | | | | | parent: 16:3677d192927d
836 | | | | | parent: 16:3677d192927d
834 | | | | | user: test
837 | | | | | user: test
835 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
838 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
836 | | | | | summary: (17) expand
839 | | | | | summary: (17) expand
837 | | | | |
840 | | | | |
838 | | o---+ changeset: 16:3677d192927d
841 | | o---+ changeset: 16:3677d192927d
839 | | | | | parent: 0:e6eb3150255d
842 | | | | | parent: 0:e6eb3150255d
840 | | |/ / parent: 1:6db2ef61d156
843 | | |/ / parent: 1:6db2ef61d156
841 | | | | user: test
844 | | | | user: test
842 | | | | date: Thu Jan 01 00:00:16 1970 +0000
845 | | | | date: Thu Jan 01 00:00:16 1970 +0000
843 | | | | summary: (16) merge two known; one immediate right, one near right
846 | | | | summary: (16) merge two known; one immediate right, one near right
844 | | | |
847 | | | |
845 o | | | changeset: 15:1dda3f72782d
848 o | | | changeset: 15:1dda3f72782d
846 |\ \ \ \ parent: 13:22d8966a97e3
849 |\ \ \ \ parent: 13:22d8966a97e3
847 | | | | | parent: 14:8eac370358ef
850 | | | | | parent: 14:8eac370358ef
848 | | | | | user: test
851 | | | | | user: test
849 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
852 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
850 | | | | | summary: (15) expand
853 | | | | | summary: (15) expand
851 | | | | |
854 | | | | |
852 | o-----+ changeset: 14:8eac370358ef
855 | o-----+ changeset: 14:8eac370358ef
853 | | | | | parent: 0:e6eb3150255d
856 | | | | | parent: 0:e6eb3150255d
854 | |/ / / parent: 12:86b91144a6e9
857 | |/ / / parent: 12:86b91144a6e9
855 | | | | user: test
858 | | | | user: test
856 | | | | date: Thu Jan 01 00:00:14 1970 +0000
859 | | | | date: Thu Jan 01 00:00:14 1970 +0000
857 | | | | summary: (14) merge two known; one immediate right, one far right
860 | | | | summary: (14) merge two known; one immediate right, one far right
858 | | | |
861 | | | |
859 o | | | changeset: 13:22d8966a97e3
862 o | | | changeset: 13:22d8966a97e3
860 |\ \ \ \ parent: 9:7010c0af0a35
863 |\ \ \ \ parent: 9:7010c0af0a35
861 | | | | | parent: 11:832d76e6bdf2
864 | | | | | parent: 11:832d76e6bdf2
862 | | | | | user: test
865 | | | | | user: test
863 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
866 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
864 | | | | | summary: (13) expand
867 | | | | | summary: (13) expand
865 | | | | |
868 | | | | |
866 +---o | | changeset: 12:86b91144a6e9
869 +---o | | changeset: 12:86b91144a6e9
867 | | |/ / parent: 1:6db2ef61d156
870 | | |/ / parent: 1:6db2ef61d156
868 | | | | parent: 9:7010c0af0a35
871 | | | | parent: 9:7010c0af0a35
869 | | | | user: test
872 | | | | user: test
870 | | | | date: Thu Jan 01 00:00:12 1970 +0000
873 | | | | date: Thu Jan 01 00:00:12 1970 +0000
871 | | | | summary: (12) merge two known; one immediate right, one far left
874 | | | | summary: (12) merge two known; one immediate right, one far left
872 | | | |
875 | | | |
873 | o | | changeset: 11:832d76e6bdf2
876 | o | | changeset: 11:832d76e6bdf2
874 | |\ \ \ parent: 6:b105a072e251
877 | |\ \ \ parent: 6:b105a072e251
875 | | | | | parent: 10:74c64d036d72
878 | | | | | parent: 10:74c64d036d72
876 | | | | | user: test
879 | | | | | user: test
877 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
880 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
878 | | | | | summary: (11) expand
881 | | | | | summary: (11) expand
879 | | | | |
882 | | | | |
880 | | o---+ changeset: 10:74c64d036d72
883 | | o---+ changeset: 10:74c64d036d72
881 | | | | | parent: 0:e6eb3150255d
884 | | | | | parent: 0:e6eb3150255d
882 | |/ / / parent: 6:b105a072e251
885 | |/ / / parent: 6:b105a072e251
883 | | | | user: test
886 | | | | user: test
884 | | | | date: Thu Jan 01 00:00:10 1970 +0000
887 | | | | date: Thu Jan 01 00:00:10 1970 +0000
885 | | | | summary: (10) merge two known; one immediate left, one near right
888 | | | | summary: (10) merge two known; one immediate left, one near right
886 | | | |
889 | | | |
887 o | | | changeset: 9:7010c0af0a35
890 o | | | changeset: 9:7010c0af0a35
888 |\ \ \ \ parent: 7:b632bb1b1224
891 |\ \ \ \ parent: 7:b632bb1b1224
889 | | | | | parent: 8:7a0b11f71937
892 | | | | | parent: 8:7a0b11f71937
890 | | | | | user: test
893 | | | | | user: test
891 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
894 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
892 | | | | | summary: (9) expand
895 | | | | | summary: (9) expand
893 | | | | |
896 | | | | |
894 | o-----+ changeset: 8:7a0b11f71937
897 | o-----+ changeset: 8:7a0b11f71937
895 | | | | | parent: 0:e6eb3150255d
898 | | | | | parent: 0:e6eb3150255d
896 |/ / / / parent: 7:b632bb1b1224
899 |/ / / / parent: 7:b632bb1b1224
897 | | | | user: test
900 | | | | user: test
898 | | | | date: Thu Jan 01 00:00:08 1970 +0000
901 | | | | date: Thu Jan 01 00:00:08 1970 +0000
899 | | | | summary: (8) merge two known; one immediate left, one far right
902 | | | | summary: (8) merge two known; one immediate left, one far right
900 | | | |
903 | | | |
901 o | | | changeset: 7:b632bb1b1224
904 o | | | changeset: 7:b632bb1b1224
902 |\ \ \ \ parent: 2:3d9a33b8d1e1
905 |\ \ \ \ parent: 2:3d9a33b8d1e1
903 | | | | | parent: 5:4409d547b708
906 | | | | | parent: 5:4409d547b708
904 | | | | | user: test
907 | | | | | user: test
905 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
908 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
906 | | | | | summary: (7) expand
909 | | | | | summary: (7) expand
907 | | | | |
910 | | | | |
908 +---o | | changeset: 6:b105a072e251
911 +---o | | changeset: 6:b105a072e251
909 | |/ / / parent: 2:3d9a33b8d1e1
912 | |/ / / parent: 2:3d9a33b8d1e1
910 | | | | parent: 5:4409d547b708
913 | | | | parent: 5:4409d547b708
911 | | | | user: test
914 | | | | user: test
912 | | | | date: Thu Jan 01 00:00:06 1970 +0000
915 | | | | date: Thu Jan 01 00:00:06 1970 +0000
913 | | | | summary: (6) merge two known; one immediate left, one far left
916 | | | | summary: (6) merge two known; one immediate left, one far left
914 | | | |
917 | | | |
915 | o | | changeset: 5:4409d547b708
918 | o | | changeset: 5:4409d547b708
916 | |\ \ \ parent: 3:27eef8ed80b4
919 | |\ \ \ parent: 3:27eef8ed80b4
917 | | | | | parent: 4:26a8bac39d9f
920 | | | | | parent: 4:26a8bac39d9f
918 | | | | | user: test
921 | | | | | user: test
919 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
922 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
920 | | | | | summary: (5) expand
923 | | | | | summary: (5) expand
921 | | | | |
924 | | | | |
922 | | o | | changeset: 4:26a8bac39d9f
925 | | o | | changeset: 4:26a8bac39d9f
923 | |/|/ / parent: 1:6db2ef61d156
926 | |/|/ / parent: 1:6db2ef61d156
924 | | | | parent: 3:27eef8ed80b4
927 | | | | parent: 3:27eef8ed80b4
925 | | | | user: test
928 | | | | user: test
926 | | | | date: Thu Jan 01 00:00:04 1970 +0000
929 | | | | date: Thu Jan 01 00:00:04 1970 +0000
927 | | | | summary: (4) merge two known; one immediate left, one immediate right
930 | | | | summary: (4) merge two known; one immediate left, one immediate right
928 | | | |
931 | | | |
929 | o | | changeset: 3:27eef8ed80b4
932 | o | | changeset: 3:27eef8ed80b4
930 |/ / / user: test
933 |/ / / user: test
931 | | | date: Thu Jan 01 00:00:03 1970 +0000
934 | | | date: Thu Jan 01 00:00:03 1970 +0000
932 | | | summary: (3) collapse
935 | | | summary: (3) collapse
933 | | |
936 | | |
934 o | | changeset: 2:3d9a33b8d1e1
937 o | | changeset: 2:3d9a33b8d1e1
935 |/ / user: test
938 |/ / user: test
936 | | date: Thu Jan 01 00:00:02 1970 +0000
939 | | date: Thu Jan 01 00:00:02 1970 +0000
937 | | summary: (2) collapse
940 | | summary: (2) collapse
938 | |
941 | |
939 o | changeset: 1:6db2ef61d156
942 o | changeset: 1:6db2ef61d156
940 |/ user: test
943 |/ user: test
941 | date: Thu Jan 01 00:00:01 1970 +0000
944 | date: Thu Jan 01 00:00:01 1970 +0000
942 | summary: (1) collapse
945 | summary: (1) collapse
943 |
946 |
944 o changeset: 0:e6eb3150255d
947 o changeset: 0:e6eb3150255d
945 user: test
948 user: test
946 date: Thu Jan 01 00:00:00 1970 +0000
949 date: Thu Jan 01 00:00:00 1970 +0000
947 summary: (0) root
950 summary: (0) root
948
951
949
952
950
953
951 File glog per revset (only merges):
954 File glog per revset (only merges):
952
955
953 $ hg log -G -r 'file("a")' -m
956 $ hg log -G -r 'file("a")' -m
954 o changeset: 32:d06dffa21a31
957 o changeset: 32:d06dffa21a31
955 |\ parent: 27:886ed638191b
958 |\ parent: 27:886ed638191b
956 | : parent: 31:621d83e11f67
959 | : parent: 31:621d83e11f67
957 | : user: test
960 | : user: test
958 | : date: Thu Jan 01 00:00:32 1970 +0000
961 | : date: Thu Jan 01 00:00:32 1970 +0000
959 | : summary: (32) expand
962 | : summary: (32) expand
960 | :
963 | :
961 o : changeset: 31:621d83e11f67
964 o : changeset: 31:621d83e11f67
962 |\: parent: 21:d42a756af44d
965 |\: parent: 21:d42a756af44d
963 | : parent: 30:6e11cd4b648f
966 | : parent: 30:6e11cd4b648f
964 | : user: test
967 | : user: test
965 | : date: Thu Jan 01 00:00:31 1970 +0000
968 | : date: Thu Jan 01 00:00:31 1970 +0000
966 | : summary: (31) expand
969 | : summary: (31) expand
967 | :
970 | :
968 o : changeset: 30:6e11cd4b648f
971 o : changeset: 30:6e11cd4b648f
969 |\ \ parent: 28:44ecd0b9ae99
972 |\ \ parent: 28:44ecd0b9ae99
970 | ~ : parent: 29:cd9bb2be7593
973 | ~ : parent: 29:cd9bb2be7593
971 | : user: test
974 | : user: test
972 | : date: Thu Jan 01 00:00:30 1970 +0000
975 | : date: Thu Jan 01 00:00:30 1970 +0000
973 | : summary: (30) expand
976 | : summary: (30) expand
974 | /
977 | /
975 o : changeset: 28:44ecd0b9ae99
978 o : changeset: 28:44ecd0b9ae99
976 |\ \ parent: 1:6db2ef61d156
979 |\ \ parent: 1:6db2ef61d156
977 | ~ : parent: 26:7f25b6c2f0b9
980 | ~ : parent: 26:7f25b6c2f0b9
978 | : user: test
981 | : user: test
979 | : date: Thu Jan 01 00:00:28 1970 +0000
982 | : date: Thu Jan 01 00:00:28 1970 +0000
980 | : summary: (28) merge zero known
983 | : summary: (28) merge zero known
981 | /
984 | /
982 o : changeset: 26:7f25b6c2f0b9
985 o : changeset: 26:7f25b6c2f0b9
983 |\ \ parent: 18:1aa84d96232a
986 |\ \ parent: 18:1aa84d96232a
984 | | : parent: 25:91da8ed57247
987 | | : parent: 25:91da8ed57247
985 | | : user: test
988 | | : user: test
986 | | : date: Thu Jan 01 00:00:26 1970 +0000
989 | | : date: Thu Jan 01 00:00:26 1970 +0000
987 | | : summary: (26) merge one known; far right
990 | | : summary: (26) merge one known; far right
988 | | :
991 | | :
989 | o : changeset: 25:91da8ed57247
992 | o : changeset: 25:91da8ed57247
990 | |\: parent: 21:d42a756af44d
993 | |\: parent: 21:d42a756af44d
991 | | : parent: 24:a9c19a3d96b7
994 | | : parent: 24:a9c19a3d96b7
992 | | : user: test
995 | | : user: test
993 | | : date: Thu Jan 01 00:00:25 1970 +0000
996 | | : date: Thu Jan 01 00:00:25 1970 +0000
994 | | : summary: (25) merge one known; far left
997 | | : summary: (25) merge one known; far left
995 | | :
998 | | :
996 | o : changeset: 24:a9c19a3d96b7
999 | o : changeset: 24:a9c19a3d96b7
997 | |\ \ parent: 0:e6eb3150255d
1000 | |\ \ parent: 0:e6eb3150255d
998 | | ~ : parent: 23:a01cddf0766d
1001 | | ~ : parent: 23:a01cddf0766d
999 | | : user: test
1002 | | : user: test
1000 | | : date: Thu Jan 01 00:00:24 1970 +0000
1003 | | : date: Thu Jan 01 00:00:24 1970 +0000
1001 | | : summary: (24) merge one known; immediate right
1004 | | : summary: (24) merge one known; immediate right
1002 | | /
1005 | | /
1003 | o : changeset: 23:a01cddf0766d
1006 | o : changeset: 23:a01cddf0766d
1004 | |\ \ parent: 1:6db2ef61d156
1007 | |\ \ parent: 1:6db2ef61d156
1005 | | ~ : parent: 22:e0d9cccacb5d
1008 | | ~ : parent: 22:e0d9cccacb5d
1006 | | : user: test
1009 | | : user: test
1007 | | : date: Thu Jan 01 00:00:23 1970 +0000
1010 | | : date: Thu Jan 01 00:00:23 1970 +0000
1008 | | : summary: (23) merge one known; immediate left
1011 | | : summary: (23) merge one known; immediate left
1009 | | /
1012 | | /
1010 | o : changeset: 22:e0d9cccacb5d
1013 | o : changeset: 22:e0d9cccacb5d
1011 |/:/ parent: 18:1aa84d96232a
1014 |/:/ parent: 18:1aa84d96232a
1012 | : parent: 21:d42a756af44d
1015 | : parent: 21:d42a756af44d
1013 | : user: test
1016 | : user: test
1014 | : date: Thu Jan 01 00:00:22 1970 +0000
1017 | : date: Thu Jan 01 00:00:22 1970 +0000
1015 | : summary: (22) merge two known; one far left, one far right
1018 | : summary: (22) merge two known; one far left, one far right
1016 | :
1019 | :
1017 | o changeset: 21:d42a756af44d
1020 | o changeset: 21:d42a756af44d
1018 | |\ parent: 19:31ddc2c1573b
1021 | |\ parent: 19:31ddc2c1573b
1019 | | | parent: 20:d30ed6450e32
1022 | | | parent: 20:d30ed6450e32
1020 | | | user: test
1023 | | | user: test
1021 | | | date: Thu Jan 01 00:00:21 1970 +0000
1024 | | | date: Thu Jan 01 00:00:21 1970 +0000
1022 | | | summary: (21) expand
1025 | | | summary: (21) expand
1023 | | |
1026 | | |
1024 +---o changeset: 20:d30ed6450e32
1027 +---o changeset: 20:d30ed6450e32
1025 | | | parent: 0:e6eb3150255d
1028 | | | parent: 0:e6eb3150255d
1026 | | ~ parent: 18:1aa84d96232a
1029 | | ~ parent: 18:1aa84d96232a
1027 | | user: test
1030 | | user: test
1028 | | date: Thu Jan 01 00:00:20 1970 +0000
1031 | | date: Thu Jan 01 00:00:20 1970 +0000
1029 | | summary: (20) merge two known; two far right
1032 | | summary: (20) merge two known; two far right
1030 | |
1033 | |
1031 | o changeset: 19:31ddc2c1573b
1034 | o changeset: 19:31ddc2c1573b
1032 | |\ parent: 15:1dda3f72782d
1035 | |\ parent: 15:1dda3f72782d
1033 | | | parent: 17:44765d7c06e0
1036 | | | parent: 17:44765d7c06e0
1034 | | | user: test
1037 | | | user: test
1035 | | | date: Thu Jan 01 00:00:19 1970 +0000
1038 | | | date: Thu Jan 01 00:00:19 1970 +0000
1036 | | | summary: (19) expand
1039 | | | summary: (19) expand
1037 | | |
1040 | | |
1038 o | | changeset: 18:1aa84d96232a
1041 o | | changeset: 18:1aa84d96232a
1039 |\| | parent: 1:6db2ef61d156
1042 |\| | parent: 1:6db2ef61d156
1040 ~ | | parent: 15:1dda3f72782d
1043 ~ | | parent: 15:1dda3f72782d
1041 | | user: test
1044 | | user: test
1042 | | date: Thu Jan 01 00:00:18 1970 +0000
1045 | | date: Thu Jan 01 00:00:18 1970 +0000
1043 | | summary: (18) merge two known; two far left
1046 | | summary: (18) merge two known; two far left
1044 / /
1047 / /
1045 | o changeset: 17:44765d7c06e0
1048 | o changeset: 17:44765d7c06e0
1046 | |\ parent: 12:86b91144a6e9
1049 | |\ parent: 12:86b91144a6e9
1047 | | | parent: 16:3677d192927d
1050 | | | parent: 16:3677d192927d
1048 | | | user: test
1051 | | | user: test
1049 | | | date: Thu Jan 01 00:00:17 1970 +0000
1052 | | | date: Thu Jan 01 00:00:17 1970 +0000
1050 | | | summary: (17) expand
1053 | | | summary: (17) expand
1051 | | |
1054 | | |
1052 | | o changeset: 16:3677d192927d
1055 | | o changeset: 16:3677d192927d
1053 | | |\ parent: 0:e6eb3150255d
1056 | | |\ parent: 0:e6eb3150255d
1054 | | ~ ~ parent: 1:6db2ef61d156
1057 | | ~ ~ parent: 1:6db2ef61d156
1055 | | user: test
1058 | | user: test
1056 | | date: Thu Jan 01 00:00:16 1970 +0000
1059 | | date: Thu Jan 01 00:00:16 1970 +0000
1057 | | summary: (16) merge two known; one immediate right, one near right
1060 | | summary: (16) merge two known; one immediate right, one near right
1058 | |
1061 | |
1059 o | changeset: 15:1dda3f72782d
1062 o | changeset: 15:1dda3f72782d
1060 |\ \ parent: 13:22d8966a97e3
1063 |\ \ parent: 13:22d8966a97e3
1061 | | | parent: 14:8eac370358ef
1064 | | | parent: 14:8eac370358ef
1062 | | | user: test
1065 | | | user: test
1063 | | | date: Thu Jan 01 00:00:15 1970 +0000
1066 | | | date: Thu Jan 01 00:00:15 1970 +0000
1064 | | | summary: (15) expand
1067 | | | summary: (15) expand
1065 | | |
1068 | | |
1066 | o | changeset: 14:8eac370358ef
1069 | o | changeset: 14:8eac370358ef
1067 | |\| parent: 0:e6eb3150255d
1070 | |\| parent: 0:e6eb3150255d
1068 | ~ | parent: 12:86b91144a6e9
1071 | ~ | parent: 12:86b91144a6e9
1069 | | user: test
1072 | | user: test
1070 | | date: Thu Jan 01 00:00:14 1970 +0000
1073 | | date: Thu Jan 01 00:00:14 1970 +0000
1071 | | summary: (14) merge two known; one immediate right, one far right
1074 | | summary: (14) merge two known; one immediate right, one far right
1072 | /
1075 | /
1073 o | changeset: 13:22d8966a97e3
1076 o | changeset: 13:22d8966a97e3
1074 |\ \ parent: 9:7010c0af0a35
1077 |\ \ parent: 9:7010c0af0a35
1075 | | | parent: 11:832d76e6bdf2
1078 | | | parent: 11:832d76e6bdf2
1076 | | | user: test
1079 | | | user: test
1077 | | | date: Thu Jan 01 00:00:13 1970 +0000
1080 | | | date: Thu Jan 01 00:00:13 1970 +0000
1078 | | | summary: (13) expand
1081 | | | summary: (13) expand
1079 | | |
1082 | | |
1080 +---o changeset: 12:86b91144a6e9
1083 +---o changeset: 12:86b91144a6e9
1081 | | | parent: 1:6db2ef61d156
1084 | | | parent: 1:6db2ef61d156
1082 | | ~ parent: 9:7010c0af0a35
1085 | | ~ parent: 9:7010c0af0a35
1083 | | user: test
1086 | | user: test
1084 | | date: Thu Jan 01 00:00:12 1970 +0000
1087 | | date: Thu Jan 01 00:00:12 1970 +0000
1085 | | summary: (12) merge two known; one immediate right, one far left
1088 | | summary: (12) merge two known; one immediate right, one far left
1086 | |
1089 | |
1087 | o changeset: 11:832d76e6bdf2
1090 | o changeset: 11:832d76e6bdf2
1088 | |\ parent: 6:b105a072e251
1091 | |\ parent: 6:b105a072e251
1089 | | | parent: 10:74c64d036d72
1092 | | | parent: 10:74c64d036d72
1090 | | | user: test
1093 | | | user: test
1091 | | | date: Thu Jan 01 00:00:11 1970 +0000
1094 | | | date: Thu Jan 01 00:00:11 1970 +0000
1092 | | | summary: (11) expand
1095 | | | summary: (11) expand
1093 | | |
1096 | | |
1094 | | o changeset: 10:74c64d036d72
1097 | | o changeset: 10:74c64d036d72
1095 | |/| parent: 0:e6eb3150255d
1098 | |/| parent: 0:e6eb3150255d
1096 | | ~ parent: 6:b105a072e251
1099 | | ~ parent: 6:b105a072e251
1097 | | user: test
1100 | | user: test
1098 | | date: Thu Jan 01 00:00:10 1970 +0000
1101 | | date: Thu Jan 01 00:00:10 1970 +0000
1099 | | summary: (10) merge two known; one immediate left, one near right
1102 | | summary: (10) merge two known; one immediate left, one near right
1100 | |
1103 | |
1101 o | changeset: 9:7010c0af0a35
1104 o | changeset: 9:7010c0af0a35
1102 |\ \ parent: 7:b632bb1b1224
1105 |\ \ parent: 7:b632bb1b1224
1103 | | | parent: 8:7a0b11f71937
1106 | | | parent: 8:7a0b11f71937
1104 | | | user: test
1107 | | | user: test
1105 | | | date: Thu Jan 01 00:00:09 1970 +0000
1108 | | | date: Thu Jan 01 00:00:09 1970 +0000
1106 | | | summary: (9) expand
1109 | | | summary: (9) expand
1107 | | |
1110 | | |
1108 | o | changeset: 8:7a0b11f71937
1111 | o | changeset: 8:7a0b11f71937
1109 |/| | parent: 0:e6eb3150255d
1112 |/| | parent: 0:e6eb3150255d
1110 | ~ | parent: 7:b632bb1b1224
1113 | ~ | parent: 7:b632bb1b1224
1111 | | user: test
1114 | | user: test
1112 | | date: Thu Jan 01 00:00:08 1970 +0000
1115 | | date: Thu Jan 01 00:00:08 1970 +0000
1113 | | summary: (8) merge two known; one immediate left, one far right
1116 | | summary: (8) merge two known; one immediate left, one far right
1114 | /
1117 | /
1115 o | changeset: 7:b632bb1b1224
1118 o | changeset: 7:b632bb1b1224
1116 |\ \ parent: 2:3d9a33b8d1e1
1119 |\ \ parent: 2:3d9a33b8d1e1
1117 | ~ | parent: 5:4409d547b708
1120 | ~ | parent: 5:4409d547b708
1118 | | user: test
1121 | | user: test
1119 | | date: Thu Jan 01 00:00:07 1970 +0000
1122 | | date: Thu Jan 01 00:00:07 1970 +0000
1120 | | summary: (7) expand
1123 | | summary: (7) expand
1121 | /
1124 | /
1122 | o changeset: 6:b105a072e251
1125 | o changeset: 6:b105a072e251
1123 |/| parent: 2:3d9a33b8d1e1
1126 |/| parent: 2:3d9a33b8d1e1
1124 | ~ parent: 5:4409d547b708
1127 | ~ parent: 5:4409d547b708
1125 | user: test
1128 | user: test
1126 | date: Thu Jan 01 00:00:06 1970 +0000
1129 | date: Thu Jan 01 00:00:06 1970 +0000
1127 | summary: (6) merge two known; one immediate left, one far left
1130 | summary: (6) merge two known; one immediate left, one far left
1128 |
1131 |
1129 o changeset: 5:4409d547b708
1132 o changeset: 5:4409d547b708
1130 |\ parent: 3:27eef8ed80b4
1133 |\ parent: 3:27eef8ed80b4
1131 | ~ parent: 4:26a8bac39d9f
1134 | ~ parent: 4:26a8bac39d9f
1132 | user: test
1135 | user: test
1133 | date: Thu Jan 01 00:00:05 1970 +0000
1136 | date: Thu Jan 01 00:00:05 1970 +0000
1134 | summary: (5) expand
1137 | summary: (5) expand
1135 |
1138 |
1136 o changeset: 4:26a8bac39d9f
1139 o changeset: 4:26a8bac39d9f
1137 |\ parent: 1:6db2ef61d156
1140 |\ parent: 1:6db2ef61d156
1138 ~ ~ parent: 3:27eef8ed80b4
1141 ~ ~ parent: 3:27eef8ed80b4
1139 user: test
1142 user: test
1140 date: Thu Jan 01 00:00:04 1970 +0000
1143 date: Thu Jan 01 00:00:04 1970 +0000
1141 summary: (4) merge two known; one immediate left, one immediate right
1144 summary: (4) merge two known; one immediate left, one immediate right
1142
1145
1143
1146
1144
1147
1145 Empty revision range - display nothing:
1148 Empty revision range - display nothing:
1146 $ hg log -G -r 1..0
1149 $ hg log -G -r 1..0
1147
1150
1148 $ cd ..
1151 $ cd ..
1149
1152
1150 #if no-outer-repo
1153 #if no-outer-repo
1151
1154
1152 From outer space:
1155 From outer space:
1153 $ hg log -G -l1 repo
1156 $ hg log -G -l1 repo
1154 @ changeset: 34:fea3ac5810e0
1157 @ changeset: 34:fea3ac5810e0
1155 | tag: tip
1158 | tag: tip
1156 ~ parent: 32:d06dffa21a31
1159 ~ parent: 32:d06dffa21a31
1157 user: test
1160 user: test
1158 date: Thu Jan 01 00:00:34 1970 +0000
1161 date: Thu Jan 01 00:00:34 1970 +0000
1159 summary: (34) head
1162 summary: (34) head
1160
1163
1161 $ hg log -G -l1 repo/a
1164 $ hg log -G -l1 repo/a
1162 @ changeset: 34:fea3ac5810e0
1165 @ changeset: 34:fea3ac5810e0
1163 | tag: tip
1166 | tag: tip
1164 ~ parent: 32:d06dffa21a31
1167 ~ parent: 32:d06dffa21a31
1165 user: test
1168 user: test
1166 date: Thu Jan 01 00:00:34 1970 +0000
1169 date: Thu Jan 01 00:00:34 1970 +0000
1167 summary: (34) head
1170 summary: (34) head
1168
1171
1169 $ hg log -G -l1 repo/missing
1172 $ hg log -G -l1 repo/missing
1170
1173
1171 #endif
1174 #endif
1172
1175
1173 File log with revs != cset revs:
1176 File log with revs != cset revs:
1174 $ hg init flog
1177 $ hg init flog
1175 $ cd flog
1178 $ cd flog
1176 $ echo one >one
1179 $ echo one >one
1177 $ hg add one
1180 $ hg add one
1178 $ hg commit -mone
1181 $ hg commit -mone
1179 $ echo two >two
1182 $ echo two >two
1180 $ hg add two
1183 $ hg add two
1181 $ hg commit -mtwo
1184 $ hg commit -mtwo
1182 $ echo more >two
1185 $ echo more >two
1183 $ hg commit -mmore
1186 $ hg commit -mmore
1184 $ hg log -G two
1187 $ hg log -G two
1185 @ changeset: 2:12c28321755b
1188 @ changeset: 2:12c28321755b
1186 | tag: tip
1189 | tag: tip
1187 | user: test
1190 | user: test
1188 | date: Thu Jan 01 00:00:00 1970 +0000
1191 | date: Thu Jan 01 00:00:00 1970 +0000
1189 | summary: more
1192 | summary: more
1190 |
1193 |
1191 o changeset: 1:5ac72c0599bf
1194 o changeset: 1:5ac72c0599bf
1192 | user: test
1195 | user: test
1193 ~ date: Thu Jan 01 00:00:00 1970 +0000
1196 ~ date: Thu Jan 01 00:00:00 1970 +0000
1194 summary: two
1197 summary: two
1195
1198
1196
1199
1197 Issue1896: File log with explicit style
1200 Issue1896: File log with explicit style
1198 $ hg log -G --style=default one
1201 $ hg log -G --style=default one
1199 o changeset: 0:3d578b4a1f53
1202 o changeset: 0:3d578b4a1f53
1200 user: test
1203 user: test
1201 date: Thu Jan 01 00:00:00 1970 +0000
1204 date: Thu Jan 01 00:00:00 1970 +0000
1202 summary: one
1205 summary: one
1203
1206
1204 Issue2395: glog --style header and footer
1207 Issue2395: glog --style header and footer
1205 $ hg log -G --style=xml one
1208 $ hg log -G --style=xml one
1206 <?xml version="1.0"?>
1209 <?xml version="1.0"?>
1207 <log>
1210 <log>
1208 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1211 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
1209 <author email="test">test</author>
1212 <author email="test">test</author>
1210 <date>1970-01-01T00:00:00+00:00</date>
1213 <date>1970-01-01T00:00:00+00:00</date>
1211 <msg xml:space="preserve">one</msg>
1214 <msg xml:space="preserve">one</msg>
1212 </logentry>
1215 </logentry>
1213 </log>
1216 </log>
1214
1217
1215 $ cd ..
1218 $ cd ..
1216
1219
1217 Incoming and outgoing:
1220 Incoming and outgoing:
1218
1221
1219 $ hg clone -U -r31 repo repo2
1222 $ hg clone -U -r31 repo repo2
1220 adding changesets
1223 adding changesets
1221 adding manifests
1224 adding manifests
1222 adding file changes
1225 adding file changes
1223 added 31 changesets with 31 changes to 1 files
1226 added 31 changesets with 31 changes to 1 files
1224 new changesets e6eb3150255d:621d83e11f67
1227 new changesets e6eb3150255d:621d83e11f67
1225 $ cd repo2
1228 $ cd repo2
1226
1229
1227 $ hg incoming --graph ../repo
1230 $ hg incoming --graph ../repo
1228 comparing with ../repo
1231 comparing with ../repo
1229 searching for changes
1232 searching for changes
1230 o changeset: 34:fea3ac5810e0
1233 o changeset: 34:fea3ac5810e0
1231 | tag: tip
1234 | tag: tip
1232 | parent: 32:d06dffa21a31
1235 | parent: 32:d06dffa21a31
1233 | user: test
1236 | user: test
1234 | date: Thu Jan 01 00:00:34 1970 +0000
1237 | date: Thu Jan 01 00:00:34 1970 +0000
1235 | summary: (34) head
1238 | summary: (34) head
1236 |
1239 |
1237 | o changeset: 33:68608f5145f9
1240 | o changeset: 33:68608f5145f9
1238 | parent: 18:1aa84d96232a
1241 | parent: 18:1aa84d96232a
1239 | user: test
1242 | user: test
1240 | date: Thu Jan 01 00:00:33 1970 +0000
1243 | date: Thu Jan 01 00:00:33 1970 +0000
1241 | summary: (33) head
1244 | summary: (33) head
1242 |
1245 |
1243 o changeset: 32:d06dffa21a31
1246 o changeset: 32:d06dffa21a31
1244 | parent: 27:886ed638191b
1247 | parent: 27:886ed638191b
1245 | parent: 31:621d83e11f67
1248 | parent: 31:621d83e11f67
1246 | user: test
1249 | user: test
1247 | date: Thu Jan 01 00:00:32 1970 +0000
1250 | date: Thu Jan 01 00:00:32 1970 +0000
1248 | summary: (32) expand
1251 | summary: (32) expand
1249 |
1252 |
1250 o changeset: 27:886ed638191b
1253 o changeset: 27:886ed638191b
1251 parent: 21:d42a756af44d
1254 parent: 21:d42a756af44d
1252 user: test
1255 user: test
1253 date: Thu Jan 01 00:00:27 1970 +0000
1256 date: Thu Jan 01 00:00:27 1970 +0000
1254 summary: (27) collapse
1257 summary: (27) collapse
1255
1258
1256 $ cd ..
1259 $ cd ..
1257
1260
1258 $ hg -R repo outgoing --graph repo2
1261 $ hg -R repo outgoing --graph repo2
1259 comparing with repo2
1262 comparing with repo2
1260 searching for changes
1263 searching for changes
1261 @ changeset: 34:fea3ac5810e0
1264 @ changeset: 34:fea3ac5810e0
1262 | tag: tip
1265 | tag: tip
1263 | parent: 32:d06dffa21a31
1266 | parent: 32:d06dffa21a31
1264 | user: test
1267 | user: test
1265 | date: Thu Jan 01 00:00:34 1970 +0000
1268 | date: Thu Jan 01 00:00:34 1970 +0000
1266 | summary: (34) head
1269 | summary: (34) head
1267 |
1270 |
1268 | o changeset: 33:68608f5145f9
1271 | o changeset: 33:68608f5145f9
1269 | parent: 18:1aa84d96232a
1272 | parent: 18:1aa84d96232a
1270 | user: test
1273 | user: test
1271 | date: Thu Jan 01 00:00:33 1970 +0000
1274 | date: Thu Jan 01 00:00:33 1970 +0000
1272 | summary: (33) head
1275 | summary: (33) head
1273 |
1276 |
1274 o changeset: 32:d06dffa21a31
1277 o changeset: 32:d06dffa21a31
1275 | parent: 27:886ed638191b
1278 | parent: 27:886ed638191b
1276 | parent: 31:621d83e11f67
1279 | parent: 31:621d83e11f67
1277 | user: test
1280 | user: test
1278 | date: Thu Jan 01 00:00:32 1970 +0000
1281 | date: Thu Jan 01 00:00:32 1970 +0000
1279 | summary: (32) expand
1282 | summary: (32) expand
1280 |
1283 |
1281 o changeset: 27:886ed638191b
1284 o changeset: 27:886ed638191b
1282 parent: 21:d42a756af44d
1285 parent: 21:d42a756af44d
1283 user: test
1286 user: test
1284 date: Thu Jan 01 00:00:27 1970 +0000
1287 date: Thu Jan 01 00:00:27 1970 +0000
1285 summary: (27) collapse
1288 summary: (27) collapse
1286
1289
1287
1290
1288 File + limit with revs != cset revs:
1291 File + limit with revs != cset revs:
1289 $ cd repo
1292 $ cd repo
1290 $ touch b
1293 $ touch b
1291 $ hg ci -Aqm0
1294 $ hg ci -Aqm0
1292 $ hg log -G -l2 a
1295 $ hg log -G -l2 a
1293 o changeset: 34:fea3ac5810e0
1296 o changeset: 34:fea3ac5810e0
1294 | parent: 32:d06dffa21a31
1297 | parent: 32:d06dffa21a31
1295 ~ user: test
1298 ~ user: test
1296 date: Thu Jan 01 00:00:34 1970 +0000
1299 date: Thu Jan 01 00:00:34 1970 +0000
1297 summary: (34) head
1300 summary: (34) head
1298
1301
1299 o changeset: 33:68608f5145f9
1302 o changeset: 33:68608f5145f9
1300 | parent: 18:1aa84d96232a
1303 | parent: 18:1aa84d96232a
1301 ~ user: test
1304 ~ user: test
1302 date: Thu Jan 01 00:00:33 1970 +0000
1305 date: Thu Jan 01 00:00:33 1970 +0000
1303 summary: (33) head
1306 summary: (33) head
1304
1307
1305
1308
1306 File + limit + -ra:b, (b - a) < limit:
1309 File + limit + -ra:b, (b - a) < limit:
1307 $ hg log -G -l3000 -r32:tip a
1310 $ hg log -G -l3000 -r32:tip a
1308 o changeset: 34:fea3ac5810e0
1311 o changeset: 34:fea3ac5810e0
1309 | parent: 32:d06dffa21a31
1312 | parent: 32:d06dffa21a31
1310 | user: test
1313 | user: test
1311 | date: Thu Jan 01 00:00:34 1970 +0000
1314 | date: Thu Jan 01 00:00:34 1970 +0000
1312 | summary: (34) head
1315 | summary: (34) head
1313 |
1316 |
1314 | o changeset: 33:68608f5145f9
1317 | o changeset: 33:68608f5145f9
1315 | | parent: 18:1aa84d96232a
1318 | | parent: 18:1aa84d96232a
1316 | ~ user: test
1319 | ~ user: test
1317 | date: Thu Jan 01 00:00:33 1970 +0000
1320 | date: Thu Jan 01 00:00:33 1970 +0000
1318 | summary: (33) head
1321 | summary: (33) head
1319 |
1322 |
1320 o changeset: 32:d06dffa21a31
1323 o changeset: 32:d06dffa21a31
1321 |\ parent: 27:886ed638191b
1324 |\ parent: 27:886ed638191b
1322 ~ ~ parent: 31:621d83e11f67
1325 ~ ~ parent: 31:621d83e11f67
1323 user: test
1326 user: test
1324 date: Thu Jan 01 00:00:32 1970 +0000
1327 date: Thu Jan 01 00:00:32 1970 +0000
1325 summary: (32) expand
1328 summary: (32) expand
1326
1329
1327
1330
1328 Point out a common and an uncommon unshown parent
1331 Point out a common and an uncommon unshown parent
1329
1332
1330 $ hg log -G -r 'rev(8) or rev(9)'
1333 $ hg log -G -r 'rev(8) or rev(9)'
1331 o changeset: 9:7010c0af0a35
1334 o changeset: 9:7010c0af0a35
1332 |\ parent: 7:b632bb1b1224
1335 |\ parent: 7:b632bb1b1224
1333 | ~ parent: 8:7a0b11f71937
1336 | ~ parent: 8:7a0b11f71937
1334 | user: test
1337 | user: test
1335 | date: Thu Jan 01 00:00:09 1970 +0000
1338 | date: Thu Jan 01 00:00:09 1970 +0000
1336 | summary: (9) expand
1339 | summary: (9) expand
1337 |
1340 |
1338 o changeset: 8:7a0b11f71937
1341 o changeset: 8:7a0b11f71937
1339 |\ parent: 0:e6eb3150255d
1342 |\ parent: 0:e6eb3150255d
1340 ~ ~ parent: 7:b632bb1b1224
1343 ~ ~ parent: 7:b632bb1b1224
1341 user: test
1344 user: test
1342 date: Thu Jan 01 00:00:08 1970 +0000
1345 date: Thu Jan 01 00:00:08 1970 +0000
1343 summary: (8) merge two known; one immediate left, one far right
1346 summary: (8) merge two known; one immediate left, one far right
1344
1347
1345
1348
1346 File + limit + -ra:b, b < tip:
1349 File + limit + -ra:b, b < tip:
1347
1350
1348 $ hg log -G -l1 -r32:34 a
1351 $ hg log -G -l1 -r32:34 a
1349 o changeset: 34:fea3ac5810e0
1352 o changeset: 34:fea3ac5810e0
1350 | parent: 32:d06dffa21a31
1353 | parent: 32:d06dffa21a31
1351 ~ user: test
1354 ~ user: test
1352 date: Thu Jan 01 00:00:34 1970 +0000
1355 date: Thu Jan 01 00:00:34 1970 +0000
1353 summary: (34) head
1356 summary: (34) head
1354
1357
1355
1358
1356 file(File) + limit + -ra:b, b < tip:
1359 file(File) + limit + -ra:b, b < tip:
1357
1360
1358 $ hg log -G -l1 -r32:34 -r 'file("a")'
1361 $ hg log -G -l1 -r32:34 -r 'file("a")'
1359 o changeset: 34:fea3ac5810e0
1362 o changeset: 34:fea3ac5810e0
1360 | parent: 32:d06dffa21a31
1363 | parent: 32:d06dffa21a31
1361 ~ user: test
1364 ~ user: test
1362 date: Thu Jan 01 00:00:34 1970 +0000
1365 date: Thu Jan 01 00:00:34 1970 +0000
1363 summary: (34) head
1366 summary: (34) head
1364
1367
1365
1368
1366 limit(file(File) and a::b), b < tip:
1369 limit(file(File) and a::b), b < tip:
1367
1370
1368 $ hg log -G -r 'limit(file("a") and 32::34, 1)'
1371 $ hg log -G -r 'limit(file("a") and 32::34, 1)'
1369 o changeset: 32:d06dffa21a31
1372 o changeset: 32:d06dffa21a31
1370 |\ parent: 27:886ed638191b
1373 |\ parent: 27:886ed638191b
1371 ~ ~ parent: 31:621d83e11f67
1374 ~ ~ parent: 31:621d83e11f67
1372 user: test
1375 user: test
1373 date: Thu Jan 01 00:00:32 1970 +0000
1376 date: Thu Jan 01 00:00:32 1970 +0000
1374 summary: (32) expand
1377 summary: (32) expand
1375
1378
1376
1379
1377 File + limit + -ra:b, b < tip:
1380 File + limit + -ra:b, b < tip:
1378
1381
1379 $ hg log -G -r 'limit(file("a") and 34::32, 1)'
1382 $ hg log -G -r 'limit(file("a") and 34::32, 1)'
1380
1383
1381 File + limit + -ra:b, b < tip, (b - a) < limit:
1384 File + limit + -ra:b, b < tip, (b - a) < limit:
1382
1385
1383 $ hg log -G -l10 -r33:34 a
1386 $ hg log -G -l10 -r33:34 a
1384 o changeset: 34:fea3ac5810e0
1387 o changeset: 34:fea3ac5810e0
1385 | parent: 32:d06dffa21a31
1388 | parent: 32:d06dffa21a31
1386 ~ user: test
1389 ~ user: test
1387 date: Thu Jan 01 00:00:34 1970 +0000
1390 date: Thu Jan 01 00:00:34 1970 +0000
1388 summary: (34) head
1391 summary: (34) head
1389
1392
1390 o changeset: 33:68608f5145f9
1393 o changeset: 33:68608f5145f9
1391 | parent: 18:1aa84d96232a
1394 | parent: 18:1aa84d96232a
1392 ~ user: test
1395 ~ user: test
1393 date: Thu Jan 01 00:00:33 1970 +0000
1396 date: Thu Jan 01 00:00:33 1970 +0000
1394 summary: (33) head
1397 summary: (33) head
1395
1398
1396
1399
1397 Do not crash or produce strange graphs if history is buggy
1400 Do not crash or produce strange graphs if history is buggy
1398
1401
1399 $ hg branch branch
1402 $ hg branch branch
1400 marked working directory as branch branch
1403 marked working directory as branch branch
1401 (branches are permanent and global, did you want a bookmark?)
1404 (branches are permanent and global, did you want a bookmark?)
1402 $ commit 36 "buggy merge: identical parents" 35 35
1405 $ commit 36 "buggy merge: identical parents" 35 35
1403 $ hg log -G -l5
1406 $ hg log -G -l5
1404 @ changeset: 36:08a19a744424
1407 @ changeset: 36:08a19a744424
1405 | branch: branch
1408 | branch: branch
1406 | tag: tip
1409 | tag: tip
1407 | parent: 35:9159c3644c5e
1410 | parent: 35:9159c3644c5e
1408 | parent: 35:9159c3644c5e
1411 | parent: 35:9159c3644c5e
1409 | user: test
1412 | user: test
1410 | date: Thu Jan 01 00:00:36 1970 +0000
1413 | date: Thu Jan 01 00:00:36 1970 +0000
1411 | summary: (36) buggy merge: identical parents
1414 | summary: (36) buggy merge: identical parents
1412 |
1415 |
1413 o changeset: 35:9159c3644c5e
1416 o changeset: 35:9159c3644c5e
1414 | user: test
1417 | user: test
1415 | date: Thu Jan 01 00:00:00 1970 +0000
1418 | date: Thu Jan 01 00:00:00 1970 +0000
1416 | summary: 0
1419 | summary: 0
1417 |
1420 |
1418 o changeset: 34:fea3ac5810e0
1421 o changeset: 34:fea3ac5810e0
1419 | parent: 32:d06dffa21a31
1422 | parent: 32:d06dffa21a31
1420 | user: test
1423 | user: test
1421 | date: Thu Jan 01 00:00:34 1970 +0000
1424 | date: Thu Jan 01 00:00:34 1970 +0000
1422 | summary: (34) head
1425 | summary: (34) head
1423 |
1426 |
1424 | o changeset: 33:68608f5145f9
1427 | o changeset: 33:68608f5145f9
1425 | | parent: 18:1aa84d96232a
1428 | | parent: 18:1aa84d96232a
1426 | ~ user: test
1429 | ~ user: test
1427 | date: Thu Jan 01 00:00:33 1970 +0000
1430 | date: Thu Jan 01 00:00:33 1970 +0000
1428 | summary: (33) head
1431 | summary: (33) head
1429 |
1432 |
1430 o changeset: 32:d06dffa21a31
1433 o changeset: 32:d06dffa21a31
1431 |\ parent: 27:886ed638191b
1434 |\ parent: 27:886ed638191b
1432 ~ ~ parent: 31:621d83e11f67
1435 ~ ~ parent: 31:621d83e11f67
1433 user: test
1436 user: test
1434 date: Thu Jan 01 00:00:32 1970 +0000
1437 date: Thu Jan 01 00:00:32 1970 +0000
1435 summary: (32) expand
1438 summary: (32) expand
1436
1439
1437
1440
1438 Test log -G options
1441 Test log -G options
1439
1442
1440 $ testlog() {
1443 $ testlog() {
1441 > hg log -G --print-revset "$@"
1444 > hg log -G --print-revset "$@"
1442 > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
1445 > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
1443 > | sed 's/.*nodetag/nodetag/' > log.nodes
1446 > | sed 's/.*nodetag/nodetag/' > log.nodes
1444 > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
1447 > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
1445 > | sed 's/.*nodetag/nodetag/' > glog.nodes
1448 > | sed 's/.*nodetag/nodetag/' > glog.nodes
1446 > (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \
1449 > (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \
1447 > | grep '^[-+@ ]' || :
1450 > | grep '^[-+@ ]' || :
1448 > }
1451 > }
1449
1452
1450 glog always reorders nodes which explains the difference with log
1453 glog always reorders nodes which explains the difference with log
1451
1454
1452 $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
1455 $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
1453 ['27', '25', '21', '34', '32', '31']
1456 ['27', '25', '21', '34', '32', '31']
1454 []
1457 []
1458 <baseset- [21, 25, 27, 31, 32, 34]>
1455 --- log.nodes * (glob)
1459 --- log.nodes * (glob)
1456 +++ glog.nodes * (glob)
1460 +++ glog.nodes * (glob)
1457 @@ -1,6 +1,6 @@
1461 @@ -1,6 +1,6 @@
1458 -nodetag 27
1462 -nodetag 27
1459 -nodetag 25
1463 -nodetag 25
1460 -nodetag 21
1464 -nodetag 21
1461 nodetag 34
1465 nodetag 34
1462 nodetag 32
1466 nodetag 32
1463 nodetag 31
1467 nodetag 31
1464 +nodetag 27
1468 +nodetag 27
1465 +nodetag 25
1469 +nodetag 25
1466 +nodetag 21
1470 +nodetag 21
1467 $ testlog -u test -u not-a-user
1471 $ testlog -u test -u not-a-user
1468 []
1472 []
1469 (or
1473 (or
1470 (list
1474 (list
1471 (func
1475 (func
1472 (symbol 'user')
1476 (symbol 'user')
1473 (string 'test'))
1477 (string 'test'))
1474 (func
1478 (func
1475 (symbol 'user')
1479 (symbol 'user')
1476 (string 'not-a-user'))))
1480 (string 'not-a-user'))))
1481 <filteredset
1482 <spanset- 0:37>,
1483 <addset
1484 <filteredset
1485 <fullreposet+ 0:37>,
1486 <user 'test'>>,
1487 <filteredset
1488 <fullreposet+ 0:37>,
1489 <user 'not-a-user'>>>>
1477 $ testlog -b not-a-branch
1490 $ testlog -b not-a-branch
1478 abort: unknown revision 'not-a-branch'!
1491 abort: unknown revision 'not-a-branch'!
1479 abort: unknown revision 'not-a-branch'!
1492 abort: unknown revision 'not-a-branch'!
1480 abort: unknown revision 'not-a-branch'!
1493 abort: unknown revision 'not-a-branch'!
1481 $ testlog -b 35 -b 36 --only-branch branch
1494 $ testlog -b 35 -b 36 --only-branch branch
1482 []
1495 []
1483 (or
1496 (or
1484 (list
1497 (list
1485 (func
1498 (func
1486 (symbol 'branch')
1499 (symbol 'branch')
1487 (string 'default'))
1500 (string 'default'))
1488 (func
1501 (func
1489 (symbol 'branch')
1502 (symbol 'branch')
1490 (string 'branch'))
1503 (string 'branch'))
1491 (func
1504 (func
1492 (symbol 'branch')
1505 (symbol 'branch')
1493 (string 'branch'))))
1506 (string 'branch'))))
1507 <filteredset
1508 <spanset- 0:37>,
1509 <addset
1510 <filteredset
1511 <fullreposet+ 0:37>,
1512 <branch 'default'>>,
1513 <addset
1514 <filteredset
1515 <fullreposet+ 0:37>,
1516 <branch 'branch'>>,
1517 <filteredset
1518 <fullreposet+ 0:37>,
1519 <branch 'branch'>>>>>
1494 $ testlog -k expand -k merge
1520 $ testlog -k expand -k merge
1495 []
1521 []
1496 (or
1522 (or
1497 (list
1523 (list
1498 (func
1524 (func
1499 (symbol 'keyword')
1525 (symbol 'keyword')
1500 (string 'expand'))
1526 (string 'expand'))
1501 (func
1527 (func
1502 (symbol 'keyword')
1528 (symbol 'keyword')
1503 (string 'merge'))))
1529 (string 'merge'))))
1530 <filteredset
1531 <spanset- 0:37>,
1532 <addset
1533 <filteredset
1534 <fullreposet+ 0:37>,
1535 <keyword 'expand'>>,
1536 <filteredset
1537 <fullreposet+ 0:37>,
1538 <keyword 'merge'>>>>
1504 $ testlog --only-merges
1539 $ testlog --only-merges
1505 []
1540 []
1506 (func
1541 (func
1507 (symbol 'merge')
1542 (symbol 'merge')
1508 None)
1543 None)
1544 <filteredset
1545 <spanset- 0:37>,
1546 <merge>>
1509 $ testlog --no-merges
1547 $ testlog --no-merges
1510 []
1548 []
1511 (not
1549 (not
1512 (func
1550 (func
1513 (symbol 'merge')
1551 (symbol 'merge')
1514 None))
1552 None))
1553 <filteredset
1554 <spanset- 0:37>,
1555 <not
1556 <filteredset
1557 <spanset- 0:37>,
1558 <merge>>>>
1515 $ testlog --date '2 0 to 4 0'
1559 $ testlog --date '2 0 to 4 0'
1516 []
1560 []
1517 (func
1561 (func
1518 (symbol 'date')
1562 (symbol 'date')
1519 (string '2 0 to 4 0'))
1563 (string '2 0 to 4 0'))
1564 <filteredset
1565 <spanset- 0:37>,
1566 <date '2 0 to 4 0'>>
1520 $ hg log -G -d 'brace ) in a date'
1567 $ hg log -G -d 'brace ) in a date'
1521 hg: parse error: invalid date: 'brace ) in a date'
1568 hg: parse error: invalid date: 'brace ) in a date'
1522 [255]
1569 [255]
1523 $ testlog --prune 31 --prune 32
1570 $ testlog --prune 31 --prune 32
1524 []
1571 []
1525 (and
1572 (and
1526 (not
1573 (not
1527 (or
1574 (or
1528 (list
1575 (list
1529 (string '31')
1576 (string '31')
1530 (func
1577 (func
1531 (symbol 'ancestors')
1578 (symbol 'ancestors')
1532 (string '31')))))
1579 (string '31')))))
1533 (not
1580 (not
1534 (or
1581 (or
1535 (list
1582 (list
1536 (string '32')
1583 (string '32')
1537 (func
1584 (func
1538 (symbol 'ancestors')
1585 (symbol 'ancestors')
1539 (string '32'))))))
1586 (string '32'))))))
1587 <filteredset
1588 <filteredset
1589 <spanset- 0:37>,
1590 <not
1591 <addset
1592 <baseset [31]>,
1593 <filteredset
1594 <spanset- 0:37>,
1595 <generatorsetdesc+>>>>>,
1596 <not
1597 <addset
1598 <baseset [32]>,
1599 <filteredset
1600 <spanset- 0:37>,
1601 <generatorsetdesc+>>>>>
1540
1602
1541 Dedicated repo for --follow and paths filtering. The g is crafted to
1603 Dedicated repo for --follow and paths filtering. The g is crafted to
1542 have 2 filelog topological heads in a linear changeset graph.
1604 have 2 filelog topological heads in a linear changeset graph.
1543
1605
1544 $ cd ..
1606 $ cd ..
1545 $ hg init follow
1607 $ hg init follow
1546 $ cd follow
1608 $ cd follow
1547 $ testlog --follow
1609 $ testlog --follow
1548 []
1610 []
1549 []
1611 []
1612 <baseset []>
1550 $ testlog -rnull
1613 $ testlog -rnull
1551 ['null']
1614 ['null']
1552 []
1615 []
1616 <baseset [-1]>
1553 $ echo a > a
1617 $ echo a > a
1554 $ echo aa > aa
1618 $ echo aa > aa
1555 $ echo f > f
1619 $ echo f > f
1556 $ hg ci -Am "add a" a aa f
1620 $ hg ci -Am "add a" a aa f
1557 $ hg cp a b
1621 $ hg cp a b
1558 $ hg cp f g
1622 $ hg cp f g
1559 $ hg ci -m "copy a b"
1623 $ hg ci -m "copy a b"
1560 $ mkdir dir
1624 $ mkdir dir
1561 $ hg mv b dir
1625 $ hg mv b dir
1562 $ echo g >> g
1626 $ echo g >> g
1563 $ echo f >> f
1627 $ echo f >> f
1564 $ hg ci -m "mv b dir/b"
1628 $ hg ci -m "mv b dir/b"
1565 $ hg mv a b
1629 $ hg mv a b
1566 $ hg cp -f f g
1630 $ hg cp -f f g
1567 $ echo a > d
1631 $ echo a > d
1568 $ hg add d
1632 $ hg add d
1569 $ hg ci -m "mv a b; add d"
1633 $ hg ci -m "mv a b; add d"
1570 $ hg mv dir/b e
1634 $ hg mv dir/b e
1571 $ hg ci -m "mv dir/b e"
1635 $ hg ci -m "mv dir/b e"
1572 $ hg log -G --template '({rev}) {desc|firstline}\n'
1636 $ hg log -G --template '({rev}) {desc|firstline}\n'
1573 @ (4) mv dir/b e
1637 @ (4) mv dir/b e
1574 |
1638 |
1575 o (3) mv a b; add d
1639 o (3) mv a b; add d
1576 |
1640 |
1577 o (2) mv b dir/b
1641 o (2) mv b dir/b
1578 |
1642 |
1579 o (1) copy a b
1643 o (1) copy a b
1580 |
1644 |
1581 o (0) add a
1645 o (0) add a
1582
1646
1583
1647
1584 $ testlog a
1648 $ testlog a
1585 []
1649 []
1586 (func
1650 (func
1587 (symbol 'filelog')
1651 (symbol 'filelog')
1588 (string 'a'))
1652 (string 'a'))
1653 <filteredset
1654 <spanset- 0:5>, set([0])>
1589 $ testlog a b
1655 $ testlog a b
1590 []
1656 []
1591 (or
1657 (or
1592 (list
1658 (list
1593 (func
1659 (func
1594 (symbol 'filelog')
1660 (symbol 'filelog')
1595 (string 'a'))
1661 (string 'a'))
1596 (func
1662 (func
1597 (symbol 'filelog')
1663 (symbol 'filelog')
1598 (string 'b'))))
1664 (string 'b'))))
1665 <filteredset
1666 <spanset- 0:5>,
1667 <addset
1668 <baseset+ [0]>,
1669 <baseset+ [1]>>>
1599
1670
1600 Test falling back to slow path for non-existing files
1671 Test falling back to slow path for non-existing files
1601
1672
1602 $ testlog a c
1673 $ testlog a c
1603 []
1674 []
1604 (func
1675 (func
1605 (symbol '_matchfiles')
1676 (symbol '_matchfiles')
1606 (list
1677 (list
1607 (string 'r:')
1678 (string 'r:')
1608 (string 'd:relpath')
1679 (string 'd:relpath')
1609 (string 'p:a')
1680 (string 'p:a')
1610 (string 'p:c')))
1681 (string 'p:c')))
1682 <filteredset
1683 <spanset- 0:5>,
1684 <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=None>>
1611
1685
1612 Test multiple --include/--exclude/paths
1686 Test multiple --include/--exclude/paths
1613
1687
1614 $ testlog --include a --include e --exclude b --exclude e a e
1688 $ testlog --include a --include e --exclude b --exclude e a e
1615 []
1689 []
1616 (func
1690 (func
1617 (symbol '_matchfiles')
1691 (symbol '_matchfiles')
1618 (list
1692 (list
1619 (string 'r:')
1693 (string 'r:')
1620 (string 'd:relpath')
1694 (string 'd:relpath')
1621 (string 'p:a')
1695 (string 'p:a')
1622 (string 'p:e')
1696 (string 'p:e')
1623 (string 'i:a')
1697 (string 'i:a')
1624 (string 'i:e')
1698 (string 'i:e')
1625 (string 'x:b')
1699 (string 'x:b')
1626 (string 'x:e')))
1700 (string 'x:e')))
1701 <filteredset
1702 <spanset- 0:5>,
1703 <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=None>>
1627
1704
1628 Test glob expansion of pats
1705 Test glob expansion of pats
1629
1706
1630 $ expandglobs=`$PYTHON -c "import mercurial.util; \
1707 $ expandglobs=`$PYTHON -c "import mercurial.util; \
1631 > print(mercurial.util.expandglobs and 'true' or 'false')"`
1708 > print(mercurial.util.expandglobs and 'true' or 'false')"`
1632 $ if [ $expandglobs = "true" ]; then
1709 $ if [ $expandglobs = "true" ]; then
1633 > testlog 'a*';
1710 > testlog 'a*';
1634 > else
1711 > else
1635 > testlog a*;
1712 > testlog a*;
1636 > fi;
1713 > fi;
1637 []
1714 []
1638 (func
1715 (func
1639 (symbol 'filelog')
1716 (symbol 'filelog')
1640 (string 'aa'))
1717 (string 'aa'))
1718 <filteredset
1719 <spanset- 0:5>, set([0])>
1641
1720
1642 Test --follow on a non-existent directory
1721 Test --follow on a non-existent directory
1643
1722
1644 $ testlog -f dir
1723 $ testlog -f dir
1645 abort: cannot follow file not in parent revision: "dir"
1724 abort: cannot follow file not in parent revision: "dir"
1646 abort: cannot follow file not in parent revision: "dir"
1725 abort: cannot follow file not in parent revision: "dir"
1647 abort: cannot follow file not in parent revision: "dir"
1726 abort: cannot follow file not in parent revision: "dir"
1648
1727
1649 Test --follow on a directory
1728 Test --follow on a directory
1650
1729
1651 $ hg up -q '.^'
1730 $ hg up -q '.^'
1652 $ testlog -f dir
1731 $ testlog -f dir
1653 []
1732 []
1654 (and
1733 (and
1655 (func
1734 (func
1656 (symbol 'ancestors')
1735 (symbol 'ancestors')
1657 (symbol '.'))
1736 (symbol '.'))
1658 (func
1737 (func
1659 (symbol '_matchfiles')
1738 (symbol '_matchfiles')
1660 (list
1739 (list
1661 (string 'r:')
1740 (string 'r:')
1662 (string 'd:relpath')
1741 (string 'd:relpath')
1663 (string 'p:dir'))))
1742 (string 'p:dir'))))
1743 <filteredset
1744 <filteredset
1745 <spanset- 0:4>,
1746 <generatorsetdesc+>>,
1747 <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>>
1664 $ hg up -q tip
1748 $ hg up -q tip
1665
1749
1666 Test --follow on file not in parent revision
1750 Test --follow on file not in parent revision
1667
1751
1668 $ testlog -f a
1752 $ testlog -f a
1669 abort: cannot follow file not in parent revision: "a"
1753 abort: cannot follow file not in parent revision: "a"
1670 abort: cannot follow file not in parent revision: "a"
1754 abort: cannot follow file not in parent revision: "a"
1671 abort: cannot follow file not in parent revision: "a"
1755 abort: cannot follow file not in parent revision: "a"
1672
1756
1673 Test --follow and patterns
1757 Test --follow and patterns
1674
1758
1675 $ testlog -f 'glob:*'
1759 $ testlog -f 'glob:*'
1676 []
1760 []
1677 (and
1761 (and
1678 (func
1762 (func
1679 (symbol 'ancestors')
1763 (symbol 'ancestors')
1680 (symbol '.'))
1764 (symbol '.'))
1681 (func
1765 (func
1682 (symbol '_matchfiles')
1766 (symbol '_matchfiles')
1683 (list
1767 (list
1684 (string 'r:')
1768 (string 'r:')
1685 (string 'd:relpath')
1769 (string 'd:relpath')
1686 (string 'p:glob:*'))))
1770 (string 'p:glob:*'))))
1771 <filteredset
1772 <filteredset
1773 <spanset- 0:5>,
1774 <generatorsetdesc+>>,
1775 <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>>
1687
1776
1688 Test --follow on a single rename
1777 Test --follow on a single rename
1689
1778
1690 $ hg up -q 2
1779 $ hg up -q 2
1691 $ testlog -f a
1780 $ testlog -f a
1692 []
1781 []
1693 (func
1782 (func
1694 (symbol 'follow')
1783 (symbol 'follow')
1695 (string 'a'))
1784 (string 'a'))
1785 <filteredset
1786 <spanset- 0:3>,
1787 <generatorsetdesc+>>
1696
1788
1697 Test --follow and multiple renames
1789 Test --follow and multiple renames
1698
1790
1699 $ hg up -q tip
1791 $ hg up -q tip
1700 $ testlog -f e
1792 $ testlog -f e
1701 []
1793 []
1702 (func
1794 (func
1703 (symbol 'follow')
1795 (symbol 'follow')
1704 (string 'e'))
1796 (string 'e'))
1797 <filteredset
1798 <spanset- 0:5>,
1799 <generatorsetdesc+>>
1705
1800
1706 Test --follow and multiple filelog heads
1801 Test --follow and multiple filelog heads
1707
1802
1708 $ hg up -q 2
1803 $ hg up -q 2
1709 $ testlog -f g
1804 $ testlog -f g
1710 []
1805 []
1711 (func
1806 (func
1712 (symbol 'follow')
1807 (symbol 'follow')
1713 (string 'g'))
1808 (string 'g'))
1809 <filteredset
1810 <spanset- 0:3>,
1811 <generatorsetdesc+>>
1714 $ cat log.nodes
1812 $ cat log.nodes
1715 nodetag 2
1813 nodetag 2
1716 nodetag 1
1814 nodetag 1
1717 nodetag 0
1815 nodetag 0
1718 $ hg up -q tip
1816 $ hg up -q tip
1719 $ testlog -f g
1817 $ testlog -f g
1720 []
1818 []
1721 (func
1819 (func
1722 (symbol 'follow')
1820 (symbol 'follow')
1723 (string 'g'))
1821 (string 'g'))
1822 <filteredset
1823 <spanset- 0:5>,
1824 <generatorsetdesc+>>
1724 $ cat log.nodes
1825 $ cat log.nodes
1725 nodetag 3
1826 nodetag 3
1726 nodetag 2
1827 nodetag 2
1727 nodetag 0
1828 nodetag 0
1728
1829
1729 Test --follow and multiple files
1830 Test --follow and multiple files
1730
1831
1731 $ testlog -f g e
1832 $ testlog -f g e
1732 []
1833 []
1733 (or
1834 (or
1734 (list
1835 (list
1735 (func
1836 (func
1736 (symbol 'follow')
1837 (symbol 'follow')
1737 (string 'g'))
1838 (string 'g'))
1738 (func
1839 (func
1739 (symbol 'follow')
1840 (symbol 'follow')
1740 (string 'e'))))
1841 (string 'e'))))
1842 <filteredset
1843 <spanset- 0:5>,
1844 <addset
1845 <generatorsetdesc+>,
1846 <generatorsetdesc+>>>
1741 $ cat log.nodes
1847 $ cat log.nodes
1742 nodetag 4
1848 nodetag 4
1743 nodetag 3
1849 nodetag 3
1744 nodetag 2
1850 nodetag 2
1745 nodetag 1
1851 nodetag 1
1746 nodetag 0
1852 nodetag 0
1747
1853
1748 Test --follow null parent
1854 Test --follow null parent
1749
1855
1750 $ hg up -q null
1856 $ hg up -q null
1751 $ testlog -f
1857 $ testlog -f
1752 []
1858 []
1753 []
1859 []
1860 <baseset []>
1754
1861
1755 Test --follow-first
1862 Test --follow-first
1756
1863
1757 $ hg up -q 3
1864 $ hg up -q 3
1758 $ echo ee > e
1865 $ echo ee > e
1759 $ hg ci -Am "add another e" e
1866 $ hg ci -Am "add another e" e
1760 created new head
1867 created new head
1761 $ hg merge --tool internal:other 4
1868 $ hg merge --tool internal:other 4
1762 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
1869 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
1763 (branch merge, don't forget to commit)
1870 (branch merge, don't forget to commit)
1764 $ echo merge > e
1871 $ echo merge > e
1765 $ hg ci -m "merge 5 and 4"
1872 $ hg ci -m "merge 5 and 4"
1766 $ testlog --follow-first
1873 $ testlog --follow-first
1767 []
1874 []
1768 (func
1875 (func
1769 (symbol '_firstancestors')
1876 (symbol '_firstancestors')
1770 (func
1877 (func
1771 (symbol 'rev')
1878 (symbol 'rev')
1772 (symbol '6')))
1879 (symbol '6')))
1880 <filteredset
1881 <spanset- 0:7>,
1882 <generatorsetdesc+>>
1773
1883
1774 Cannot compare with log --follow-first FILE as it never worked
1884 Cannot compare with log --follow-first FILE as it never worked
1775
1885
1776 $ hg log -G --print-revset --follow-first e
1886 $ hg log -G --print-revset --follow-first e
1777 []
1887 []
1778 (func
1888 (func
1779 (symbol '_followfirst')
1889 (symbol '_followfirst')
1780 (string 'e'))
1890 (string 'e'))
1891 <filteredset
1892 <spanset- 0:7>,
1893 <generatorsetdesc+>>
1781 $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
1894 $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
1782 @ 6 merge 5 and 4
1895 @ 6 merge 5 and 4
1783 |\
1896 |\
1784 | ~
1897 | ~
1785 o 5 add another e
1898 o 5 add another e
1786 |
1899 |
1787 ~
1900 ~
1788
1901
1789 Test --copies
1902 Test --copies
1790
1903
1791 $ hg log -G --copies --template "{rev} {desc|firstline} \
1904 $ hg log -G --copies --template "{rev} {desc|firstline} \
1792 > copies: {file_copies_switch}\n"
1905 > copies: {file_copies_switch}\n"
1793 @ 6 merge 5 and 4 copies:
1906 @ 6 merge 5 and 4 copies:
1794 |\
1907 |\
1795 | o 5 add another e copies:
1908 | o 5 add another e copies:
1796 | |
1909 | |
1797 o | 4 mv dir/b e copies: e (dir/b)
1910 o | 4 mv dir/b e copies: e (dir/b)
1798 |/
1911 |/
1799 o 3 mv a b; add d copies: b (a)g (f)
1912 o 3 mv a b; add d copies: b (a)g (f)
1800 |
1913 |
1801 o 2 mv b dir/b copies: dir/b (b)
1914 o 2 mv b dir/b copies: dir/b (b)
1802 |
1915 |
1803 o 1 copy a b copies: b (a)g (f)
1916 o 1 copy a b copies: b (a)g (f)
1804 |
1917 |
1805 o 0 add a copies:
1918 o 0 add a copies:
1806
1919
1807 Test "set:..." and parent revision
1920 Test "set:..." and parent revision
1808
1921
1809 $ hg up -q 4
1922 $ hg up -q 4
1810 $ testlog "set:copied()"
1923 $ testlog "set:copied()"
1811 []
1924 []
1812 (func
1925 (func
1813 (symbol '_matchfiles')
1926 (symbol '_matchfiles')
1814 (list
1927 (list
1815 (string 'r:')
1928 (string 'r:')
1816 (string 'd:relpath')
1929 (string 'd:relpath')
1817 (string 'p:set:copied()')))
1930 (string 'p:set:copied()')))
1931 <filteredset
1932 <spanset- 0:7>,
1933 <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=None>>
1818 $ testlog --include "set:copied()"
1934 $ testlog --include "set:copied()"
1819 []
1935 []
1820 (func
1936 (func
1821 (symbol '_matchfiles')
1937 (symbol '_matchfiles')
1822 (list
1938 (list
1823 (string 'r:')
1939 (string 'r:')
1824 (string 'd:relpath')
1940 (string 'd:relpath')
1825 (string 'i:set:copied()')))
1941 (string 'i:set:copied()')))
1942 <filteredset
1943 <spanset- 0:7>,
1944 <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=None>>
1826 $ testlog -r "sort(file('set:copied()'), -rev)"
1945 $ testlog -r "sort(file('set:copied()'), -rev)"
1827 ["sort(file('set:copied()'), -rev)"]
1946 ["sort(file('set:copied()'), -rev)"]
1828 []
1947 []
1948 <baseset []>
1829
1949
1830 Test --removed
1950 Test --removed
1831
1951
1832 $ testlog --removed
1952 $ testlog --removed
1833 []
1953 []
1834 []
1954 []
1955 <spanset- 0:7>
1835 $ testlog --removed a
1956 $ testlog --removed a
1836 []
1957 []
1837 (func
1958 (func
1838 (symbol '_matchfiles')
1959 (symbol '_matchfiles')
1839 (list
1960 (list
1840 (string 'r:')
1961 (string 'r:')
1841 (string 'd:relpath')
1962 (string 'd:relpath')
1842 (string 'p:a')))
1963 (string 'p:a')))
1964 <filteredset
1965 <spanset- 0:7>,
1966 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>>
1843 $ testlog --removed --follow a
1967 $ testlog --removed --follow a
1844 []
1968 []
1845 (and
1969 (and
1846 (func
1970 (func
1847 (symbol 'ancestors')
1971 (symbol 'ancestors')
1848 (symbol '.'))
1972 (symbol '.'))
1849 (func
1973 (func
1850 (symbol '_matchfiles')
1974 (symbol '_matchfiles')
1851 (list
1975 (list
1852 (string 'r:')
1976 (string 'r:')
1853 (string 'd:relpath')
1977 (string 'd:relpath')
1854 (string 'p:a'))))
1978 (string 'p:a'))))
1979 <filteredset
1980 <filteredset
1981 <spanset- 0:5>,
1982 <generatorsetdesc+>>,
1983 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>>
1855
1984
1856 Test --patch and --stat with --follow and --follow-first
1985 Test --patch and --stat with --follow and --follow-first
1857
1986
1858 $ hg up -q 3
1987 $ hg up -q 3
1859 $ hg log -G --git --patch b
1988 $ hg log -G --git --patch b
1860 o changeset: 1:216d4c92cf98
1989 o changeset: 1:216d4c92cf98
1861 | user: test
1990 | user: test
1862 ~ date: Thu Jan 01 00:00:00 1970 +0000
1991 ~ date: Thu Jan 01 00:00:00 1970 +0000
1863 summary: copy a b
1992 summary: copy a b
1864
1993
1865 diff --git a/a b/b
1994 diff --git a/a b/b
1866 copy from a
1995 copy from a
1867 copy to b
1996 copy to b
1868
1997
1869
1998
1870 $ hg log -G --git --stat b
1999 $ hg log -G --git --stat b
1871 o changeset: 1:216d4c92cf98
2000 o changeset: 1:216d4c92cf98
1872 | user: test
2001 | user: test
1873 ~ date: Thu Jan 01 00:00:00 1970 +0000
2002 ~ date: Thu Jan 01 00:00:00 1970 +0000
1874 summary: copy a b
2003 summary: copy a b
1875
2004
1876 b | 0
2005 b | 0
1877 1 files changed, 0 insertions(+), 0 deletions(-)
2006 1 files changed, 0 insertions(+), 0 deletions(-)
1878
2007
1879
2008
1880 $ hg log -G --git --patch --follow b
2009 $ hg log -G --git --patch --follow b
1881 o changeset: 1:216d4c92cf98
2010 o changeset: 1:216d4c92cf98
1882 | user: test
2011 | user: test
1883 | date: Thu Jan 01 00:00:00 1970 +0000
2012 | date: Thu Jan 01 00:00:00 1970 +0000
1884 | summary: copy a b
2013 | summary: copy a b
1885 |
2014 |
1886 | diff --git a/a b/b
2015 | diff --git a/a b/b
1887 | copy from a
2016 | copy from a
1888 | copy to b
2017 | copy to b
1889 |
2018 |
1890 o changeset: 0:f8035bb17114
2019 o changeset: 0:f8035bb17114
1891 user: test
2020 user: test
1892 date: Thu Jan 01 00:00:00 1970 +0000
2021 date: Thu Jan 01 00:00:00 1970 +0000
1893 summary: add a
2022 summary: add a
1894
2023
1895 diff --git a/a b/a
2024 diff --git a/a b/a
1896 new file mode 100644
2025 new file mode 100644
1897 --- /dev/null
2026 --- /dev/null
1898 +++ b/a
2027 +++ b/a
1899 @@ -0,0 +1,1 @@
2028 @@ -0,0 +1,1 @@
1900 +a
2029 +a
1901
2030
1902
2031
1903 $ hg log -G --git --stat --follow b
2032 $ hg log -G --git --stat --follow b
1904 o changeset: 1:216d4c92cf98
2033 o changeset: 1:216d4c92cf98
1905 | user: test
2034 | user: test
1906 | date: Thu Jan 01 00:00:00 1970 +0000
2035 | date: Thu Jan 01 00:00:00 1970 +0000
1907 | summary: copy a b
2036 | summary: copy a b
1908 |
2037 |
1909 | b | 0
2038 | b | 0
1910 | 1 files changed, 0 insertions(+), 0 deletions(-)
2039 | 1 files changed, 0 insertions(+), 0 deletions(-)
1911 |
2040 |
1912 o changeset: 0:f8035bb17114
2041 o changeset: 0:f8035bb17114
1913 user: test
2042 user: test
1914 date: Thu Jan 01 00:00:00 1970 +0000
2043 date: Thu Jan 01 00:00:00 1970 +0000
1915 summary: add a
2044 summary: add a
1916
2045
1917 a | 1 +
2046 a | 1 +
1918 1 files changed, 1 insertions(+), 0 deletions(-)
2047 1 files changed, 1 insertions(+), 0 deletions(-)
1919
2048
1920
2049
1921 $ hg up -q 6
2050 $ hg up -q 6
1922 $ hg log -G --git --patch --follow-first e
2051 $ hg log -G --git --patch --follow-first e
1923 @ changeset: 6:fc281d8ff18d
2052 @ changeset: 6:fc281d8ff18d
1924 |\ tag: tip
2053 |\ tag: tip
1925 | ~ parent: 5:99b31f1c2782
2054 | ~ parent: 5:99b31f1c2782
1926 | parent: 4:17d952250a9d
2055 | parent: 4:17d952250a9d
1927 | user: test
2056 | user: test
1928 | date: Thu Jan 01 00:00:00 1970 +0000
2057 | date: Thu Jan 01 00:00:00 1970 +0000
1929 | summary: merge 5 and 4
2058 | summary: merge 5 and 4
1930 |
2059 |
1931 | diff --git a/e b/e
2060 | diff --git a/e b/e
1932 | --- a/e
2061 | --- a/e
1933 | +++ b/e
2062 | +++ b/e
1934 | @@ -1,1 +1,1 @@
2063 | @@ -1,1 +1,1 @@
1935 | -ee
2064 | -ee
1936 | +merge
2065 | +merge
1937 |
2066 |
1938 o changeset: 5:99b31f1c2782
2067 o changeset: 5:99b31f1c2782
1939 | parent: 3:5918b8d165d1
2068 | parent: 3:5918b8d165d1
1940 ~ user: test
2069 ~ user: test
1941 date: Thu Jan 01 00:00:00 1970 +0000
2070 date: Thu Jan 01 00:00:00 1970 +0000
1942 summary: add another e
2071 summary: add another e
1943
2072
1944 diff --git a/e b/e
2073 diff --git a/e b/e
1945 new file mode 100644
2074 new file mode 100644
1946 --- /dev/null
2075 --- /dev/null
1947 +++ b/e
2076 +++ b/e
1948 @@ -0,0 +1,1 @@
2077 @@ -0,0 +1,1 @@
1949 +ee
2078 +ee
1950
2079
1951
2080
1952 Test old-style --rev
2081 Test old-style --rev
1953
2082
1954 $ hg tag 'foo-bar'
2083 $ hg tag 'foo-bar'
1955 $ testlog -r 'foo-bar'
2084 $ testlog -r 'foo-bar'
1956 ['foo-bar']
2085 ['foo-bar']
1957 []
2086 []
2087 <baseset [6]>
1958
2088
1959 Test --follow and forward --rev
2089 Test --follow and forward --rev
1960
2090
1961 $ hg up -q 6
2091 $ hg up -q 6
1962 $ echo g > g
2092 $ echo g > g
1963 $ hg ci -Am 'add g' g
2093 $ hg ci -Am 'add g' g
1964 created new head
2094 created new head
1965 $ hg up -q 2
2095 $ hg up -q 2
1966 $ hg log -G --template "{rev} {desc|firstline}\n"
2096 $ hg log -G --template "{rev} {desc|firstline}\n"
1967 o 8 add g
2097 o 8 add g
1968 |
2098 |
1969 | o 7 Added tag foo-bar for changeset fc281d8ff18d
2099 | o 7 Added tag foo-bar for changeset fc281d8ff18d
1970 |/
2100 |/
1971 o 6 merge 5 and 4
2101 o 6 merge 5 and 4
1972 |\
2102 |\
1973 | o 5 add another e
2103 | o 5 add another e
1974 | |
2104 | |
1975 o | 4 mv dir/b e
2105 o | 4 mv dir/b e
1976 |/
2106 |/
1977 o 3 mv a b; add d
2107 o 3 mv a b; add d
1978 |
2108 |
1979 @ 2 mv b dir/b
2109 @ 2 mv b dir/b
1980 |
2110 |
1981 o 1 copy a b
2111 o 1 copy a b
1982 |
2112 |
1983 o 0 add a
2113 o 0 add a
1984
2114
1985 $ hg archive -r 7 archive
2115 $ hg archive -r 7 archive
1986 $ grep changessincelatesttag archive/.hg_archival.txt
2116 $ grep changessincelatesttag archive/.hg_archival.txt
1987 changessincelatesttag: 1
2117 changessincelatesttag: 1
1988 $ rm -r archive
2118 $ rm -r archive
1989
2119
1990 changessincelatesttag with no prior tag
2120 changessincelatesttag with no prior tag
1991 $ hg archive -r 4 archive
2121 $ hg archive -r 4 archive
1992 $ grep changessincelatesttag archive/.hg_archival.txt
2122 $ grep changessincelatesttag archive/.hg_archival.txt
1993 changessincelatesttag: 5
2123 changessincelatesttag: 5
1994
2124
1995 $ hg export 'all()'
2125 $ hg export 'all()'
1996 # HG changeset patch
2126 # HG changeset patch
1997 # User test
2127 # User test
1998 # Date 0 0
2128 # Date 0 0
1999 # Thu Jan 01 00:00:00 1970 +0000
2129 # Thu Jan 01 00:00:00 1970 +0000
2000 # Node ID f8035bb17114da16215af3436ec5222428ace8ee
2130 # Node ID f8035bb17114da16215af3436ec5222428ace8ee
2001 # Parent 0000000000000000000000000000000000000000
2131 # Parent 0000000000000000000000000000000000000000
2002 add a
2132 add a
2003
2133
2004 diff -r 000000000000 -r f8035bb17114 a
2134 diff -r 000000000000 -r f8035bb17114 a
2005 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2135 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2006 +++ b/a Thu Jan 01 00:00:00 1970 +0000
2136 +++ b/a Thu Jan 01 00:00:00 1970 +0000
2007 @@ -0,0 +1,1 @@
2137 @@ -0,0 +1,1 @@
2008 +a
2138 +a
2009 diff -r 000000000000 -r f8035bb17114 aa
2139 diff -r 000000000000 -r f8035bb17114 aa
2010 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2140 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2011 +++ b/aa Thu Jan 01 00:00:00 1970 +0000
2141 +++ b/aa Thu Jan 01 00:00:00 1970 +0000
2012 @@ -0,0 +1,1 @@
2142 @@ -0,0 +1,1 @@
2013 +aa
2143 +aa
2014 diff -r 000000000000 -r f8035bb17114 f
2144 diff -r 000000000000 -r f8035bb17114 f
2015 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2145 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2016 +++ b/f Thu Jan 01 00:00:00 1970 +0000
2146 +++ b/f Thu Jan 01 00:00:00 1970 +0000
2017 @@ -0,0 +1,1 @@
2147 @@ -0,0 +1,1 @@
2018 +f
2148 +f
2019 # HG changeset patch
2149 # HG changeset patch
2020 # User test
2150 # User test
2021 # Date 0 0
2151 # Date 0 0
2022 # Thu Jan 01 00:00:00 1970 +0000
2152 # Thu Jan 01 00:00:00 1970 +0000
2023 # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92
2153 # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92
2024 # Parent f8035bb17114da16215af3436ec5222428ace8ee
2154 # Parent f8035bb17114da16215af3436ec5222428ace8ee
2025 copy a b
2155 copy a b
2026
2156
2027 diff -r f8035bb17114 -r 216d4c92cf98 b
2157 diff -r f8035bb17114 -r 216d4c92cf98 b
2028 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2158 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2029 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2159 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2030 @@ -0,0 +1,1 @@
2160 @@ -0,0 +1,1 @@
2031 +a
2161 +a
2032 diff -r f8035bb17114 -r 216d4c92cf98 g
2162 diff -r f8035bb17114 -r 216d4c92cf98 g
2033 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2163 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2034 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2164 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2035 @@ -0,0 +1,1 @@
2165 @@ -0,0 +1,1 @@
2036 +f
2166 +f
2037 # HG changeset patch
2167 # HG changeset patch
2038 # User test
2168 # User test
2039 # Date 0 0
2169 # Date 0 0
2040 # Thu Jan 01 00:00:00 1970 +0000
2170 # Thu Jan 01 00:00:00 1970 +0000
2041 # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3
2171 # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3
2042 # Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92
2172 # Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92
2043 mv b dir/b
2173 mv b dir/b
2044
2174
2045 diff -r 216d4c92cf98 -r bb573313a9e8 b
2175 diff -r 216d4c92cf98 -r bb573313a9e8 b
2046 --- a/b Thu Jan 01 00:00:00 1970 +0000
2176 --- a/b Thu Jan 01 00:00:00 1970 +0000
2047 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2177 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2048 @@ -1,1 +0,0 @@
2178 @@ -1,1 +0,0 @@
2049 -a
2179 -a
2050 diff -r 216d4c92cf98 -r bb573313a9e8 dir/b
2180 diff -r 216d4c92cf98 -r bb573313a9e8 dir/b
2051 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2181 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2052 +++ b/dir/b Thu Jan 01 00:00:00 1970 +0000
2182 +++ b/dir/b Thu Jan 01 00:00:00 1970 +0000
2053 @@ -0,0 +1,1 @@
2183 @@ -0,0 +1,1 @@
2054 +a
2184 +a
2055 diff -r 216d4c92cf98 -r bb573313a9e8 f
2185 diff -r 216d4c92cf98 -r bb573313a9e8 f
2056 --- a/f Thu Jan 01 00:00:00 1970 +0000
2186 --- a/f Thu Jan 01 00:00:00 1970 +0000
2057 +++ b/f Thu Jan 01 00:00:00 1970 +0000
2187 +++ b/f Thu Jan 01 00:00:00 1970 +0000
2058 @@ -1,1 +1,2 @@
2188 @@ -1,1 +1,2 @@
2059 f
2189 f
2060 +f
2190 +f
2061 diff -r 216d4c92cf98 -r bb573313a9e8 g
2191 diff -r 216d4c92cf98 -r bb573313a9e8 g
2062 --- a/g Thu Jan 01 00:00:00 1970 +0000
2192 --- a/g Thu Jan 01 00:00:00 1970 +0000
2063 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2193 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2064 @@ -1,1 +1,2 @@
2194 @@ -1,1 +1,2 @@
2065 f
2195 f
2066 +g
2196 +g
2067 # HG changeset patch
2197 # HG changeset patch
2068 # User test
2198 # User test
2069 # Date 0 0
2199 # Date 0 0
2070 # Thu Jan 01 00:00:00 1970 +0000
2200 # Thu Jan 01 00:00:00 1970 +0000
2071 # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2201 # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2072 # Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3
2202 # Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3
2073 mv a b; add d
2203 mv a b; add d
2074
2204
2075 diff -r bb573313a9e8 -r 5918b8d165d1 a
2205 diff -r bb573313a9e8 -r 5918b8d165d1 a
2076 --- a/a Thu Jan 01 00:00:00 1970 +0000
2206 --- a/a Thu Jan 01 00:00:00 1970 +0000
2077 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2207 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2078 @@ -1,1 +0,0 @@
2208 @@ -1,1 +0,0 @@
2079 -a
2209 -a
2080 diff -r bb573313a9e8 -r 5918b8d165d1 b
2210 diff -r bb573313a9e8 -r 5918b8d165d1 b
2081 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2211 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2082 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2212 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2083 @@ -0,0 +1,1 @@
2213 @@ -0,0 +1,1 @@
2084 +a
2214 +a
2085 diff -r bb573313a9e8 -r 5918b8d165d1 d
2215 diff -r bb573313a9e8 -r 5918b8d165d1 d
2086 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2216 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2087 +++ b/d Thu Jan 01 00:00:00 1970 +0000
2217 +++ b/d Thu Jan 01 00:00:00 1970 +0000
2088 @@ -0,0 +1,1 @@
2218 @@ -0,0 +1,1 @@
2089 +a
2219 +a
2090 diff -r bb573313a9e8 -r 5918b8d165d1 g
2220 diff -r bb573313a9e8 -r 5918b8d165d1 g
2091 --- a/g Thu Jan 01 00:00:00 1970 +0000
2221 --- a/g Thu Jan 01 00:00:00 1970 +0000
2092 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2222 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2093 @@ -1,2 +1,2 @@
2223 @@ -1,2 +1,2 @@
2094 f
2224 f
2095 -g
2225 -g
2096 +f
2226 +f
2097 # HG changeset patch
2227 # HG changeset patch
2098 # User test
2228 # User test
2099 # Date 0 0
2229 # Date 0 0
2100 # Thu Jan 01 00:00:00 1970 +0000
2230 # Thu Jan 01 00:00:00 1970 +0000
2101 # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260
2231 # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260
2102 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2232 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2103 mv dir/b e
2233 mv dir/b e
2104
2234
2105 diff -r 5918b8d165d1 -r 17d952250a9d dir/b
2235 diff -r 5918b8d165d1 -r 17d952250a9d dir/b
2106 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
2236 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
2107 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2237 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2108 @@ -1,1 +0,0 @@
2238 @@ -1,1 +0,0 @@
2109 -a
2239 -a
2110 diff -r 5918b8d165d1 -r 17d952250a9d e
2240 diff -r 5918b8d165d1 -r 17d952250a9d e
2111 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2241 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2112 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2242 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2113 @@ -0,0 +1,1 @@
2243 @@ -0,0 +1,1 @@
2114 +a
2244 +a
2115 # HG changeset patch
2245 # HG changeset patch
2116 # User test
2246 # User test
2117 # Date 0 0
2247 # Date 0 0
2118 # Thu Jan 01 00:00:00 1970 +0000
2248 # Thu Jan 01 00:00:00 1970 +0000
2119 # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b
2249 # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b
2120 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2250 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed
2121 add another e
2251 add another e
2122
2252
2123 diff -r 5918b8d165d1 -r 99b31f1c2782 e
2253 diff -r 5918b8d165d1 -r 99b31f1c2782 e
2124 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2254 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2125 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2255 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2126 @@ -0,0 +1,1 @@
2256 @@ -0,0 +1,1 @@
2127 +ee
2257 +ee
2128 # HG changeset patch
2258 # HG changeset patch
2129 # User test
2259 # User test
2130 # Date 0 0
2260 # Date 0 0
2131 # Thu Jan 01 00:00:00 1970 +0000
2261 # Thu Jan 01 00:00:00 1970 +0000
2132 # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73
2262 # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73
2133 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b
2263 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b
2134 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260
2264 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260
2135 merge 5 and 4
2265 merge 5 and 4
2136
2266
2137 diff -r 99b31f1c2782 -r fc281d8ff18d dir/b
2267 diff -r 99b31f1c2782 -r fc281d8ff18d dir/b
2138 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
2268 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
2139 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2269 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2140 @@ -1,1 +0,0 @@
2270 @@ -1,1 +0,0 @@
2141 -a
2271 -a
2142 diff -r 99b31f1c2782 -r fc281d8ff18d e
2272 diff -r 99b31f1c2782 -r fc281d8ff18d e
2143 --- a/e Thu Jan 01 00:00:00 1970 +0000
2273 --- a/e Thu Jan 01 00:00:00 1970 +0000
2144 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2274 +++ b/e Thu Jan 01 00:00:00 1970 +0000
2145 @@ -1,1 +1,1 @@
2275 @@ -1,1 +1,1 @@
2146 -ee
2276 -ee
2147 +merge
2277 +merge
2148 # HG changeset patch
2278 # HG changeset patch
2149 # User test
2279 # User test
2150 # Date 0 0
2280 # Date 0 0
2151 # Thu Jan 01 00:00:00 1970 +0000
2281 # Thu Jan 01 00:00:00 1970 +0000
2152 # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd
2282 # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd
2153 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73
2283 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73
2154 Added tag foo-bar for changeset fc281d8ff18d
2284 Added tag foo-bar for changeset fc281d8ff18d
2155
2285
2156 diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags
2286 diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags
2157 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2287 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2158 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2288 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2159 @@ -0,0 +1,1 @@
2289 @@ -0,0 +1,1 @@
2160 +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar
2290 +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar
2161 # HG changeset patch
2291 # HG changeset patch
2162 # User test
2292 # User test
2163 # Date 0 0
2293 # Date 0 0
2164 # Thu Jan 01 00:00:00 1970 +0000
2294 # Thu Jan 01 00:00:00 1970 +0000
2165 # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449
2295 # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449
2166 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73
2296 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73
2167 add g
2297 add g
2168
2298
2169 diff -r fc281d8ff18d -r 24c2e826ddeb g
2299 diff -r fc281d8ff18d -r 24c2e826ddeb g
2170 --- a/g Thu Jan 01 00:00:00 1970 +0000
2300 --- a/g Thu Jan 01 00:00:00 1970 +0000
2171 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2301 +++ b/g Thu Jan 01 00:00:00 1970 +0000
2172 @@ -1,2 +1,1 @@
2302 @@ -1,2 +1,1 @@
2173 -f
2303 -f
2174 -f
2304 -f
2175 +g
2305 +g
2176 $ testlog --follow -r6 -r8 -r5 -r7 -r4
2306 $ testlog --follow -r6 -r8 -r5 -r7 -r4
2177 ['6', '8', '5', '7', '4']
2307 ['6', '8', '5', '7', '4']
2178 (func
2308 (func
2179 (symbol 'descendants')
2309 (symbol 'descendants')
2180 (func
2310 (func
2181 (symbol 'rev')
2311 (symbol 'rev')
2182 (symbol '6')))
2312 (symbol '6')))
2313 <filteredset
2314 <baseset- [4, 5, 6, 7, 8]>,
2315 <generatorsetasc+>>
2183
2316
2184 Test --follow-first and forward --rev
2317 Test --follow-first and forward --rev
2185
2318
2186 $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
2319 $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
2187 ['6', '8', '5', '7', '4']
2320 ['6', '8', '5', '7', '4']
2188 (func
2321 (func
2189 (symbol '_firstdescendants')
2322 (symbol '_firstdescendants')
2190 (func
2323 (func
2191 (symbol 'rev')
2324 (symbol 'rev')
2192 (symbol '6')))
2325 (symbol '6')))
2326 <filteredset
2327 <baseset- [4, 5, 6, 7, 8]>,
2328 <generatorsetasc+>>
2193 --- log.nodes * (glob)
2329 --- log.nodes * (glob)
2194 +++ glog.nodes * (glob)
2330 +++ glog.nodes * (glob)
2195 @@ -1,3 +1,3 @@
2331 @@ -1,3 +1,3 @@
2196 -nodetag 6
2332 -nodetag 6
2197 nodetag 8
2333 nodetag 8
2198 nodetag 7
2334 nodetag 7
2199 +nodetag 6
2335 +nodetag 6
2200
2336
2201 Test --follow and backward --rev
2337 Test --follow and backward --rev
2202
2338
2203 $ testlog --follow -r6 -r5 -r7 -r8 -r4
2339 $ testlog --follow -r6 -r5 -r7 -r8 -r4
2204 ['6', '5', '7', '8', '4']
2340 ['6', '5', '7', '8', '4']
2205 (func
2341 (func
2206 (symbol 'ancestors')
2342 (symbol 'ancestors')
2207 (func
2343 (func
2208 (symbol 'rev')
2344 (symbol 'rev')
2209 (symbol '6')))
2345 (symbol '6')))
2346 <filteredset
2347 <baseset- [4, 5, 6, 7, 8]>,
2348 <generatorsetdesc+>>
2210
2349
2211 Test --follow-first and backward --rev
2350 Test --follow-first and backward --rev
2212
2351
2213 $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
2352 $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
2214 ['6', '5', '7', '8', '4']
2353 ['6', '5', '7', '8', '4']
2215 (func
2354 (func
2216 (symbol '_firstancestors')
2355 (symbol '_firstancestors')
2217 (func
2356 (func
2218 (symbol 'rev')
2357 (symbol 'rev')
2219 (symbol '6')))
2358 (symbol '6')))
2359 <filteredset
2360 <baseset- [4, 5, 6, 7, 8]>,
2361 <generatorsetdesc+>>
2220
2362
2221 Test --follow with --rev of graphlog extension
2363 Test --follow with --rev of graphlog extension
2222
2364
2223 $ hg --config extensions.graphlog= glog -qfr1
2365 $ hg --config extensions.graphlog= glog -qfr1
2224 o 1:216d4c92cf98
2366 o 1:216d4c92cf98
2225 |
2367 |
2226 o 0:f8035bb17114
2368 o 0:f8035bb17114
2227
2369
2228
2370
2229 Test subdir
2371 Test subdir
2230
2372
2231 $ hg up -q 3
2373 $ hg up -q 3
2232 $ cd dir
2374 $ cd dir
2233 $ testlog .
2375 $ testlog .
2234 []
2376 []
2235 (func
2377 (func
2236 (symbol '_matchfiles')
2378 (symbol '_matchfiles')
2237 (list
2379 (list
2238 (string 'r:')
2380 (string 'r:')
2239 (string 'd:relpath')
2381 (string 'd:relpath')
2240 (string 'p:.')))
2382 (string 'p:.')))
2383 <filteredset
2384 <spanset- 0:9>,
2385 <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=None>>
2241 $ testlog ../b
2386 $ testlog ../b
2242 []
2387 []
2243 (func
2388 (func
2244 (symbol 'filelog')
2389 (symbol 'filelog')
2245 (string '../b'))
2390 (string '../b'))
2391 <filteredset
2392 <spanset- 0:9>, set([1])>
2246 $ testlog -f ../b
2393 $ testlog -f ../b
2247 []
2394 []
2248 (func
2395 (func
2249 (symbol 'follow')
2396 (symbol 'follow')
2250 (string 'b'))
2397 (string 'b'))
2398 <filteredset
2399 <spanset- 0:4>,
2400 <generatorsetdesc+>>
2251 $ cd ..
2401 $ cd ..
2252
2402
2253 Test --hidden
2403 Test --hidden
2254 (enable obsolete)
2404 (enable obsolete)
2255
2405
2256 $ cat >> $HGRCPATH << EOF
2406 $ cat >> $HGRCPATH << EOF
2257 > [experimental]
2407 > [experimental]
2258 > evolution.createmarkers=True
2408 > evolution.createmarkers=True
2259 > EOF
2409 > EOF
2260
2410
2261 $ hg debugobsolete `hg id --debug -i -r 8`
2411 $ hg debugobsolete `hg id --debug -i -r 8`
2262 obsoleted 1 changesets
2412 obsoleted 1 changesets
2263 $ testlog
2413 $ testlog
2264 []
2414 []
2265 []
2415 []
2416 <spanset- 0:9>
2266 $ testlog --hidden
2417 $ testlog --hidden
2267 []
2418 []
2268 []
2419 []
2420 <spanset- 0:9>
2269 $ hg log -G --template '{rev} {desc}\n'
2421 $ hg log -G --template '{rev} {desc}\n'
2270 o 7 Added tag foo-bar for changeset fc281d8ff18d
2422 o 7 Added tag foo-bar for changeset fc281d8ff18d
2271 |
2423 |
2272 o 6 merge 5 and 4
2424 o 6 merge 5 and 4
2273 |\
2425 |\
2274 | o 5 add another e
2426 | o 5 add another e
2275 | |
2427 | |
2276 o | 4 mv dir/b e
2428 o | 4 mv dir/b e
2277 |/
2429 |/
2278 @ 3 mv a b; add d
2430 @ 3 mv a b; add d
2279 |
2431 |
2280 o 2 mv b dir/b
2432 o 2 mv b dir/b
2281 |
2433 |
2282 o 1 copy a b
2434 o 1 copy a b
2283 |
2435 |
2284 o 0 add a
2436 o 0 add a
2285
2437
2286
2438
2287 A template without trailing newline should do something sane
2439 A template without trailing newline should do something sane
2288
2440
2289 $ hg log -G -r ::2 --template '{rev} {desc}'
2441 $ hg log -G -r ::2 --template '{rev} {desc}'
2290 o 2 mv b dir/b
2442 o 2 mv b dir/b
2291 |
2443 |
2292 o 1 copy a b
2444 o 1 copy a b
2293 |
2445 |
2294 o 0 add a
2446 o 0 add a
2295
2447
2296
2448
2297 Extra newlines must be preserved
2449 Extra newlines must be preserved
2298
2450
2299 $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
2451 $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
2300 o
2452 o
2301 | 2 mv b dir/b
2453 | 2 mv b dir/b
2302 |
2454 |
2303 o
2455 o
2304 | 1 copy a b
2456 | 1 copy a b
2305 |
2457 |
2306 o
2458 o
2307 0 add a
2459 0 add a
2308
2460
2309
2461
2310 The almost-empty template should do something sane too ...
2462 The almost-empty template should do something sane too ...
2311
2463
2312 $ hg log -G -r ::2 --template '\n'
2464 $ hg log -G -r ::2 --template '\n'
2313 o
2465 o
2314 |
2466 |
2315 o
2467 o
2316 |
2468 |
2317 o
2469 o
2318
2470
2319
2471
2320 issue3772
2472 issue3772
2321
2473
2322 $ hg log -G -r :null
2474 $ hg log -G -r :null
2323 o changeset: 0:f8035bb17114
2475 o changeset: 0:f8035bb17114
2324 | user: test
2476 | user: test
2325 | date: Thu Jan 01 00:00:00 1970 +0000
2477 | date: Thu Jan 01 00:00:00 1970 +0000
2326 | summary: add a
2478 | summary: add a
2327 |
2479 |
2328 o changeset: -1:000000000000
2480 o changeset: -1:000000000000
2329 user:
2481 user:
2330 date: Thu Jan 01 00:00:00 1970 +0000
2482 date: Thu Jan 01 00:00:00 1970 +0000
2331
2483
2332 $ hg log -G -r null:null
2484 $ hg log -G -r null:null
2333 o changeset: -1:000000000000
2485 o changeset: -1:000000000000
2334 user:
2486 user:
2335 date: Thu Jan 01 00:00:00 1970 +0000
2487 date: Thu Jan 01 00:00:00 1970 +0000
2336
2488
2337
2489
2338 should not draw line down to null due to the magic of fullreposet
2490 should not draw line down to null due to the magic of fullreposet
2339
2491
2340 $ hg log -G -r 'all()' | tail -6
2492 $ hg log -G -r 'all()' | tail -6
2341 |
2493 |
2342 o changeset: 0:f8035bb17114
2494 o changeset: 0:f8035bb17114
2343 user: test
2495 user: test
2344 date: Thu Jan 01 00:00:00 1970 +0000
2496 date: Thu Jan 01 00:00:00 1970 +0000
2345 summary: add a
2497 summary: add a
2346
2498
2347
2499
2348 $ hg log -G -r 'branch(default)' | tail -6
2500 $ hg log -G -r 'branch(default)' | tail -6
2349 |
2501 |
2350 o changeset: 0:f8035bb17114
2502 o changeset: 0:f8035bb17114
2351 user: test
2503 user: test
2352 date: Thu Jan 01 00:00:00 1970 +0000
2504 date: Thu Jan 01 00:00:00 1970 +0000
2353 summary: add a
2505 summary: add a
2354
2506
2355
2507
2356 working-directory revision
2508 working-directory revision
2357
2509
2358 $ hg log -G -qr '. + wdir()'
2510 $ hg log -G -qr '. + wdir()'
2359 o 2147483647:ffffffffffff
2511 o 2147483647:ffffffffffff
2360 |
2512 |
2361 @ 3:5918b8d165d1
2513 @ 3:5918b8d165d1
2362 |
2514 |
2363 ~
2515 ~
2364
2516
2365 node template with changeset_printer:
2517 node template with changeset_printer:
2366
2518
2367 $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
2519 $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
2368 7 7:02dbb8e276b8
2520 7 7:02dbb8e276b8
2369 |
2521 |
2370 6 6:fc281d8ff18d
2522 6 6:fc281d8ff18d
2371 |\
2523 |\
2372 | ~
2524 | ~
2373 5 5:99b31f1c2782
2525 5 5:99b31f1c2782
2374 |
2526 |
2375 ~
2527 ~
2376
2528
2377 node template with changeset_templater (shared cache variable):
2529 node template with changeset_templater (shared cache variable):
2378
2530
2379 $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
2531 $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
2380 > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}'
2532 > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}'
2381 o 7 foo-bar+1
2533 o 7 foo-bar+1
2382 |
2534 |
2383 # 6 foo-bar+0
2535 # 6 foo-bar+0
2384 |\
2536 |\
2385 | ~
2537 | ~
2386 o 5 null+5
2538 o 5 null+5
2387 |
2539 |
2388 ~
2540 ~
2389
2541
2390 label() should just work in node template:
2542 label() should just work in node template:
2391
2543
2392 $ hg log -Gqr 7 --config extensions.color= --color=debug \
2544 $ hg log -Gqr 7 --config extensions.color= --color=debug \
2393 > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
2545 > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
2394 [branch.default|7] [log.node|7:02dbb8e276b8]
2546 [branch.default|7] [log.node|7:02dbb8e276b8]
2395 |
2547 |
2396 ~
2548 ~
2397
2549
2398 $ cd ..
2550 $ cd ..
2399
2551
2400 change graph edge styling
2552 change graph edge styling
2401
2553
2402 $ cd repo
2554 $ cd repo
2403 $ cat << EOF >> $HGRCPATH
2555 $ cat << EOF >> $HGRCPATH
2404 > [experimental]
2556 > [experimental]
2405 > graphstyle.parent = |
2557 > graphstyle.parent = |
2406 > graphstyle.grandparent = :
2558 > graphstyle.grandparent = :
2407 > graphstyle.missing =
2559 > graphstyle.missing =
2408 > EOF
2560 > EOF
2409 $ hg log -G -r 'file("a")' -m
2561 $ hg log -G -r 'file("a")' -m
2410 @ changeset: 36:08a19a744424
2562 @ changeset: 36:08a19a744424
2411 : branch: branch
2563 : branch: branch
2412 : tag: tip
2564 : tag: tip
2413 : parent: 35:9159c3644c5e
2565 : parent: 35:9159c3644c5e
2414 : parent: 35:9159c3644c5e
2566 : parent: 35:9159c3644c5e
2415 : user: test
2567 : user: test
2416 : date: Thu Jan 01 00:00:36 1970 +0000
2568 : date: Thu Jan 01 00:00:36 1970 +0000
2417 : summary: (36) buggy merge: identical parents
2569 : summary: (36) buggy merge: identical parents
2418 :
2570 :
2419 o changeset: 32:d06dffa21a31
2571 o changeset: 32:d06dffa21a31
2420 |\ parent: 27:886ed638191b
2572 |\ parent: 27:886ed638191b
2421 | : parent: 31:621d83e11f67
2573 | : parent: 31:621d83e11f67
2422 | : user: test
2574 | : user: test
2423 | : date: Thu Jan 01 00:00:32 1970 +0000
2575 | : date: Thu Jan 01 00:00:32 1970 +0000
2424 | : summary: (32) expand
2576 | : summary: (32) expand
2425 | :
2577 | :
2426 o : changeset: 31:621d83e11f67
2578 o : changeset: 31:621d83e11f67
2427 |\: parent: 21:d42a756af44d
2579 |\: parent: 21:d42a756af44d
2428 | : parent: 30:6e11cd4b648f
2580 | : parent: 30:6e11cd4b648f
2429 | : user: test
2581 | : user: test
2430 | : date: Thu Jan 01 00:00:31 1970 +0000
2582 | : date: Thu Jan 01 00:00:31 1970 +0000
2431 | : summary: (31) expand
2583 | : summary: (31) expand
2432 | :
2584 | :
2433 o : changeset: 30:6e11cd4b648f
2585 o : changeset: 30:6e11cd4b648f
2434 |\ \ parent: 28:44ecd0b9ae99
2586 |\ \ parent: 28:44ecd0b9ae99
2435 | ~ : parent: 29:cd9bb2be7593
2587 | ~ : parent: 29:cd9bb2be7593
2436 | : user: test
2588 | : user: test
2437 | : date: Thu Jan 01 00:00:30 1970 +0000
2589 | : date: Thu Jan 01 00:00:30 1970 +0000
2438 | : summary: (30) expand
2590 | : summary: (30) expand
2439 | /
2591 | /
2440 o : changeset: 28:44ecd0b9ae99
2592 o : changeset: 28:44ecd0b9ae99
2441 |\ \ parent: 1:6db2ef61d156
2593 |\ \ parent: 1:6db2ef61d156
2442 | ~ : parent: 26:7f25b6c2f0b9
2594 | ~ : parent: 26:7f25b6c2f0b9
2443 | : user: test
2595 | : user: test
2444 | : date: Thu Jan 01 00:00:28 1970 +0000
2596 | : date: Thu Jan 01 00:00:28 1970 +0000
2445 | : summary: (28) merge zero known
2597 | : summary: (28) merge zero known
2446 | /
2598 | /
2447 o : changeset: 26:7f25b6c2f0b9
2599 o : changeset: 26:7f25b6c2f0b9
2448 |\ \ parent: 18:1aa84d96232a
2600 |\ \ parent: 18:1aa84d96232a
2449 | | : parent: 25:91da8ed57247
2601 | | : parent: 25:91da8ed57247
2450 | | : user: test
2602 | | : user: test
2451 | | : date: Thu Jan 01 00:00:26 1970 +0000
2603 | | : date: Thu Jan 01 00:00:26 1970 +0000
2452 | | : summary: (26) merge one known; far right
2604 | | : summary: (26) merge one known; far right
2453 | | :
2605 | | :
2454 | o : changeset: 25:91da8ed57247
2606 | o : changeset: 25:91da8ed57247
2455 | |\: parent: 21:d42a756af44d
2607 | |\: parent: 21:d42a756af44d
2456 | | : parent: 24:a9c19a3d96b7
2608 | | : parent: 24:a9c19a3d96b7
2457 | | : user: test
2609 | | : user: test
2458 | | : date: Thu Jan 01 00:00:25 1970 +0000
2610 | | : date: Thu Jan 01 00:00:25 1970 +0000
2459 | | : summary: (25) merge one known; far left
2611 | | : summary: (25) merge one known; far left
2460 | | :
2612 | | :
2461 | o : changeset: 24:a9c19a3d96b7
2613 | o : changeset: 24:a9c19a3d96b7
2462 | |\ \ parent: 0:e6eb3150255d
2614 | |\ \ parent: 0:e6eb3150255d
2463 | | ~ : parent: 23:a01cddf0766d
2615 | | ~ : parent: 23:a01cddf0766d
2464 | | : user: test
2616 | | : user: test
2465 | | : date: Thu Jan 01 00:00:24 1970 +0000
2617 | | : date: Thu Jan 01 00:00:24 1970 +0000
2466 | | : summary: (24) merge one known; immediate right
2618 | | : summary: (24) merge one known; immediate right
2467 | | /
2619 | | /
2468 | o : changeset: 23:a01cddf0766d
2620 | o : changeset: 23:a01cddf0766d
2469 | |\ \ parent: 1:6db2ef61d156
2621 | |\ \ parent: 1:6db2ef61d156
2470 | | ~ : parent: 22:e0d9cccacb5d
2622 | | ~ : parent: 22:e0d9cccacb5d
2471 | | : user: test
2623 | | : user: test
2472 | | : date: Thu Jan 01 00:00:23 1970 +0000
2624 | | : date: Thu Jan 01 00:00:23 1970 +0000
2473 | | : summary: (23) merge one known; immediate left
2625 | | : summary: (23) merge one known; immediate left
2474 | | /
2626 | | /
2475 | o : changeset: 22:e0d9cccacb5d
2627 | o : changeset: 22:e0d9cccacb5d
2476 |/:/ parent: 18:1aa84d96232a
2628 |/:/ parent: 18:1aa84d96232a
2477 | : parent: 21:d42a756af44d
2629 | : parent: 21:d42a756af44d
2478 | : user: test
2630 | : user: test
2479 | : date: Thu Jan 01 00:00:22 1970 +0000
2631 | : date: Thu Jan 01 00:00:22 1970 +0000
2480 | : summary: (22) merge two known; one far left, one far right
2632 | : summary: (22) merge two known; one far left, one far right
2481 | :
2633 | :
2482 | o changeset: 21:d42a756af44d
2634 | o changeset: 21:d42a756af44d
2483 | |\ parent: 19:31ddc2c1573b
2635 | |\ parent: 19:31ddc2c1573b
2484 | | | parent: 20:d30ed6450e32
2636 | | | parent: 20:d30ed6450e32
2485 | | | user: test
2637 | | | user: test
2486 | | | date: Thu Jan 01 00:00:21 1970 +0000
2638 | | | date: Thu Jan 01 00:00:21 1970 +0000
2487 | | | summary: (21) expand
2639 | | | summary: (21) expand
2488 | | |
2640 | | |
2489 +---o changeset: 20:d30ed6450e32
2641 +---o changeset: 20:d30ed6450e32
2490 | | | parent: 0:e6eb3150255d
2642 | | | parent: 0:e6eb3150255d
2491 | | ~ parent: 18:1aa84d96232a
2643 | | ~ parent: 18:1aa84d96232a
2492 | | user: test
2644 | | user: test
2493 | | date: Thu Jan 01 00:00:20 1970 +0000
2645 | | date: Thu Jan 01 00:00:20 1970 +0000
2494 | | summary: (20) merge two known; two far right
2646 | | summary: (20) merge two known; two far right
2495 | |
2647 | |
2496 | o changeset: 19:31ddc2c1573b
2648 | o changeset: 19:31ddc2c1573b
2497 | |\ parent: 15:1dda3f72782d
2649 | |\ parent: 15:1dda3f72782d
2498 | | | parent: 17:44765d7c06e0
2650 | | | parent: 17:44765d7c06e0
2499 | | | user: test
2651 | | | user: test
2500 | | | date: Thu Jan 01 00:00:19 1970 +0000
2652 | | | date: Thu Jan 01 00:00:19 1970 +0000
2501 | | | summary: (19) expand
2653 | | | summary: (19) expand
2502 | | |
2654 | | |
2503 o | | changeset: 18:1aa84d96232a
2655 o | | changeset: 18:1aa84d96232a
2504 |\| | parent: 1:6db2ef61d156
2656 |\| | parent: 1:6db2ef61d156
2505 ~ | | parent: 15:1dda3f72782d
2657 ~ | | parent: 15:1dda3f72782d
2506 | | user: test
2658 | | user: test
2507 | | date: Thu Jan 01 00:00:18 1970 +0000
2659 | | date: Thu Jan 01 00:00:18 1970 +0000
2508 | | summary: (18) merge two known; two far left
2660 | | summary: (18) merge two known; two far left
2509 / /
2661 / /
2510 | o changeset: 17:44765d7c06e0
2662 | o changeset: 17:44765d7c06e0
2511 | |\ parent: 12:86b91144a6e9
2663 | |\ parent: 12:86b91144a6e9
2512 | | | parent: 16:3677d192927d
2664 | | | parent: 16:3677d192927d
2513 | | | user: test
2665 | | | user: test
2514 | | | date: Thu Jan 01 00:00:17 1970 +0000
2666 | | | date: Thu Jan 01 00:00:17 1970 +0000
2515 | | | summary: (17) expand
2667 | | | summary: (17) expand
2516 | | |
2668 | | |
2517 | | o changeset: 16:3677d192927d
2669 | | o changeset: 16:3677d192927d
2518 | | |\ parent: 0:e6eb3150255d
2670 | | |\ parent: 0:e6eb3150255d
2519 | | ~ ~ parent: 1:6db2ef61d156
2671 | | ~ ~ parent: 1:6db2ef61d156
2520 | | user: test
2672 | | user: test
2521 | | date: Thu Jan 01 00:00:16 1970 +0000
2673 | | date: Thu Jan 01 00:00:16 1970 +0000
2522 | | summary: (16) merge two known; one immediate right, one near right
2674 | | summary: (16) merge two known; one immediate right, one near right
2523 | |
2675 | |
2524 o | changeset: 15:1dda3f72782d
2676 o | changeset: 15:1dda3f72782d
2525 |\ \ parent: 13:22d8966a97e3
2677 |\ \ parent: 13:22d8966a97e3
2526 | | | parent: 14:8eac370358ef
2678 | | | parent: 14:8eac370358ef
2527 | | | user: test
2679 | | | user: test
2528 | | | date: Thu Jan 01 00:00:15 1970 +0000
2680 | | | date: Thu Jan 01 00:00:15 1970 +0000
2529 | | | summary: (15) expand
2681 | | | summary: (15) expand
2530 | | |
2682 | | |
2531 | o | changeset: 14:8eac370358ef
2683 | o | changeset: 14:8eac370358ef
2532 | |\| parent: 0:e6eb3150255d
2684 | |\| parent: 0:e6eb3150255d
2533 | ~ | parent: 12:86b91144a6e9
2685 | ~ | parent: 12:86b91144a6e9
2534 | | user: test
2686 | | user: test
2535 | | date: Thu Jan 01 00:00:14 1970 +0000
2687 | | date: Thu Jan 01 00:00:14 1970 +0000
2536 | | summary: (14) merge two known; one immediate right, one far right
2688 | | summary: (14) merge two known; one immediate right, one far right
2537 | /
2689 | /
2538 o | changeset: 13:22d8966a97e3
2690 o | changeset: 13:22d8966a97e3
2539 |\ \ parent: 9:7010c0af0a35
2691 |\ \ parent: 9:7010c0af0a35
2540 | | | parent: 11:832d76e6bdf2
2692 | | | parent: 11:832d76e6bdf2
2541 | | | user: test
2693 | | | user: test
2542 | | | date: Thu Jan 01 00:00:13 1970 +0000
2694 | | | date: Thu Jan 01 00:00:13 1970 +0000
2543 | | | summary: (13) expand
2695 | | | summary: (13) expand
2544 | | |
2696 | | |
2545 +---o changeset: 12:86b91144a6e9
2697 +---o changeset: 12:86b91144a6e9
2546 | | | parent: 1:6db2ef61d156
2698 | | | parent: 1:6db2ef61d156
2547 | | ~ parent: 9:7010c0af0a35
2699 | | ~ parent: 9:7010c0af0a35
2548 | | user: test
2700 | | user: test
2549 | | date: Thu Jan 01 00:00:12 1970 +0000
2701 | | date: Thu Jan 01 00:00:12 1970 +0000
2550 | | summary: (12) merge two known; one immediate right, one far left
2702 | | summary: (12) merge two known; one immediate right, one far left
2551 | |
2703 | |
2552 | o changeset: 11:832d76e6bdf2
2704 | o changeset: 11:832d76e6bdf2
2553 | |\ parent: 6:b105a072e251
2705 | |\ parent: 6:b105a072e251
2554 | | | parent: 10:74c64d036d72
2706 | | | parent: 10:74c64d036d72
2555 | | | user: test
2707 | | | user: test
2556 | | | date: Thu Jan 01 00:00:11 1970 +0000
2708 | | | date: Thu Jan 01 00:00:11 1970 +0000
2557 | | | summary: (11) expand
2709 | | | summary: (11) expand
2558 | | |
2710 | | |
2559 | | o changeset: 10:74c64d036d72
2711 | | o changeset: 10:74c64d036d72
2560 | |/| parent: 0:e6eb3150255d
2712 | |/| parent: 0:e6eb3150255d
2561 | | ~ parent: 6:b105a072e251
2713 | | ~ parent: 6:b105a072e251
2562 | | user: test
2714 | | user: test
2563 | | date: Thu Jan 01 00:00:10 1970 +0000
2715 | | date: Thu Jan 01 00:00:10 1970 +0000
2564 | | summary: (10) merge two known; one immediate left, one near right
2716 | | summary: (10) merge two known; one immediate left, one near right
2565 | |
2717 | |
2566 o | changeset: 9:7010c0af0a35
2718 o | changeset: 9:7010c0af0a35
2567 |\ \ parent: 7:b632bb1b1224
2719 |\ \ parent: 7:b632bb1b1224
2568 | | | parent: 8:7a0b11f71937
2720 | | | parent: 8:7a0b11f71937
2569 | | | user: test
2721 | | | user: test
2570 | | | date: Thu Jan 01 00:00:09 1970 +0000
2722 | | | date: Thu Jan 01 00:00:09 1970 +0000
2571 | | | summary: (9) expand
2723 | | | summary: (9) expand
2572 | | |
2724 | | |
2573 | o | changeset: 8:7a0b11f71937
2725 | o | changeset: 8:7a0b11f71937
2574 |/| | parent: 0:e6eb3150255d
2726 |/| | parent: 0:e6eb3150255d
2575 | ~ | parent: 7:b632bb1b1224
2727 | ~ | parent: 7:b632bb1b1224
2576 | | user: test
2728 | | user: test
2577 | | date: Thu Jan 01 00:00:08 1970 +0000
2729 | | date: Thu Jan 01 00:00:08 1970 +0000
2578 | | summary: (8) merge two known; one immediate left, one far right
2730 | | summary: (8) merge two known; one immediate left, one far right
2579 | /
2731 | /
2580 o | changeset: 7:b632bb1b1224
2732 o | changeset: 7:b632bb1b1224
2581 |\ \ parent: 2:3d9a33b8d1e1
2733 |\ \ parent: 2:3d9a33b8d1e1
2582 | ~ | parent: 5:4409d547b708
2734 | ~ | parent: 5:4409d547b708
2583 | | user: test
2735 | | user: test
2584 | | date: Thu Jan 01 00:00:07 1970 +0000
2736 | | date: Thu Jan 01 00:00:07 1970 +0000
2585 | | summary: (7) expand
2737 | | summary: (7) expand
2586 | /
2738 | /
2587 | o changeset: 6:b105a072e251
2739 | o changeset: 6:b105a072e251
2588 |/| parent: 2:3d9a33b8d1e1
2740 |/| parent: 2:3d9a33b8d1e1
2589 | ~ parent: 5:4409d547b708
2741 | ~ parent: 5:4409d547b708
2590 | user: test
2742 | user: test
2591 | date: Thu Jan 01 00:00:06 1970 +0000
2743 | date: Thu Jan 01 00:00:06 1970 +0000
2592 | summary: (6) merge two known; one immediate left, one far left
2744 | summary: (6) merge two known; one immediate left, one far left
2593 |
2745 |
2594 o changeset: 5:4409d547b708
2746 o changeset: 5:4409d547b708
2595 |\ parent: 3:27eef8ed80b4
2747 |\ parent: 3:27eef8ed80b4
2596 | ~ parent: 4:26a8bac39d9f
2748 | ~ parent: 4:26a8bac39d9f
2597 | user: test
2749 | user: test
2598 | date: Thu Jan 01 00:00:05 1970 +0000
2750 | date: Thu Jan 01 00:00:05 1970 +0000
2599 | summary: (5) expand
2751 | summary: (5) expand
2600 |
2752 |
2601 o changeset: 4:26a8bac39d9f
2753 o changeset: 4:26a8bac39d9f
2602 |\ parent: 1:6db2ef61d156
2754 |\ parent: 1:6db2ef61d156
2603 ~ ~ parent: 3:27eef8ed80b4
2755 ~ ~ parent: 3:27eef8ed80b4
2604 user: test
2756 user: test
2605 date: Thu Jan 01 00:00:04 1970 +0000
2757 date: Thu Jan 01 00:00:04 1970 +0000
2606 summary: (4) merge two known; one immediate left, one immediate right
2758 summary: (4) merge two known; one immediate left, one immediate right
2607
2759
2608
2760
2609 Setting HGPLAIN ignores graphmod styling:
2761 Setting HGPLAIN ignores graphmod styling:
2610
2762
2611 $ HGPLAIN=1 hg log -G -r 'file("a")' -m
2763 $ HGPLAIN=1 hg log -G -r 'file("a")' -m
2612 @ changeset: 36:08a19a744424
2764 @ changeset: 36:08a19a744424
2613 | branch: branch
2765 | branch: branch
2614 | tag: tip
2766 | tag: tip
2615 | parent: 35:9159c3644c5e
2767 | parent: 35:9159c3644c5e
2616 | parent: 35:9159c3644c5e
2768 | parent: 35:9159c3644c5e
2617 | user: test
2769 | user: test
2618 | date: Thu Jan 01 00:00:36 1970 +0000
2770 | date: Thu Jan 01 00:00:36 1970 +0000
2619 | summary: (36) buggy merge: identical parents
2771 | summary: (36) buggy merge: identical parents
2620 |
2772 |
2621 o changeset: 32:d06dffa21a31
2773 o changeset: 32:d06dffa21a31
2622 |\ parent: 27:886ed638191b
2774 |\ parent: 27:886ed638191b
2623 | | parent: 31:621d83e11f67
2775 | | parent: 31:621d83e11f67
2624 | | user: test
2776 | | user: test
2625 | | date: Thu Jan 01 00:00:32 1970 +0000
2777 | | date: Thu Jan 01 00:00:32 1970 +0000
2626 | | summary: (32) expand
2778 | | summary: (32) expand
2627 | |
2779 | |
2628 o | changeset: 31:621d83e11f67
2780 o | changeset: 31:621d83e11f67
2629 |\| parent: 21:d42a756af44d
2781 |\| parent: 21:d42a756af44d
2630 | | parent: 30:6e11cd4b648f
2782 | | parent: 30:6e11cd4b648f
2631 | | user: test
2783 | | user: test
2632 | | date: Thu Jan 01 00:00:31 1970 +0000
2784 | | date: Thu Jan 01 00:00:31 1970 +0000
2633 | | summary: (31) expand
2785 | | summary: (31) expand
2634 | |
2786 | |
2635 o | changeset: 30:6e11cd4b648f
2787 o | changeset: 30:6e11cd4b648f
2636 |\ \ parent: 28:44ecd0b9ae99
2788 |\ \ parent: 28:44ecd0b9ae99
2637 | | | parent: 29:cd9bb2be7593
2789 | | | parent: 29:cd9bb2be7593
2638 | | | user: test
2790 | | | user: test
2639 | | | date: Thu Jan 01 00:00:30 1970 +0000
2791 | | | date: Thu Jan 01 00:00:30 1970 +0000
2640 | | | summary: (30) expand
2792 | | | summary: (30) expand
2641 | | |
2793 | | |
2642 o | | changeset: 28:44ecd0b9ae99
2794 o | | changeset: 28:44ecd0b9ae99
2643 |\ \ \ parent: 1:6db2ef61d156
2795 |\ \ \ parent: 1:6db2ef61d156
2644 | | | | parent: 26:7f25b6c2f0b9
2796 | | | | parent: 26:7f25b6c2f0b9
2645 | | | | user: test
2797 | | | | user: test
2646 | | | | date: Thu Jan 01 00:00:28 1970 +0000
2798 | | | | date: Thu Jan 01 00:00:28 1970 +0000
2647 | | | | summary: (28) merge zero known
2799 | | | | summary: (28) merge zero known
2648 | | | |
2800 | | | |
2649 o | | | changeset: 26:7f25b6c2f0b9
2801 o | | | changeset: 26:7f25b6c2f0b9
2650 |\ \ \ \ parent: 18:1aa84d96232a
2802 |\ \ \ \ parent: 18:1aa84d96232a
2651 | | | | | parent: 25:91da8ed57247
2803 | | | | | parent: 25:91da8ed57247
2652 | | | | | user: test
2804 | | | | | user: test
2653 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
2805 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
2654 | | | | | summary: (26) merge one known; far right
2806 | | | | | summary: (26) merge one known; far right
2655 | | | | |
2807 | | | | |
2656 | o-----+ changeset: 25:91da8ed57247
2808 | o-----+ changeset: 25:91da8ed57247
2657 | | | | | parent: 21:d42a756af44d
2809 | | | | | parent: 21:d42a756af44d
2658 | | | | | parent: 24:a9c19a3d96b7
2810 | | | | | parent: 24:a9c19a3d96b7
2659 | | | | | user: test
2811 | | | | | user: test
2660 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
2812 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
2661 | | | | | summary: (25) merge one known; far left
2813 | | | | | summary: (25) merge one known; far left
2662 | | | | |
2814 | | | | |
2663 | o | | | changeset: 24:a9c19a3d96b7
2815 | o | | | changeset: 24:a9c19a3d96b7
2664 | |\ \ \ \ parent: 0:e6eb3150255d
2816 | |\ \ \ \ parent: 0:e6eb3150255d
2665 | | | | | | parent: 23:a01cddf0766d
2817 | | | | | | parent: 23:a01cddf0766d
2666 | | | | | | user: test
2818 | | | | | | user: test
2667 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
2819 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000
2668 | | | | | | summary: (24) merge one known; immediate right
2820 | | | | | | summary: (24) merge one known; immediate right
2669 | | | | | |
2821 | | | | | |
2670 | o---+ | | changeset: 23:a01cddf0766d
2822 | o---+ | | changeset: 23:a01cddf0766d
2671 | | | | | | parent: 1:6db2ef61d156
2823 | | | | | | parent: 1:6db2ef61d156
2672 | | | | | | parent: 22:e0d9cccacb5d
2824 | | | | | | parent: 22:e0d9cccacb5d
2673 | | | | | | user: test
2825 | | | | | | user: test
2674 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
2826 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000
2675 | | | | | | summary: (23) merge one known; immediate left
2827 | | | | | | summary: (23) merge one known; immediate left
2676 | | | | | |
2828 | | | | | |
2677 | o-------+ changeset: 22:e0d9cccacb5d
2829 | o-------+ changeset: 22:e0d9cccacb5d
2678 | | | | | | parent: 18:1aa84d96232a
2830 | | | | | | parent: 18:1aa84d96232a
2679 |/ / / / / parent: 21:d42a756af44d
2831 |/ / / / / parent: 21:d42a756af44d
2680 | | | | | user: test
2832 | | | | | user: test
2681 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
2833 | | | | | date: Thu Jan 01 00:00:22 1970 +0000
2682 | | | | | summary: (22) merge two known; one far left, one far right
2834 | | | | | summary: (22) merge two known; one far left, one far right
2683 | | | | |
2835 | | | | |
2684 | | | | o changeset: 21:d42a756af44d
2836 | | | | o changeset: 21:d42a756af44d
2685 | | | | |\ parent: 19:31ddc2c1573b
2837 | | | | |\ parent: 19:31ddc2c1573b
2686 | | | | | | parent: 20:d30ed6450e32
2838 | | | | | | parent: 20:d30ed6450e32
2687 | | | | | | user: test
2839 | | | | | | user: test
2688 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
2840 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000
2689 | | | | | | summary: (21) expand
2841 | | | | | | summary: (21) expand
2690 | | | | | |
2842 | | | | | |
2691 +-+-------o changeset: 20:d30ed6450e32
2843 +-+-------o changeset: 20:d30ed6450e32
2692 | | | | | parent: 0:e6eb3150255d
2844 | | | | | parent: 0:e6eb3150255d
2693 | | | | | parent: 18:1aa84d96232a
2845 | | | | | parent: 18:1aa84d96232a
2694 | | | | | user: test
2846 | | | | | user: test
2695 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
2847 | | | | | date: Thu Jan 01 00:00:20 1970 +0000
2696 | | | | | summary: (20) merge two known; two far right
2848 | | | | | summary: (20) merge two known; two far right
2697 | | | | |
2849 | | | | |
2698 | | | | o changeset: 19:31ddc2c1573b
2850 | | | | o changeset: 19:31ddc2c1573b
2699 | | | | |\ parent: 15:1dda3f72782d
2851 | | | | |\ parent: 15:1dda3f72782d
2700 | | | | | | parent: 17:44765d7c06e0
2852 | | | | | | parent: 17:44765d7c06e0
2701 | | | | | | user: test
2853 | | | | | | user: test
2702 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
2854 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000
2703 | | | | | | summary: (19) expand
2855 | | | | | | summary: (19) expand
2704 | | | | | |
2856 | | | | | |
2705 o---+---+ | changeset: 18:1aa84d96232a
2857 o---+---+ | changeset: 18:1aa84d96232a
2706 | | | | | parent: 1:6db2ef61d156
2858 | | | | | parent: 1:6db2ef61d156
2707 / / / / / parent: 15:1dda3f72782d
2859 / / / / / parent: 15:1dda3f72782d
2708 | | | | | user: test
2860 | | | | | user: test
2709 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
2861 | | | | | date: Thu Jan 01 00:00:18 1970 +0000
2710 | | | | | summary: (18) merge two known; two far left
2862 | | | | | summary: (18) merge two known; two far left
2711 | | | | |
2863 | | | | |
2712 | | | | o changeset: 17:44765d7c06e0
2864 | | | | o changeset: 17:44765d7c06e0
2713 | | | | |\ parent: 12:86b91144a6e9
2865 | | | | |\ parent: 12:86b91144a6e9
2714 | | | | | | parent: 16:3677d192927d
2866 | | | | | | parent: 16:3677d192927d
2715 | | | | | | user: test
2867 | | | | | | user: test
2716 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
2868 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000
2717 | | | | | | summary: (17) expand
2869 | | | | | | summary: (17) expand
2718 | | | | | |
2870 | | | | | |
2719 +-+-------o changeset: 16:3677d192927d
2871 +-+-------o changeset: 16:3677d192927d
2720 | | | | | parent: 0:e6eb3150255d
2872 | | | | | parent: 0:e6eb3150255d
2721 | | | | | parent: 1:6db2ef61d156
2873 | | | | | parent: 1:6db2ef61d156
2722 | | | | | user: test
2874 | | | | | user: test
2723 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
2875 | | | | | date: Thu Jan 01 00:00:16 1970 +0000
2724 | | | | | summary: (16) merge two known; one immediate right, one near right
2876 | | | | | summary: (16) merge two known; one immediate right, one near right
2725 | | | | |
2877 | | | | |
2726 | | | o | changeset: 15:1dda3f72782d
2878 | | | o | changeset: 15:1dda3f72782d
2727 | | | |\ \ parent: 13:22d8966a97e3
2879 | | | |\ \ parent: 13:22d8966a97e3
2728 | | | | | | parent: 14:8eac370358ef
2880 | | | | | | parent: 14:8eac370358ef
2729 | | | | | | user: test
2881 | | | | | | user: test
2730 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
2882 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000
2731 | | | | | | summary: (15) expand
2883 | | | | | | summary: (15) expand
2732 | | | | | |
2884 | | | | | |
2733 +-------o | changeset: 14:8eac370358ef
2885 +-------o | changeset: 14:8eac370358ef
2734 | | | | |/ parent: 0:e6eb3150255d
2886 | | | | |/ parent: 0:e6eb3150255d
2735 | | | | | parent: 12:86b91144a6e9
2887 | | | | | parent: 12:86b91144a6e9
2736 | | | | | user: test
2888 | | | | | user: test
2737 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
2889 | | | | | date: Thu Jan 01 00:00:14 1970 +0000
2738 | | | | | summary: (14) merge two known; one immediate right, one far right
2890 | | | | | summary: (14) merge two known; one immediate right, one far right
2739 | | | | |
2891 | | | | |
2740 | | | o | changeset: 13:22d8966a97e3
2892 | | | o | changeset: 13:22d8966a97e3
2741 | | | |\ \ parent: 9:7010c0af0a35
2893 | | | |\ \ parent: 9:7010c0af0a35
2742 | | | | | | parent: 11:832d76e6bdf2
2894 | | | | | | parent: 11:832d76e6bdf2
2743 | | | | | | user: test
2895 | | | | | | user: test
2744 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
2896 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000
2745 | | | | | | summary: (13) expand
2897 | | | | | | summary: (13) expand
2746 | | | | | |
2898 | | | | | |
2747 | +---+---o changeset: 12:86b91144a6e9
2899 | +---+---o changeset: 12:86b91144a6e9
2748 | | | | | parent: 1:6db2ef61d156
2900 | | | | | parent: 1:6db2ef61d156
2749 | | | | | parent: 9:7010c0af0a35
2901 | | | | | parent: 9:7010c0af0a35
2750 | | | | | user: test
2902 | | | | | user: test
2751 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
2903 | | | | | date: Thu Jan 01 00:00:12 1970 +0000
2752 | | | | | summary: (12) merge two known; one immediate right, one far left
2904 | | | | | summary: (12) merge two known; one immediate right, one far left
2753 | | | | |
2905 | | | | |
2754 | | | | o changeset: 11:832d76e6bdf2
2906 | | | | o changeset: 11:832d76e6bdf2
2755 | | | | |\ parent: 6:b105a072e251
2907 | | | | |\ parent: 6:b105a072e251
2756 | | | | | | parent: 10:74c64d036d72
2908 | | | | | | parent: 10:74c64d036d72
2757 | | | | | | user: test
2909 | | | | | | user: test
2758 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
2910 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000
2759 | | | | | | summary: (11) expand
2911 | | | | | | summary: (11) expand
2760 | | | | | |
2912 | | | | | |
2761 +---------o changeset: 10:74c64d036d72
2913 +---------o changeset: 10:74c64d036d72
2762 | | | | |/ parent: 0:e6eb3150255d
2914 | | | | |/ parent: 0:e6eb3150255d
2763 | | | | | parent: 6:b105a072e251
2915 | | | | | parent: 6:b105a072e251
2764 | | | | | user: test
2916 | | | | | user: test
2765 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
2917 | | | | | date: Thu Jan 01 00:00:10 1970 +0000
2766 | | | | | summary: (10) merge two known; one immediate left, one near right
2918 | | | | | summary: (10) merge two known; one immediate left, one near right
2767 | | | | |
2919 | | | | |
2768 | | | o | changeset: 9:7010c0af0a35
2920 | | | o | changeset: 9:7010c0af0a35
2769 | | | |\ \ parent: 7:b632bb1b1224
2921 | | | |\ \ parent: 7:b632bb1b1224
2770 | | | | | | parent: 8:7a0b11f71937
2922 | | | | | | parent: 8:7a0b11f71937
2771 | | | | | | user: test
2923 | | | | | | user: test
2772 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
2924 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000
2773 | | | | | | summary: (9) expand
2925 | | | | | | summary: (9) expand
2774 | | | | | |
2926 | | | | | |
2775 +-------o | changeset: 8:7a0b11f71937
2927 +-------o | changeset: 8:7a0b11f71937
2776 | | | |/ / parent: 0:e6eb3150255d
2928 | | | |/ / parent: 0:e6eb3150255d
2777 | | | | | parent: 7:b632bb1b1224
2929 | | | | | parent: 7:b632bb1b1224
2778 | | | | | user: test
2930 | | | | | user: test
2779 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
2931 | | | | | date: Thu Jan 01 00:00:08 1970 +0000
2780 | | | | | summary: (8) merge two known; one immediate left, one far right
2932 | | | | | summary: (8) merge two known; one immediate left, one far right
2781 | | | | |
2933 | | | | |
2782 | | | o | changeset: 7:b632bb1b1224
2934 | | | o | changeset: 7:b632bb1b1224
2783 | | | |\ \ parent: 2:3d9a33b8d1e1
2935 | | | |\ \ parent: 2:3d9a33b8d1e1
2784 | | | | | | parent: 5:4409d547b708
2936 | | | | | | parent: 5:4409d547b708
2785 | | | | | | user: test
2937 | | | | | | user: test
2786 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
2938 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000
2787 | | | | | | summary: (7) expand
2939 | | | | | | summary: (7) expand
2788 | | | | | |
2940 | | | | | |
2789 | | | +---o changeset: 6:b105a072e251
2941 | | | +---o changeset: 6:b105a072e251
2790 | | | | |/ parent: 2:3d9a33b8d1e1
2942 | | | | |/ parent: 2:3d9a33b8d1e1
2791 | | | | | parent: 5:4409d547b708
2943 | | | | | parent: 5:4409d547b708
2792 | | | | | user: test
2944 | | | | | user: test
2793 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
2945 | | | | | date: Thu Jan 01 00:00:06 1970 +0000
2794 | | | | | summary: (6) merge two known; one immediate left, one far left
2946 | | | | | summary: (6) merge two known; one immediate left, one far left
2795 | | | | |
2947 | | | | |
2796 | | | o | changeset: 5:4409d547b708
2948 | | | o | changeset: 5:4409d547b708
2797 | | | |\ \ parent: 3:27eef8ed80b4
2949 | | | |\ \ parent: 3:27eef8ed80b4
2798 | | | | | | parent: 4:26a8bac39d9f
2950 | | | | | | parent: 4:26a8bac39d9f
2799 | | | | | | user: test
2951 | | | | | | user: test
2800 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
2952 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000
2801 | | | | | | summary: (5) expand
2953 | | | | | | summary: (5) expand
2802 | | | | | |
2954 | | | | | |
2803 | +---o | | changeset: 4:26a8bac39d9f
2955 | +---o | | changeset: 4:26a8bac39d9f
2804 | | | |/ / parent: 1:6db2ef61d156
2956 | | | |/ / parent: 1:6db2ef61d156
2805 | | | | | parent: 3:27eef8ed80b4
2957 | | | | | parent: 3:27eef8ed80b4
2806 | | | | | user: test
2958 | | | | | user: test
2807 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
2959 | | | | | date: Thu Jan 01 00:00:04 1970 +0000
2808 | | | | | summary: (4) merge two known; one immediate left, one immediate right
2960 | | | | | summary: (4) merge two known; one immediate left, one immediate right
2809 | | | | |
2961 | | | | |
2810
2962
2811 .. unless HGPLAINEXCEPT=graph is set:
2963 .. unless HGPLAINEXCEPT=graph is set:
2812
2964
2813 $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
2965 $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
2814 @ changeset: 36:08a19a744424
2966 @ changeset: 36:08a19a744424
2815 : branch: branch
2967 : branch: branch
2816 : tag: tip
2968 : tag: tip
2817 : parent: 35:9159c3644c5e
2969 : parent: 35:9159c3644c5e
2818 : parent: 35:9159c3644c5e
2970 : parent: 35:9159c3644c5e
2819 : user: test
2971 : user: test
2820 : date: Thu Jan 01 00:00:36 1970 +0000
2972 : date: Thu Jan 01 00:00:36 1970 +0000
2821 : summary: (36) buggy merge: identical parents
2973 : summary: (36) buggy merge: identical parents
2822 :
2974 :
2823 o changeset: 32:d06dffa21a31
2975 o changeset: 32:d06dffa21a31
2824 |\ parent: 27:886ed638191b
2976 |\ parent: 27:886ed638191b
2825 | : parent: 31:621d83e11f67
2977 | : parent: 31:621d83e11f67
2826 | : user: test
2978 | : user: test
2827 | : date: Thu Jan 01 00:00:32 1970 +0000
2979 | : date: Thu Jan 01 00:00:32 1970 +0000
2828 | : summary: (32) expand
2980 | : summary: (32) expand
2829 | :
2981 | :
2830 o : changeset: 31:621d83e11f67
2982 o : changeset: 31:621d83e11f67
2831 |\: parent: 21:d42a756af44d
2983 |\: parent: 21:d42a756af44d
2832 | : parent: 30:6e11cd4b648f
2984 | : parent: 30:6e11cd4b648f
2833 | : user: test
2985 | : user: test
2834 | : date: Thu Jan 01 00:00:31 1970 +0000
2986 | : date: Thu Jan 01 00:00:31 1970 +0000
2835 | : summary: (31) expand
2987 | : summary: (31) expand
2836 | :
2988 | :
2837 o : changeset: 30:6e11cd4b648f
2989 o : changeset: 30:6e11cd4b648f
2838 |\ \ parent: 28:44ecd0b9ae99
2990 |\ \ parent: 28:44ecd0b9ae99
2839 | ~ : parent: 29:cd9bb2be7593
2991 | ~ : parent: 29:cd9bb2be7593
2840 | : user: test
2992 | : user: test
2841 | : date: Thu Jan 01 00:00:30 1970 +0000
2993 | : date: Thu Jan 01 00:00:30 1970 +0000
2842 | : summary: (30) expand
2994 | : summary: (30) expand
2843 | /
2995 | /
2844 o : changeset: 28:44ecd0b9ae99
2996 o : changeset: 28:44ecd0b9ae99
2845 |\ \ parent: 1:6db2ef61d156
2997 |\ \ parent: 1:6db2ef61d156
2846 | ~ : parent: 26:7f25b6c2f0b9
2998 | ~ : parent: 26:7f25b6c2f0b9
2847 | : user: test
2999 | : user: test
2848 | : date: Thu Jan 01 00:00:28 1970 +0000
3000 | : date: Thu Jan 01 00:00:28 1970 +0000
2849 | : summary: (28) merge zero known
3001 | : summary: (28) merge zero known
2850 | /
3002 | /
2851 o : changeset: 26:7f25b6c2f0b9
3003 o : changeset: 26:7f25b6c2f0b9
2852 |\ \ parent: 18:1aa84d96232a
3004 |\ \ parent: 18:1aa84d96232a
2853 | | : parent: 25:91da8ed57247
3005 | | : parent: 25:91da8ed57247
2854 | | : user: test
3006 | | : user: test
2855 | | : date: Thu Jan 01 00:00:26 1970 +0000
3007 | | : date: Thu Jan 01 00:00:26 1970 +0000
2856 | | : summary: (26) merge one known; far right
3008 | | : summary: (26) merge one known; far right
2857 | | :
3009 | | :
2858 | o : changeset: 25:91da8ed57247
3010 | o : changeset: 25:91da8ed57247
2859 | |\: parent: 21:d42a756af44d
3011 | |\: parent: 21:d42a756af44d
2860 | | : parent: 24:a9c19a3d96b7
3012 | | : parent: 24:a9c19a3d96b7
2861 | | : user: test
3013 | | : user: test
2862 | | : date: Thu Jan 01 00:00:25 1970 +0000
3014 | | : date: Thu Jan 01 00:00:25 1970 +0000
2863 | | : summary: (25) merge one known; far left
3015 | | : summary: (25) merge one known; far left
2864 | | :
3016 | | :
2865 | o : changeset: 24:a9c19a3d96b7
3017 | o : changeset: 24:a9c19a3d96b7
2866 | |\ \ parent: 0:e6eb3150255d
3018 | |\ \ parent: 0:e6eb3150255d
2867 | | ~ : parent: 23:a01cddf0766d
3019 | | ~ : parent: 23:a01cddf0766d
2868 | | : user: test
3020 | | : user: test
2869 | | : date: Thu Jan 01 00:00:24 1970 +0000
3021 | | : date: Thu Jan 01 00:00:24 1970 +0000
2870 | | : summary: (24) merge one known; immediate right
3022 | | : summary: (24) merge one known; immediate right
2871 | | /
3023 | | /
2872 | o : changeset: 23:a01cddf0766d
3024 | o : changeset: 23:a01cddf0766d
2873 | |\ \ parent: 1:6db2ef61d156
3025 | |\ \ parent: 1:6db2ef61d156
2874 | | ~ : parent: 22:e0d9cccacb5d
3026 | | ~ : parent: 22:e0d9cccacb5d
2875 | | : user: test
3027 | | : user: test
2876 | | : date: Thu Jan 01 00:00:23 1970 +0000
3028 | | : date: Thu Jan 01 00:00:23 1970 +0000
2877 | | : summary: (23) merge one known; immediate left
3029 | | : summary: (23) merge one known; immediate left
2878 | | /
3030 | | /
2879 | o : changeset: 22:e0d9cccacb5d
3031 | o : changeset: 22:e0d9cccacb5d
2880 |/:/ parent: 18:1aa84d96232a
3032 |/:/ parent: 18:1aa84d96232a
2881 | : parent: 21:d42a756af44d
3033 | : parent: 21:d42a756af44d
2882 | : user: test
3034 | : user: test
2883 | : date: Thu Jan 01 00:00:22 1970 +0000
3035 | : date: Thu Jan 01 00:00:22 1970 +0000
2884 | : summary: (22) merge two known; one far left, one far right
3036 | : summary: (22) merge two known; one far left, one far right
2885 | :
3037 | :
2886 | o changeset: 21:d42a756af44d
3038 | o changeset: 21:d42a756af44d
2887 | |\ parent: 19:31ddc2c1573b
3039 | |\ parent: 19:31ddc2c1573b
2888 | | | parent: 20:d30ed6450e32
3040 | | | parent: 20:d30ed6450e32
2889 | | | user: test
3041 | | | user: test
2890 | | | date: Thu Jan 01 00:00:21 1970 +0000
3042 | | | date: Thu Jan 01 00:00:21 1970 +0000
2891 | | | summary: (21) expand
3043 | | | summary: (21) expand
2892 | | |
3044 | | |
2893 +---o changeset: 20:d30ed6450e32
3045 +---o changeset: 20:d30ed6450e32
2894 | | | parent: 0:e6eb3150255d
3046 | | | parent: 0:e6eb3150255d
2895 | | ~ parent: 18:1aa84d96232a
3047 | | ~ parent: 18:1aa84d96232a
2896 | | user: test
3048 | | user: test
2897 | | date: Thu Jan 01 00:00:20 1970 +0000
3049 | | date: Thu Jan 01 00:00:20 1970 +0000
2898 | | summary: (20) merge two known; two far right
3050 | | summary: (20) merge two known; two far right
2899 | |
3051 | |
2900 | o changeset: 19:31ddc2c1573b
3052 | o changeset: 19:31ddc2c1573b
2901 | |\ parent: 15:1dda3f72782d
3053 | |\ parent: 15:1dda3f72782d
2902 | | | parent: 17:44765d7c06e0
3054 | | | parent: 17:44765d7c06e0
2903 | | | user: test
3055 | | | user: test
2904 | | | date: Thu Jan 01 00:00:19 1970 +0000
3056 | | | date: Thu Jan 01 00:00:19 1970 +0000
2905 | | | summary: (19) expand
3057 | | | summary: (19) expand
2906 | | |
3058 | | |
2907 o | | changeset: 18:1aa84d96232a
3059 o | | changeset: 18:1aa84d96232a
2908 |\| | parent: 1:6db2ef61d156
3060 |\| | parent: 1:6db2ef61d156
2909 ~ | | parent: 15:1dda3f72782d
3061 ~ | | parent: 15:1dda3f72782d
2910 | | user: test
3062 | | user: test
2911 | | date: Thu Jan 01 00:00:18 1970 +0000
3063 | | date: Thu Jan 01 00:00:18 1970 +0000
2912 | | summary: (18) merge two known; two far left
3064 | | summary: (18) merge two known; two far left
2913 / /
3065 / /
2914 | o changeset: 17:44765d7c06e0
3066 | o changeset: 17:44765d7c06e0
2915 | |\ parent: 12:86b91144a6e9
3067 | |\ parent: 12:86b91144a6e9
2916 | | | parent: 16:3677d192927d
3068 | | | parent: 16:3677d192927d
2917 | | | user: test
3069 | | | user: test
2918 | | | date: Thu Jan 01 00:00:17 1970 +0000
3070 | | | date: Thu Jan 01 00:00:17 1970 +0000
2919 | | | summary: (17) expand
3071 | | | summary: (17) expand
2920 | | |
3072 | | |
2921 | | o changeset: 16:3677d192927d
3073 | | o changeset: 16:3677d192927d
2922 | | |\ parent: 0:e6eb3150255d
3074 | | |\ parent: 0:e6eb3150255d
2923 | | ~ ~ parent: 1:6db2ef61d156
3075 | | ~ ~ parent: 1:6db2ef61d156
2924 | | user: test
3076 | | user: test
2925 | | date: Thu Jan 01 00:00:16 1970 +0000
3077 | | date: Thu Jan 01 00:00:16 1970 +0000
2926 | | summary: (16) merge two known; one immediate right, one near right
3078 | | summary: (16) merge two known; one immediate right, one near right
2927 | |
3079 | |
2928 o | changeset: 15:1dda3f72782d
3080 o | changeset: 15:1dda3f72782d
2929 |\ \ parent: 13:22d8966a97e3
3081 |\ \ parent: 13:22d8966a97e3
2930 | | | parent: 14:8eac370358ef
3082 | | | parent: 14:8eac370358ef
2931 | | | user: test
3083 | | | user: test
2932 | | | date: Thu Jan 01 00:00:15 1970 +0000
3084 | | | date: Thu Jan 01 00:00:15 1970 +0000
2933 | | | summary: (15) expand
3085 | | | summary: (15) expand
2934 | | |
3086 | | |
2935 | o | changeset: 14:8eac370358ef
3087 | o | changeset: 14:8eac370358ef
2936 | |\| parent: 0:e6eb3150255d
3088 | |\| parent: 0:e6eb3150255d
2937 | ~ | parent: 12:86b91144a6e9
3089 | ~ | parent: 12:86b91144a6e9
2938 | | user: test
3090 | | user: test
2939 | | date: Thu Jan 01 00:00:14 1970 +0000
3091 | | date: Thu Jan 01 00:00:14 1970 +0000
2940 | | summary: (14) merge two known; one immediate right, one far right
3092 | | summary: (14) merge two known; one immediate right, one far right
2941 | /
3093 | /
2942 o | changeset: 13:22d8966a97e3
3094 o | changeset: 13:22d8966a97e3
2943 |\ \ parent: 9:7010c0af0a35
3095 |\ \ parent: 9:7010c0af0a35
2944 | | | parent: 11:832d76e6bdf2
3096 | | | parent: 11:832d76e6bdf2
2945 | | | user: test
3097 | | | user: test
2946 | | | date: Thu Jan 01 00:00:13 1970 +0000
3098 | | | date: Thu Jan 01 00:00:13 1970 +0000
2947 | | | summary: (13) expand
3099 | | | summary: (13) expand
2948 | | |
3100 | | |
2949 +---o changeset: 12:86b91144a6e9
3101 +---o changeset: 12:86b91144a6e9
2950 | | | parent: 1:6db2ef61d156
3102 | | | parent: 1:6db2ef61d156
2951 | | ~ parent: 9:7010c0af0a35
3103 | | ~ parent: 9:7010c0af0a35
2952 | | user: test
3104 | | user: test
2953 | | date: Thu Jan 01 00:00:12 1970 +0000
3105 | | date: Thu Jan 01 00:00:12 1970 +0000
2954 | | summary: (12) merge two known; one immediate right, one far left
3106 | | summary: (12) merge two known; one immediate right, one far left
2955 | |
3107 | |
2956 | o changeset: 11:832d76e6bdf2
3108 | o changeset: 11:832d76e6bdf2
2957 | |\ parent: 6:b105a072e251
3109 | |\ parent: 6:b105a072e251
2958 | | | parent: 10:74c64d036d72
3110 | | | parent: 10:74c64d036d72
2959 | | | user: test
3111 | | | user: test
2960 | | | date: Thu Jan 01 00:00:11 1970 +0000
3112 | | | date: Thu Jan 01 00:00:11 1970 +0000
2961 | | | summary: (11) expand
3113 | | | summary: (11) expand
2962 | | |
3114 | | |
2963 | | o changeset: 10:74c64d036d72
3115 | | o changeset: 10:74c64d036d72
2964 | |/| parent: 0:e6eb3150255d
3116 | |/| parent: 0:e6eb3150255d
2965 | | ~ parent: 6:b105a072e251
3117 | | ~ parent: 6:b105a072e251
2966 | | user: test
3118 | | user: test
2967 | | date: Thu Jan 01 00:00:10 1970 +0000
3119 | | date: Thu Jan 01 00:00:10 1970 +0000
2968 | | summary: (10) merge two known; one immediate left, one near right
3120 | | summary: (10) merge two known; one immediate left, one near right
2969 | |
3121 | |
2970 o | changeset: 9:7010c0af0a35
3122 o | changeset: 9:7010c0af0a35
2971 |\ \ parent: 7:b632bb1b1224
3123 |\ \ parent: 7:b632bb1b1224
2972 | | | parent: 8:7a0b11f71937
3124 | | | parent: 8:7a0b11f71937
2973 | | | user: test
3125 | | | user: test
2974 | | | date: Thu Jan 01 00:00:09 1970 +0000
3126 | | | date: Thu Jan 01 00:00:09 1970 +0000
2975 | | | summary: (9) expand
3127 | | | summary: (9) expand
2976 | | |
3128 | | |
2977 | o | changeset: 8:7a0b11f71937
3129 | o | changeset: 8:7a0b11f71937
2978 |/| | parent: 0:e6eb3150255d
3130 |/| | parent: 0:e6eb3150255d
2979 | ~ | parent: 7:b632bb1b1224
3131 | ~ | parent: 7:b632bb1b1224
2980 | | user: test
3132 | | user: test
2981 | | date: Thu Jan 01 00:00:08 1970 +0000
3133 | | date: Thu Jan 01 00:00:08 1970 +0000
2982 | | summary: (8) merge two known; one immediate left, one far right
3134 | | summary: (8) merge two known; one immediate left, one far right
2983 | /
3135 | /
2984 o | changeset: 7:b632bb1b1224
3136 o | changeset: 7:b632bb1b1224
2985 |\ \ parent: 2:3d9a33b8d1e1
3137 |\ \ parent: 2:3d9a33b8d1e1
2986 | ~ | parent: 5:4409d547b708
3138 | ~ | parent: 5:4409d547b708
2987 | | user: test
3139 | | user: test
2988 | | date: Thu Jan 01 00:00:07 1970 +0000
3140 | | date: Thu Jan 01 00:00:07 1970 +0000
2989 | | summary: (7) expand
3141 | | summary: (7) expand
2990 | /
3142 | /
2991 | o changeset: 6:b105a072e251
3143 | o changeset: 6:b105a072e251
2992 |/| parent: 2:3d9a33b8d1e1
3144 |/| parent: 2:3d9a33b8d1e1
2993 | ~ parent: 5:4409d547b708
3145 | ~ parent: 5:4409d547b708
2994 | user: test
3146 | user: test
2995 | date: Thu Jan 01 00:00:06 1970 +0000
3147 | date: Thu Jan 01 00:00:06 1970 +0000
2996 | summary: (6) merge two known; one immediate left, one far left
3148 | summary: (6) merge two known; one immediate left, one far left
2997 |
3149 |
2998 o changeset: 5:4409d547b708
3150 o changeset: 5:4409d547b708
2999 |\ parent: 3:27eef8ed80b4
3151 |\ parent: 3:27eef8ed80b4
3000 | ~ parent: 4:26a8bac39d9f
3152 | ~ parent: 4:26a8bac39d9f
3001 | user: test
3153 | user: test
3002 | date: Thu Jan 01 00:00:05 1970 +0000
3154 | date: Thu Jan 01 00:00:05 1970 +0000
3003 | summary: (5) expand
3155 | summary: (5) expand
3004 |
3156 |
3005 o changeset: 4:26a8bac39d9f
3157 o changeset: 4:26a8bac39d9f
3006 |\ parent: 1:6db2ef61d156
3158 |\ parent: 1:6db2ef61d156
3007 ~ ~ parent: 3:27eef8ed80b4
3159 ~ ~ parent: 3:27eef8ed80b4
3008 user: test
3160 user: test
3009 date: Thu Jan 01 00:00:04 1970 +0000
3161 date: Thu Jan 01 00:00:04 1970 +0000
3010 summary: (4) merge two known; one immediate left, one immediate right
3162 summary: (4) merge two known; one immediate left, one immediate right
3011
3163
3012 Draw only part of a grandparent line differently with "<N><char>"; only the
3164 Draw only part of a grandparent line differently with "<N><char>"; only the
3013 last N lines (for positive N) or everything but the first N lines (for
3165 last N lines (for positive N) or everything but the first N lines (for
3014 negative N) along the current node use the style, the rest of the edge uses
3166 negative N) along the current node use the style, the rest of the edge uses
3015 the parent edge styling.
3167 the parent edge styling.
3016
3168
3017 Last 3 lines:
3169 Last 3 lines:
3018
3170
3019 $ cat << EOF >> $HGRCPATH
3171 $ cat << EOF >> $HGRCPATH
3020 > [experimental]
3172 > [experimental]
3021 > graphstyle.parent = !
3173 > graphstyle.parent = !
3022 > graphstyle.grandparent = 3.
3174 > graphstyle.grandparent = 3.
3023 > graphstyle.missing =
3175 > graphstyle.missing =
3024 > EOF
3176 > EOF
3025 $ hg log -G -r '36:18 & file("a")' -m
3177 $ hg log -G -r '36:18 & file("a")' -m
3026 @ changeset: 36:08a19a744424
3178 @ changeset: 36:08a19a744424
3027 ! branch: branch
3179 ! branch: branch
3028 ! tag: tip
3180 ! tag: tip
3029 ! parent: 35:9159c3644c5e
3181 ! parent: 35:9159c3644c5e
3030 ! parent: 35:9159c3644c5e
3182 ! parent: 35:9159c3644c5e
3031 ! user: test
3183 ! user: test
3032 . date: Thu Jan 01 00:00:36 1970 +0000
3184 . date: Thu Jan 01 00:00:36 1970 +0000
3033 . summary: (36) buggy merge: identical parents
3185 . summary: (36) buggy merge: identical parents
3034 .
3186 .
3035 o changeset: 32:d06dffa21a31
3187 o changeset: 32:d06dffa21a31
3036 !\ parent: 27:886ed638191b
3188 !\ parent: 27:886ed638191b
3037 ! ! parent: 31:621d83e11f67
3189 ! ! parent: 31:621d83e11f67
3038 ! ! user: test
3190 ! ! user: test
3039 ! . date: Thu Jan 01 00:00:32 1970 +0000
3191 ! . date: Thu Jan 01 00:00:32 1970 +0000
3040 ! . summary: (32) expand
3192 ! . summary: (32) expand
3041 ! .
3193 ! .
3042 o ! changeset: 31:621d83e11f67
3194 o ! changeset: 31:621d83e11f67
3043 !\! parent: 21:d42a756af44d
3195 !\! parent: 21:d42a756af44d
3044 ! ! parent: 30:6e11cd4b648f
3196 ! ! parent: 30:6e11cd4b648f
3045 ! ! user: test
3197 ! ! user: test
3046 ! ! date: Thu Jan 01 00:00:31 1970 +0000
3198 ! ! date: Thu Jan 01 00:00:31 1970 +0000
3047 ! ! summary: (31) expand
3199 ! ! summary: (31) expand
3048 ! !
3200 ! !
3049 o ! changeset: 30:6e11cd4b648f
3201 o ! changeset: 30:6e11cd4b648f
3050 !\ \ parent: 28:44ecd0b9ae99
3202 !\ \ parent: 28:44ecd0b9ae99
3051 ! ~ ! parent: 29:cd9bb2be7593
3203 ! ~ ! parent: 29:cd9bb2be7593
3052 ! ! user: test
3204 ! ! user: test
3053 ! ! date: Thu Jan 01 00:00:30 1970 +0000
3205 ! ! date: Thu Jan 01 00:00:30 1970 +0000
3054 ! ! summary: (30) expand
3206 ! ! summary: (30) expand
3055 ! /
3207 ! /
3056 o ! changeset: 28:44ecd0b9ae99
3208 o ! changeset: 28:44ecd0b9ae99
3057 !\ \ parent: 1:6db2ef61d156
3209 !\ \ parent: 1:6db2ef61d156
3058 ! ~ ! parent: 26:7f25b6c2f0b9
3210 ! ~ ! parent: 26:7f25b6c2f0b9
3059 ! ! user: test
3211 ! ! user: test
3060 ! ! date: Thu Jan 01 00:00:28 1970 +0000
3212 ! ! date: Thu Jan 01 00:00:28 1970 +0000
3061 ! ! summary: (28) merge zero known
3213 ! ! summary: (28) merge zero known
3062 ! /
3214 ! /
3063 o ! changeset: 26:7f25b6c2f0b9
3215 o ! changeset: 26:7f25b6c2f0b9
3064 !\ \ parent: 18:1aa84d96232a
3216 !\ \ parent: 18:1aa84d96232a
3065 ! ! ! parent: 25:91da8ed57247
3217 ! ! ! parent: 25:91da8ed57247
3066 ! ! ! user: test
3218 ! ! ! user: test
3067 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000
3219 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000
3068 ! ! ! summary: (26) merge one known; far right
3220 ! ! ! summary: (26) merge one known; far right
3069 ! ! !
3221 ! ! !
3070 ! o ! changeset: 25:91da8ed57247
3222 ! o ! changeset: 25:91da8ed57247
3071 ! !\! parent: 21:d42a756af44d
3223 ! !\! parent: 21:d42a756af44d
3072 ! ! ! parent: 24:a9c19a3d96b7
3224 ! ! ! parent: 24:a9c19a3d96b7
3073 ! ! ! user: test
3225 ! ! ! user: test
3074 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000
3226 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000
3075 ! ! ! summary: (25) merge one known; far left
3227 ! ! ! summary: (25) merge one known; far left
3076 ! ! !
3228 ! ! !
3077 ! o ! changeset: 24:a9c19a3d96b7
3229 ! o ! changeset: 24:a9c19a3d96b7
3078 ! !\ \ parent: 0:e6eb3150255d
3230 ! !\ \ parent: 0:e6eb3150255d
3079 ! ! ~ ! parent: 23:a01cddf0766d
3231 ! ! ~ ! parent: 23:a01cddf0766d
3080 ! ! ! user: test
3232 ! ! ! user: test
3081 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000
3233 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000
3082 ! ! ! summary: (24) merge one known; immediate right
3234 ! ! ! summary: (24) merge one known; immediate right
3083 ! ! /
3235 ! ! /
3084 ! o ! changeset: 23:a01cddf0766d
3236 ! o ! changeset: 23:a01cddf0766d
3085 ! !\ \ parent: 1:6db2ef61d156
3237 ! !\ \ parent: 1:6db2ef61d156
3086 ! ! ~ ! parent: 22:e0d9cccacb5d
3238 ! ! ~ ! parent: 22:e0d9cccacb5d
3087 ! ! ! user: test
3239 ! ! ! user: test
3088 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000
3240 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000
3089 ! ! ! summary: (23) merge one known; immediate left
3241 ! ! ! summary: (23) merge one known; immediate left
3090 ! ! /
3242 ! ! /
3091 ! o ! changeset: 22:e0d9cccacb5d
3243 ! o ! changeset: 22:e0d9cccacb5d
3092 !/!/ parent: 18:1aa84d96232a
3244 !/!/ parent: 18:1aa84d96232a
3093 ! ! parent: 21:d42a756af44d
3245 ! ! parent: 21:d42a756af44d
3094 ! ! user: test
3246 ! ! user: test
3095 ! ! date: Thu Jan 01 00:00:22 1970 +0000
3247 ! ! date: Thu Jan 01 00:00:22 1970 +0000
3096 ! ! summary: (22) merge two known; one far left, one far right
3248 ! ! summary: (22) merge two known; one far left, one far right
3097 ! !
3249 ! !
3098 ! o changeset: 21:d42a756af44d
3250 ! o changeset: 21:d42a756af44d
3099 ! !\ parent: 19:31ddc2c1573b
3251 ! !\ parent: 19:31ddc2c1573b
3100 ! ! ! parent: 20:d30ed6450e32
3252 ! ! ! parent: 20:d30ed6450e32
3101 ! ! ! user: test
3253 ! ! ! user: test
3102 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
3254 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
3103 ! ! ! summary: (21) expand
3255 ! ! ! summary: (21) expand
3104 ! ! !
3256 ! ! !
3105 +---o changeset: 20:d30ed6450e32
3257 +---o changeset: 20:d30ed6450e32
3106 ! ! | parent: 0:e6eb3150255d
3258 ! ! | parent: 0:e6eb3150255d
3107 ! ! ~ parent: 18:1aa84d96232a
3259 ! ! ~ parent: 18:1aa84d96232a
3108 ! ! user: test
3260 ! ! user: test
3109 ! ! date: Thu Jan 01 00:00:20 1970 +0000
3261 ! ! date: Thu Jan 01 00:00:20 1970 +0000
3110 ! ! summary: (20) merge two known; two far right
3262 ! ! summary: (20) merge two known; two far right
3111 ! !
3263 ! !
3112 ! o changeset: 19:31ddc2c1573b
3264 ! o changeset: 19:31ddc2c1573b
3113 ! |\ parent: 15:1dda3f72782d
3265 ! |\ parent: 15:1dda3f72782d
3114 ! ~ ~ parent: 17:44765d7c06e0
3266 ! ~ ~ parent: 17:44765d7c06e0
3115 ! user: test
3267 ! user: test
3116 ! date: Thu Jan 01 00:00:19 1970 +0000
3268 ! date: Thu Jan 01 00:00:19 1970 +0000
3117 ! summary: (19) expand
3269 ! summary: (19) expand
3118 !
3270 !
3119 o changeset: 18:1aa84d96232a
3271 o changeset: 18:1aa84d96232a
3120 |\ parent: 1:6db2ef61d156
3272 |\ parent: 1:6db2ef61d156
3121 ~ ~ parent: 15:1dda3f72782d
3273 ~ ~ parent: 15:1dda3f72782d
3122 user: test
3274 user: test
3123 date: Thu Jan 01 00:00:18 1970 +0000
3275 date: Thu Jan 01 00:00:18 1970 +0000
3124 summary: (18) merge two known; two far left
3276 summary: (18) merge two known; two far left
3125
3277
3126 All but the first 3 lines:
3278 All but the first 3 lines:
3127
3279
3128 $ cat << EOF >> $HGRCPATH
3280 $ cat << EOF >> $HGRCPATH
3129 > [experimental]
3281 > [experimental]
3130 > graphstyle.parent = !
3282 > graphstyle.parent = !
3131 > graphstyle.grandparent = -3.
3283 > graphstyle.grandparent = -3.
3132 > graphstyle.missing =
3284 > graphstyle.missing =
3133 > EOF
3285 > EOF
3134 $ hg log -G -r '36:18 & file("a")' -m
3286 $ hg log -G -r '36:18 & file("a")' -m
3135 @ changeset: 36:08a19a744424
3287 @ changeset: 36:08a19a744424
3136 ! branch: branch
3288 ! branch: branch
3137 ! tag: tip
3289 ! tag: tip
3138 . parent: 35:9159c3644c5e
3290 . parent: 35:9159c3644c5e
3139 . parent: 35:9159c3644c5e
3291 . parent: 35:9159c3644c5e
3140 . user: test
3292 . user: test
3141 . date: Thu Jan 01 00:00:36 1970 +0000
3293 . date: Thu Jan 01 00:00:36 1970 +0000
3142 . summary: (36) buggy merge: identical parents
3294 . summary: (36) buggy merge: identical parents
3143 .
3295 .
3144 o changeset: 32:d06dffa21a31
3296 o changeset: 32:d06dffa21a31
3145 !\ parent: 27:886ed638191b
3297 !\ parent: 27:886ed638191b
3146 ! ! parent: 31:621d83e11f67
3298 ! ! parent: 31:621d83e11f67
3147 ! . user: test
3299 ! . user: test
3148 ! . date: Thu Jan 01 00:00:32 1970 +0000
3300 ! . date: Thu Jan 01 00:00:32 1970 +0000
3149 ! . summary: (32) expand
3301 ! . summary: (32) expand
3150 ! .
3302 ! .
3151 o ! changeset: 31:621d83e11f67
3303 o ! changeset: 31:621d83e11f67
3152 !\! parent: 21:d42a756af44d
3304 !\! parent: 21:d42a756af44d
3153 ! ! parent: 30:6e11cd4b648f
3305 ! ! parent: 30:6e11cd4b648f
3154 ! ! user: test
3306 ! ! user: test
3155 ! ! date: Thu Jan 01 00:00:31 1970 +0000
3307 ! ! date: Thu Jan 01 00:00:31 1970 +0000
3156 ! ! summary: (31) expand
3308 ! ! summary: (31) expand
3157 ! !
3309 ! !
3158 o ! changeset: 30:6e11cd4b648f
3310 o ! changeset: 30:6e11cd4b648f
3159 !\ \ parent: 28:44ecd0b9ae99
3311 !\ \ parent: 28:44ecd0b9ae99
3160 ! ~ ! parent: 29:cd9bb2be7593
3312 ! ~ ! parent: 29:cd9bb2be7593
3161 ! ! user: test
3313 ! ! user: test
3162 ! ! date: Thu Jan 01 00:00:30 1970 +0000
3314 ! ! date: Thu Jan 01 00:00:30 1970 +0000
3163 ! ! summary: (30) expand
3315 ! ! summary: (30) expand
3164 ! /
3316 ! /
3165 o ! changeset: 28:44ecd0b9ae99
3317 o ! changeset: 28:44ecd0b9ae99
3166 !\ \ parent: 1:6db2ef61d156
3318 !\ \ parent: 1:6db2ef61d156
3167 ! ~ ! parent: 26:7f25b6c2f0b9
3319 ! ~ ! parent: 26:7f25b6c2f0b9
3168 ! ! user: test
3320 ! ! user: test
3169 ! ! date: Thu Jan 01 00:00:28 1970 +0000
3321 ! ! date: Thu Jan 01 00:00:28 1970 +0000
3170 ! ! summary: (28) merge zero known
3322 ! ! summary: (28) merge zero known
3171 ! /
3323 ! /
3172 o ! changeset: 26:7f25b6c2f0b9
3324 o ! changeset: 26:7f25b6c2f0b9
3173 !\ \ parent: 18:1aa84d96232a
3325 !\ \ parent: 18:1aa84d96232a
3174 ! ! ! parent: 25:91da8ed57247
3326 ! ! ! parent: 25:91da8ed57247
3175 ! ! ! user: test
3327 ! ! ! user: test
3176 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000
3328 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000
3177 ! ! ! summary: (26) merge one known; far right
3329 ! ! ! summary: (26) merge one known; far right
3178 ! ! !
3330 ! ! !
3179 ! o ! changeset: 25:91da8ed57247
3331 ! o ! changeset: 25:91da8ed57247
3180 ! !\! parent: 21:d42a756af44d
3332 ! !\! parent: 21:d42a756af44d
3181 ! ! ! parent: 24:a9c19a3d96b7
3333 ! ! ! parent: 24:a9c19a3d96b7
3182 ! ! ! user: test
3334 ! ! ! user: test
3183 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000
3335 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000
3184 ! ! ! summary: (25) merge one known; far left
3336 ! ! ! summary: (25) merge one known; far left
3185 ! ! !
3337 ! ! !
3186 ! o ! changeset: 24:a9c19a3d96b7
3338 ! o ! changeset: 24:a9c19a3d96b7
3187 ! !\ \ parent: 0:e6eb3150255d
3339 ! !\ \ parent: 0:e6eb3150255d
3188 ! ! ~ ! parent: 23:a01cddf0766d
3340 ! ! ~ ! parent: 23:a01cddf0766d
3189 ! ! ! user: test
3341 ! ! ! user: test
3190 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000
3342 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000
3191 ! ! ! summary: (24) merge one known; immediate right
3343 ! ! ! summary: (24) merge one known; immediate right
3192 ! ! /
3344 ! ! /
3193 ! o ! changeset: 23:a01cddf0766d
3345 ! o ! changeset: 23:a01cddf0766d
3194 ! !\ \ parent: 1:6db2ef61d156
3346 ! !\ \ parent: 1:6db2ef61d156
3195 ! ! ~ ! parent: 22:e0d9cccacb5d
3347 ! ! ~ ! parent: 22:e0d9cccacb5d
3196 ! ! ! user: test
3348 ! ! ! user: test
3197 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000
3349 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000
3198 ! ! ! summary: (23) merge one known; immediate left
3350 ! ! ! summary: (23) merge one known; immediate left
3199 ! ! /
3351 ! ! /
3200 ! o ! changeset: 22:e0d9cccacb5d
3352 ! o ! changeset: 22:e0d9cccacb5d
3201 !/!/ parent: 18:1aa84d96232a
3353 !/!/ parent: 18:1aa84d96232a
3202 ! ! parent: 21:d42a756af44d
3354 ! ! parent: 21:d42a756af44d
3203 ! ! user: test
3355 ! ! user: test
3204 ! ! date: Thu Jan 01 00:00:22 1970 +0000
3356 ! ! date: Thu Jan 01 00:00:22 1970 +0000
3205 ! ! summary: (22) merge two known; one far left, one far right
3357 ! ! summary: (22) merge two known; one far left, one far right
3206 ! !
3358 ! !
3207 ! o changeset: 21:d42a756af44d
3359 ! o changeset: 21:d42a756af44d
3208 ! !\ parent: 19:31ddc2c1573b
3360 ! !\ parent: 19:31ddc2c1573b
3209 ! ! ! parent: 20:d30ed6450e32
3361 ! ! ! parent: 20:d30ed6450e32
3210 ! ! ! user: test
3362 ! ! ! user: test
3211 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
3363 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
3212 ! ! ! summary: (21) expand
3364 ! ! ! summary: (21) expand
3213 ! ! !
3365 ! ! !
3214 +---o changeset: 20:d30ed6450e32
3366 +---o changeset: 20:d30ed6450e32
3215 ! ! | parent: 0:e6eb3150255d
3367 ! ! | parent: 0:e6eb3150255d
3216 ! ! ~ parent: 18:1aa84d96232a
3368 ! ! ~ parent: 18:1aa84d96232a
3217 ! ! user: test
3369 ! ! user: test
3218 ! ! date: Thu Jan 01 00:00:20 1970 +0000
3370 ! ! date: Thu Jan 01 00:00:20 1970 +0000
3219 ! ! summary: (20) merge two known; two far right
3371 ! ! summary: (20) merge two known; two far right
3220 ! !
3372 ! !
3221 ! o changeset: 19:31ddc2c1573b
3373 ! o changeset: 19:31ddc2c1573b
3222 ! |\ parent: 15:1dda3f72782d
3374 ! |\ parent: 15:1dda3f72782d
3223 ! ~ ~ parent: 17:44765d7c06e0
3375 ! ~ ~ parent: 17:44765d7c06e0
3224 ! user: test
3376 ! user: test
3225 ! date: Thu Jan 01 00:00:19 1970 +0000
3377 ! date: Thu Jan 01 00:00:19 1970 +0000
3226 ! summary: (19) expand
3378 ! summary: (19) expand
3227 !
3379 !
3228 o changeset: 18:1aa84d96232a
3380 o changeset: 18:1aa84d96232a
3229 |\ parent: 1:6db2ef61d156
3381 |\ parent: 1:6db2ef61d156
3230 ~ ~ parent: 15:1dda3f72782d
3382 ~ ~ parent: 15:1dda3f72782d
3231 user: test
3383 user: test
3232 date: Thu Jan 01 00:00:18 1970 +0000
3384 date: Thu Jan 01 00:00:18 1970 +0000
3233 summary: (18) merge two known; two far left
3385 summary: (18) merge two known; two far left
3234
3386
3235 $ cd ..
3387 $ cd ..
3236
3388
3237 Change graph shorten, test better with graphstyle.missing not none
3389 Change graph shorten, test better with graphstyle.missing not none
3238
3390
3239 $ cd repo
3391 $ cd repo
3240 $ cat << EOF >> $HGRCPATH
3392 $ cat << EOF >> $HGRCPATH
3241 > [experimental]
3393 > [experimental]
3242 > graphstyle.parent = |
3394 > graphstyle.parent = |
3243 > graphstyle.grandparent = :
3395 > graphstyle.grandparent = :
3244 > graphstyle.missing = '
3396 > graphstyle.missing = '
3245 > graphshorten = true
3397 > graphshorten = true
3246 > EOF
3398 > EOF
3247 $ hg log -G -r 'file("a")' -m -T '{rev} {desc}'
3399 $ hg log -G -r 'file("a")' -m -T '{rev} {desc}'
3248 @ 36 (36) buggy merge: identical parents
3400 @ 36 (36) buggy merge: identical parents
3249 o 32 (32) expand
3401 o 32 (32) expand
3250 |\
3402 |\
3251 o : 31 (31) expand
3403 o : 31 (31) expand
3252 |\:
3404 |\:
3253 o : 30 (30) expand
3405 o : 30 (30) expand
3254 |\ \
3406 |\ \
3255 o \ \ 28 (28) merge zero known
3407 o \ \ 28 (28) merge zero known
3256 |\ \ \
3408 |\ \ \
3257 o \ \ \ 26 (26) merge one known; far right
3409 o \ \ \ 26 (26) merge one known; far right
3258 |\ \ \ \
3410 |\ \ \ \
3259 | o-----+ 25 (25) merge one known; far left
3411 | o-----+ 25 (25) merge one known; far left
3260 | o ' ' : 24 (24) merge one known; immediate right
3412 | o ' ' : 24 (24) merge one known; immediate right
3261 | |\ \ \ \
3413 | |\ \ \ \
3262 | o---+ ' : 23 (23) merge one known; immediate left
3414 | o---+ ' : 23 (23) merge one known; immediate left
3263 | o-------+ 22 (22) merge two known; one far left, one far right
3415 | o-------+ 22 (22) merge two known; one far left, one far right
3264 |/ / / / /
3416 |/ / / / /
3265 | ' ' ' o 21 (21) expand
3417 | ' ' ' o 21 (21) expand
3266 | ' ' ' |\
3418 | ' ' ' |\
3267 +-+-------o 20 (20) merge two known; two far right
3419 +-+-------o 20 (20) merge two known; two far right
3268 | ' ' ' o 19 (19) expand
3420 | ' ' ' o 19 (19) expand
3269 | ' ' ' |\
3421 | ' ' ' |\
3270 o---+---+ | 18 (18) merge two known; two far left
3422 o---+---+ | 18 (18) merge two known; two far left
3271 / / / / /
3423 / / / / /
3272 ' ' ' | o 17 (17) expand
3424 ' ' ' | o 17 (17) expand
3273 ' ' ' | |\
3425 ' ' ' | |\
3274 +-+-------o 16 (16) merge two known; one immediate right, one near right
3426 +-+-------o 16 (16) merge two known; one immediate right, one near right
3275 ' ' ' o | 15 (15) expand
3427 ' ' ' o | 15 (15) expand
3276 ' ' ' |\ \
3428 ' ' ' |\ \
3277 +-------o | 14 (14) merge two known; one immediate right, one far right
3429 +-------o | 14 (14) merge two known; one immediate right, one far right
3278 ' ' ' | |/
3430 ' ' ' | |/
3279 ' ' ' o | 13 (13) expand
3431 ' ' ' o | 13 (13) expand
3280 ' ' ' |\ \
3432 ' ' ' |\ \
3281 ' +---+---o 12 (12) merge two known; one immediate right, one far left
3433 ' +---+---o 12 (12) merge two known; one immediate right, one far left
3282 ' ' ' | o 11 (11) expand
3434 ' ' ' | o 11 (11) expand
3283 ' ' ' | |\
3435 ' ' ' | |\
3284 +---------o 10 (10) merge two known; one immediate left, one near right
3436 +---------o 10 (10) merge two known; one immediate left, one near right
3285 ' ' ' | |/
3437 ' ' ' | |/
3286 ' ' ' o | 9 (9) expand
3438 ' ' ' o | 9 (9) expand
3287 ' ' ' |\ \
3439 ' ' ' |\ \
3288 +-------o | 8 (8) merge two known; one immediate left, one far right
3440 +-------o | 8 (8) merge two known; one immediate left, one far right
3289 ' ' ' |/ /
3441 ' ' ' |/ /
3290 ' ' ' o | 7 (7) expand
3442 ' ' ' o | 7 (7) expand
3291 ' ' ' |\ \
3443 ' ' ' |\ \
3292 ' ' ' +---o 6 (6) merge two known; one immediate left, one far left
3444 ' ' ' +---o 6 (6) merge two known; one immediate left, one far left
3293 ' ' ' | '/
3445 ' ' ' | '/
3294 ' ' ' o ' 5 (5) expand
3446 ' ' ' o ' 5 (5) expand
3295 ' ' ' |\ \
3447 ' ' ' |\ \
3296 ' +---o ' ' 4 (4) merge two known; one immediate left, one immediate right
3448 ' +---o ' ' 4 (4) merge two known; one immediate left, one immediate right
3297 ' ' ' '/ /
3449 ' ' ' '/ /
3298
3450
3299 behavior with newlines
3451 behavior with newlines
3300
3452
3301 $ hg log -G -r ::2 -T '{rev} {desc}'
3453 $ hg log -G -r ::2 -T '{rev} {desc}'
3302 o 2 (2) collapse
3454 o 2 (2) collapse
3303 o 1 (1) collapse
3455 o 1 (1) collapse
3304 o 0 (0) root
3456 o 0 (0) root
3305
3457
3306 $ hg log -G -r ::2 -T '{rev} {desc}\n'
3458 $ hg log -G -r ::2 -T '{rev} {desc}\n'
3307 o 2 (2) collapse
3459 o 2 (2) collapse
3308 o 1 (1) collapse
3460 o 1 (1) collapse
3309 o 0 (0) root
3461 o 0 (0) root
3310
3462
3311 $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
3463 $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
3312 o 2 (2) collapse
3464 o 2 (2) collapse
3313 |
3465 |
3314 o 1 (1) collapse
3466 o 1 (1) collapse
3315 |
3467 |
3316 o 0 (0) root
3468 o 0 (0) root
3317
3469
3318
3470
3319 $ hg log -G -r ::2 -T '\n{rev} {desc}'
3471 $ hg log -G -r ::2 -T '\n{rev} {desc}'
3320 o
3472 o
3321 | 2 (2) collapse
3473 | 2 (2) collapse
3322 o
3474 o
3323 | 1 (1) collapse
3475 | 1 (1) collapse
3324 o
3476 o
3325 0 (0) root
3477 0 (0) root
3326
3478
3327 $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
3479 $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
3328 o 2 (2) collapse
3480 o 2 (2) collapse
3329 |
3481 |
3330 |
3482 |
3331 o 1 (1) collapse
3483 o 1 (1) collapse
3332 |
3484 |
3333 |
3485 |
3334 o 0 (0) root
3486 o 0 (0) root
3335
3487
3336
3488
3337 $ cd ..
3489 $ cd ..
3338
3490
3339 When inserting extra line nodes to handle more than 2 parents, ensure that
3491 When inserting extra line nodes to handle more than 2 parents, ensure that
3340 the right node styles are used (issue5174):
3492 the right node styles are used (issue5174):
3341
3493
3342 $ hg init repo-issue5174
3494 $ hg init repo-issue5174
3343 $ cd repo-issue5174
3495 $ cd repo-issue5174
3344 $ echo a > f0
3496 $ echo a > f0
3345 $ hg ci -Aqm 0
3497 $ hg ci -Aqm 0
3346 $ echo a > f1
3498 $ echo a > f1
3347 $ hg ci -Aqm 1
3499 $ hg ci -Aqm 1
3348 $ echo a > f2
3500 $ echo a > f2
3349 $ hg ci -Aqm 2
3501 $ hg ci -Aqm 2
3350 $ hg co ".^"
3502 $ hg co ".^"
3351 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3503 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3352 $ echo a > f3
3504 $ echo a > f3
3353 $ hg ci -Aqm 3
3505 $ hg ci -Aqm 3
3354 $ hg co ".^^"
3506 $ hg co ".^^"
3355 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
3507 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
3356 $ echo a > f4
3508 $ echo a > f4
3357 $ hg ci -Aqm 4
3509 $ hg ci -Aqm 4
3358 $ hg merge -r 2
3510 $ hg merge -r 2
3359 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3511 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3360 (branch merge, don't forget to commit)
3512 (branch merge, don't forget to commit)
3361 $ hg ci -qm 5
3513 $ hg ci -qm 5
3362 $ hg merge -r 3
3514 $ hg merge -r 3
3363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3515 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3364 (branch merge, don't forget to commit)
3516 (branch merge, don't forget to commit)
3365 $ hg ci -qm 6
3517 $ hg ci -qm 6
3366 $ hg log -G -r '0 | 1 | 2 | 6'
3518 $ hg log -G -r '0 | 1 | 2 | 6'
3367 @ changeset: 6:851fe89689ad
3519 @ changeset: 6:851fe89689ad
3368 :\ tag: tip
3520 :\ tag: tip
3369 : : parent: 5:4f1e3cf15f5d
3521 : : parent: 5:4f1e3cf15f5d
3370 : : parent: 3:b74ba7084d2d
3522 : : parent: 3:b74ba7084d2d
3371 : : user: test
3523 : : user: test
3372 : : date: Thu Jan 01 00:00:00 1970 +0000
3524 : : date: Thu Jan 01 00:00:00 1970 +0000
3373 : : summary: 6
3525 : : summary: 6
3374 : :
3526 : :
3375 : \
3527 : \
3376 : :\
3528 : :\
3377 : o : changeset: 2:3e6599df4cce
3529 : o : changeset: 2:3e6599df4cce
3378 : :/ user: test
3530 : :/ user: test
3379 : : date: Thu Jan 01 00:00:00 1970 +0000
3531 : : date: Thu Jan 01 00:00:00 1970 +0000
3380 : : summary: 2
3532 : : summary: 2
3381 : :
3533 : :
3382 : o changeset: 1:bd9a55143933
3534 : o changeset: 1:bd9a55143933
3383 :/ user: test
3535 :/ user: test
3384 : date: Thu Jan 01 00:00:00 1970 +0000
3536 : date: Thu Jan 01 00:00:00 1970 +0000
3385 : summary: 1
3537 : summary: 1
3386 :
3538 :
3387 o changeset: 0:870a5edc339c
3539 o changeset: 0:870a5edc339c
3388 user: test
3540 user: test
3389 date: Thu Jan 01 00:00:00 1970 +0000
3541 date: Thu Jan 01 00:00:00 1970 +0000
3390 summary: 0
3542 summary: 0
3391
3543
3392
3544
3393 $ cd ..
3545 $ cd ..
3394
3546
3395 Multiple roots (issue5440):
3547 Multiple roots (issue5440):
3396
3548
3397 $ hg init multiroots
3549 $ hg init multiroots
3398 $ cd multiroots
3550 $ cd multiroots
3399 $ cat <<EOF > .hg/hgrc
3551 $ cat <<EOF > .hg/hgrc
3400 > [ui]
3552 > [ui]
3401 > logtemplate = '{rev} {desc}\n\n'
3553 > logtemplate = '{rev} {desc}\n\n'
3402 > EOF
3554 > EOF
3403
3555
3404 $ touch foo
3556 $ touch foo
3405 $ hg ci -Aqm foo
3557 $ hg ci -Aqm foo
3406 $ hg co -q null
3558 $ hg co -q null
3407 $ touch bar
3559 $ touch bar
3408 $ hg ci -Aqm bar
3560 $ hg ci -Aqm bar
3409
3561
3410 $ hg log -Gr null:
3562 $ hg log -Gr null:
3411 @ 1 bar
3563 @ 1 bar
3412 |
3564 |
3413 | o 0 foo
3565 | o 0 foo
3414 |/
3566 |/
3415 o -1
3567 o -1
3416
3568
3417 $ hg log -Gr null+0
3569 $ hg log -Gr null+0
3418 o 0 foo
3570 o 0 foo
3419 |
3571 |
3420 o -1
3572 o -1
3421
3573
3422 $ hg log -Gr null+1
3574 $ hg log -Gr null+1
3423 @ 1 bar
3575 @ 1 bar
3424 |
3576 |
3425 o -1
3577 o -1
3426
3578
3427
3579
3428 $ cd ..
3580 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now