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