Show More
@@ -1,568 +1,568 | |||
|
1 | 1 | # templatekw.py - common changeset template keywords |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2009 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | from .node import hex, nullid |
|
11 | 11 | from . import ( |
|
12 | 12 | error, |
|
13 | 13 | hbisect, |
|
14 | 14 | patch, |
|
15 | 15 | scmutil, |
|
16 | 16 | util, |
|
17 | 17 | ) |
|
18 | 18 | |
|
19 | 19 | # This helper class allows us to handle both: |
|
20 | 20 | # "{files}" (legacy command-line-specific list hack) and |
|
21 | 21 | # "{files % '{file}\n'}" (hgweb-style with inlining and function support) |
|
22 | 22 | # and to access raw values: |
|
23 | 23 | # "{ifcontains(file, files, ...)}", "{ifcontains(key, extras, ...)}" |
|
24 | 24 | # "{get(extras, key)}" |
|
25 | 25 | |
|
26 | 26 | class _hybrid(object): |
|
27 | 27 | def __init__(self, gen, values, makemap, joinfmt=None): |
|
28 | 28 | self.gen = gen |
|
29 | 29 | self.values = values |
|
30 | 30 | self._makemap = makemap |
|
31 | 31 | if joinfmt: |
|
32 | 32 | self.joinfmt = joinfmt |
|
33 | 33 | else: |
|
34 | 34 | self.joinfmt = lambda x: x.values()[0] |
|
35 | 35 | def __iter__(self): |
|
36 | 36 | return self.gen |
|
37 | 37 | def itermaps(self): |
|
38 | 38 | makemap = self._makemap |
|
39 | 39 | for x in self.values: |
|
40 | 40 | yield makemap(x) |
|
41 | 41 | def __contains__(self, x): |
|
42 | 42 | return x in self.values |
|
43 | 43 | def __len__(self): |
|
44 | 44 | return len(self.values) |
|
45 | 45 | def __getattr__(self, name): |
|
46 | 46 | if name != 'get': |
|
47 | 47 | raise AttributeError(name) |
|
48 | 48 | return getattr(self.values, name) |
|
49 | 49 | |
|
50 | 50 | def showlist(name, values, plural=None, element=None, separator=' ', **args): |
|
51 | 51 | if not element: |
|
52 | 52 | element = name |
|
53 | 53 | f = _showlist(name, values, plural, separator, **args) |
|
54 | 54 | return _hybrid(f, values, lambda x: {element: x}) |
|
55 | 55 | |
|
56 | 56 | def _showlist(name, values, plural=None, separator=' ', **args): |
|
57 | 57 | '''expand set of values. |
|
58 | 58 | name is name of key in template map. |
|
59 | 59 | values is list of strings or dicts. |
|
60 | 60 | plural is plural of name, if not simply name + 's'. |
|
61 | 61 | separator is used to join values as a string |
|
62 | 62 | |
|
63 | 63 | expansion works like this, given name 'foo'. |
|
64 | 64 | |
|
65 | 65 | if values is empty, expand 'no_foos'. |
|
66 | 66 | |
|
67 | 67 | if 'foo' not in template map, return values as a string, |
|
68 | 68 | joined by 'separator'. |
|
69 | 69 | |
|
70 | 70 | expand 'start_foos'. |
|
71 | 71 | |
|
72 | 72 | for each value, expand 'foo'. if 'last_foo' in template |
|
73 | 73 | map, expand it instead of 'foo' for last key. |
|
74 | 74 | |
|
75 | 75 | expand 'end_foos'. |
|
76 | 76 | ''' |
|
77 | 77 | templ = args['templ'] |
|
78 | 78 | if plural: |
|
79 | 79 | names = plural |
|
80 | 80 | else: names = name + 's' |
|
81 | 81 | if not values: |
|
82 | 82 | noname = 'no_' + names |
|
83 | 83 | if noname in templ: |
|
84 | 84 | yield templ(noname, **args) |
|
85 | 85 | return |
|
86 | 86 | if name not in templ: |
|
87 | 87 | if isinstance(values[0], str): |
|
88 | 88 | yield separator.join(values) |
|
89 | 89 | else: |
|
90 | 90 | for v in values: |
|
91 | 91 | yield dict(v, **args) |
|
92 | 92 | return |
|
93 | 93 | startname = 'start_' + names |
|
94 | 94 | if startname in templ: |
|
95 | 95 | yield templ(startname, **args) |
|
96 | 96 | vargs = args.copy() |
|
97 | 97 | def one(v, tag=name): |
|
98 | 98 | try: |
|
99 | 99 | vargs.update(v) |
|
100 | 100 | except (AttributeError, ValueError): |
|
101 | 101 | try: |
|
102 | 102 | for a, b in v: |
|
103 | 103 | vargs[a] = b |
|
104 | 104 | except ValueError: |
|
105 | 105 | vargs[name] = v |
|
106 | 106 | return templ(tag, **vargs) |
|
107 | 107 | lastname = 'last_' + name |
|
108 | 108 | if lastname in templ: |
|
109 | 109 | last = values.pop() |
|
110 | 110 | else: |
|
111 | 111 | last = None |
|
112 | 112 | for v in values: |
|
113 | 113 | yield one(v) |
|
114 | 114 | if last is not None: |
|
115 | 115 | yield one(last, tag=lastname) |
|
116 | 116 | endname = 'end_' + names |
|
117 | 117 | if endname in templ: |
|
118 | 118 | yield templ(endname, **args) |
|
119 | 119 | |
|
120 | 120 | def getfiles(repo, ctx, revcache): |
|
121 | 121 | if 'files' not in revcache: |
|
122 | 122 | revcache['files'] = repo.status(ctx.p1(), ctx)[:3] |
|
123 | 123 | return revcache['files'] |
|
124 | 124 | |
|
125 | 125 | def getlatesttags(repo, ctx, cache, pattern=None): |
|
126 | 126 | '''return date, distance and name for the latest tag of rev''' |
|
127 | 127 | |
|
128 | 128 | cachename = 'latesttags' |
|
129 | 129 | if pattern is not None: |
|
130 | 130 | cachename += '-' + pattern |
|
131 | 131 | match = util.stringmatcher(pattern)[2] |
|
132 | 132 | else: |
|
133 | 133 | match = util.always |
|
134 | 134 | |
|
135 | 135 | if cachename not in cache: |
|
136 | 136 | # Cache mapping from rev to a tuple with tag date, tag |
|
137 | 137 | # distance and tag name |
|
138 | 138 | cache[cachename] = {-1: (0, 0, ['null'])} |
|
139 | 139 | latesttags = cache[cachename] |
|
140 | 140 | |
|
141 | 141 | rev = ctx.rev() |
|
142 | 142 | todo = [rev] |
|
143 | 143 | while todo: |
|
144 | 144 | rev = todo.pop() |
|
145 | 145 | if rev in latesttags: |
|
146 | 146 | continue |
|
147 | 147 | ctx = repo[rev] |
|
148 | 148 | tags = [t for t in ctx.tags() |
|
149 | 149 | if (repo.tagtype(t) and repo.tagtype(t) != 'local' |
|
150 | 150 | and match(t))] |
|
151 | 151 | if tags: |
|
152 | 152 | latesttags[rev] = ctx.date()[0], 0, [t for t in sorted(tags)] |
|
153 | 153 | continue |
|
154 | 154 | try: |
|
155 | 155 | # The tuples are laid out so the right one can be found by |
|
156 | 156 | # comparison. |
|
157 | 157 | pdate, pdist, ptag = max( |
|
158 | 158 | latesttags[p.rev()] for p in ctx.parents()) |
|
159 | 159 | except KeyError: |
|
160 | 160 | # Cache miss - recurse |
|
161 | 161 | todo.append(rev) |
|
162 | 162 | todo.extend(p.rev() for p in ctx.parents()) |
|
163 | 163 | continue |
|
164 | 164 | latesttags[rev] = pdate, pdist + 1, ptag |
|
165 | 165 | return latesttags[rev] |
|
166 | 166 | |
|
167 | 167 | def getrenamedfn(repo, endrev=None): |
|
168 | 168 | rcache = {} |
|
169 | 169 | if endrev is None: |
|
170 | 170 | endrev = len(repo) |
|
171 | 171 | |
|
172 | 172 | def getrenamed(fn, rev): |
|
173 | 173 | '''looks up all renames for a file (up to endrev) the first |
|
174 | 174 | time the file is given. It indexes on the changerev and only |
|
175 | 175 | parses the manifest if linkrev != changerev. |
|
176 | 176 | Returns rename info for fn at changerev rev.''' |
|
177 | 177 | if fn not in rcache: |
|
178 | 178 | rcache[fn] = {} |
|
179 | 179 | fl = repo.file(fn) |
|
180 | 180 | for i in fl: |
|
181 | 181 | lr = fl.linkrev(i) |
|
182 | 182 | renamed = fl.renamed(fl.node(i)) |
|
183 | 183 | rcache[fn][lr] = renamed |
|
184 | 184 | if lr >= endrev: |
|
185 | 185 | break |
|
186 | 186 | if rev in rcache[fn]: |
|
187 | 187 | return rcache[fn][rev] |
|
188 | 188 | |
|
189 | 189 | # If linkrev != rev (i.e. rev not found in rcache) fallback to |
|
190 | 190 | # filectx logic. |
|
191 | 191 | try: |
|
192 | 192 | return repo[rev][fn].renamed() |
|
193 | 193 | except error.LookupError: |
|
194 | 194 | return None |
|
195 | 195 | |
|
196 | 196 | return getrenamed |
|
197 | 197 | |
|
198 | 198 | |
|
199 | 199 | def showauthor(repo, ctx, templ, **args): |
|
200 | 200 | """:author: String. The unmodified author of the changeset.""" |
|
201 | 201 | return ctx.user() |
|
202 | 202 | |
|
203 | 203 | def showbisect(repo, ctx, templ, **args): |
|
204 | 204 | """:bisect: String. The changeset bisection status.""" |
|
205 | 205 | return hbisect.label(repo, ctx.node()) |
|
206 | 206 | |
|
207 | 207 | def showbranch(**args): |
|
208 | 208 | """:branch: String. The name of the branch on which the changeset was |
|
209 | 209 | committed. |
|
210 | 210 | """ |
|
211 | 211 | return args['ctx'].branch() |
|
212 | 212 | |
|
213 | 213 | def showbranches(**args): |
|
214 | 214 | """:branches: List of strings. The name of the branch on which the |
|
215 | 215 | changeset was committed. Will be empty if the branch name was |
|
216 | 216 | default. (DEPRECATED) |
|
217 | 217 | """ |
|
218 | 218 | branch = args['ctx'].branch() |
|
219 | 219 | if branch != 'default': |
|
220 | 220 | return showlist('branch', [branch], plural='branches', **args) |
|
221 | 221 | return showlist('branch', [], plural='branches', **args) |
|
222 | 222 | |
|
223 | 223 | def showbookmarks(**args): |
|
224 | 224 | """:bookmarks: List of strings. Any bookmarks associated with the |
|
225 | 225 | changeset. Also sets 'active', the name of the active bookmark. |
|
226 | 226 | """ |
|
227 | 227 | repo = args['ctx']._repo |
|
228 | 228 | bookmarks = args['ctx'].bookmarks() |
|
229 | 229 | active = repo._activebookmark |
|
230 | 230 | makemap = lambda v: {'bookmark': v, 'active': active, 'current': active} |
|
231 | 231 | f = _showlist('bookmark', bookmarks, **args) |
|
232 | 232 | return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) |
|
233 | 233 | |
|
234 | 234 | def showchildren(**args): |
|
235 | 235 | """:children: List of strings. The children of the changeset.""" |
|
236 | 236 | ctx = args['ctx'] |
|
237 | 237 | childrevs = ['%d:%s' % (cctx, cctx) for cctx in ctx.children()] |
|
238 | 238 | return showlist('children', childrevs, element='child', **args) |
|
239 | 239 | |
|
240 | 240 | # Deprecated, but kept alive for help generation a purpose. |
|
241 | 241 | def showcurrentbookmark(**args): |
|
242 | 242 | """:currentbookmark: String. The active bookmark, if it is |
|
243 | 243 | associated with the changeset (DEPRECATED)""" |
|
244 | 244 | return showactivebookmark(**args) |
|
245 | 245 | |
|
246 | 246 | def showactivebookmark(**args): |
|
247 | 247 | """:activebookmark: String. The active bookmark, if it is |
|
248 | 248 | associated with the changeset""" |
|
249 | 249 | active = args['repo']._activebookmark |
|
250 | 250 | if active and active in args['ctx'].bookmarks(): |
|
251 | 251 | return active |
|
252 | 252 | return '' |
|
253 | 253 | |
|
254 | 254 | def showdate(repo, ctx, templ, **args): |
|
255 | 255 | """:date: Date information. The date when the changeset was committed.""" |
|
256 | 256 | return ctx.date() |
|
257 | 257 | |
|
258 | 258 | def showdescription(repo, ctx, templ, **args): |
|
259 | 259 | """:desc: String. The text of the changeset description.""" |
|
260 | 260 | return ctx.description().strip() |
|
261 | 261 | |
|
262 | 262 | def showdiffstat(repo, ctx, templ, **args): |
|
263 | 263 | """:diffstat: String. Statistics of changes with the following format: |
|
264 | 264 | "modified files: +added/-removed lines" |
|
265 | 265 | """ |
|
266 | 266 | stats = patch.diffstatdata(util.iterlines(ctx.diff())) |
|
267 | 267 | maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats) |
|
268 | 268 | return '%s: +%s/-%s' % (len(stats), adds, removes) |
|
269 | 269 | |
|
270 | 270 | def showextras(**args): |
|
271 | 271 | """:extras: List of dicts with key, value entries of the 'extras' |
|
272 | 272 | field of this changeset.""" |
|
273 | 273 | extras = args['ctx'].extra() |
|
274 | 274 | extras = util.sortdict((k, extras[k]) for k in sorted(extras)) |
|
275 | 275 | makemap = lambda k: {'key': k, 'value': extras[k]} |
|
276 | 276 | c = [makemap(k) for k in extras] |
|
277 | 277 | f = _showlist('extra', c, plural='extras', **args) |
|
278 | 278 | return _hybrid(f, extras, makemap, |
|
279 | 279 | lambda x: '%s=%s' % (x['key'], x['value'])) |
|
280 | 280 | |
|
281 | 281 | def showfileadds(**args): |
|
282 | 282 | """:file_adds: List of strings. Files added by this changeset.""" |
|
283 | 283 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
284 | 284 | return showlist('file_add', getfiles(repo, ctx, revcache)[1], |
|
285 | 285 | element='file', **args) |
|
286 | 286 | |
|
287 | 287 | def showfilecopies(**args): |
|
288 | 288 | """:file_copies: List of strings. Files copied in this changeset with |
|
289 | 289 | their sources. |
|
290 | 290 | """ |
|
291 | 291 | cache, ctx = args['cache'], args['ctx'] |
|
292 | 292 | copies = args['revcache'].get('copies') |
|
293 | 293 | if copies is None: |
|
294 | 294 | if 'getrenamed' not in cache: |
|
295 | 295 | cache['getrenamed'] = getrenamedfn(args['repo']) |
|
296 | 296 | copies = [] |
|
297 | 297 | getrenamed = cache['getrenamed'] |
|
298 | 298 | for fn in ctx.files(): |
|
299 | 299 | rename = getrenamed(fn, ctx.rev()) |
|
300 | 300 | if rename: |
|
301 | 301 | copies.append((fn, rename[0])) |
|
302 | 302 | |
|
303 | 303 | copies = util.sortdict(copies) |
|
304 | 304 | makemap = lambda k: {'name': k, 'source': copies[k]} |
|
305 | 305 | c = [makemap(k) for k in copies] |
|
306 | 306 | f = _showlist('file_copy', c, plural='file_copies', **args) |
|
307 | 307 | return _hybrid(f, copies, makemap, |
|
308 | 308 | lambda x: '%s (%s)' % (x['name'], x['source'])) |
|
309 | 309 | |
|
310 | 310 | # showfilecopiesswitch() displays file copies only if copy records are |
|
311 | 311 | # provided before calling the templater, usually with a --copies |
|
312 | 312 | # command line switch. |
|
313 | 313 | def showfilecopiesswitch(**args): |
|
314 | 314 | """:file_copies_switch: List of strings. Like "file_copies" but displayed |
|
315 | 315 | only if the --copied switch is set. |
|
316 | 316 | """ |
|
317 | 317 | copies = args['revcache'].get('copies') or [] |
|
318 | 318 | copies = util.sortdict(copies) |
|
319 | 319 | makemap = lambda k: {'name': k, 'source': copies[k]} |
|
320 | 320 | c = [makemap(k) for k in copies] |
|
321 | 321 | f = _showlist('file_copy', c, plural='file_copies', **args) |
|
322 | 322 | return _hybrid(f, copies, makemap, |
|
323 | 323 | lambda x: '%s (%s)' % (x['name'], x['source'])) |
|
324 | 324 | |
|
325 | 325 | def showfiledels(**args): |
|
326 | 326 | """:file_dels: List of strings. Files removed by this changeset.""" |
|
327 | 327 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
328 | 328 | return showlist('file_del', getfiles(repo, ctx, revcache)[2], |
|
329 | 329 | element='file', **args) |
|
330 | 330 | |
|
331 | 331 | def showfilemods(**args): |
|
332 | 332 | """:file_mods: List of strings. Files modified by this changeset.""" |
|
333 | 333 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
334 | 334 | return showlist('file_mod', getfiles(repo, ctx, revcache)[0], |
|
335 | 335 | element='file', **args) |
|
336 | 336 | |
|
337 | 337 | def showfiles(**args): |
|
338 | 338 | """:files: List of strings. All files modified, added, or removed by this |
|
339 | 339 | changeset. |
|
340 | 340 | """ |
|
341 | 341 | return showlist('file', args['ctx'].files(), **args) |
|
342 | 342 | |
|
343 | 343 | def showgraphnode(repo, ctx, **args): |
|
344 | 344 | """:graphnode: String. The character representing the changeset node in |
|
345 | 345 | an ASCII revision graph""" |
|
346 | 346 | wpnodes = repo.dirstate.parents() |
|
347 | 347 | if wpnodes[1] == nullid: |
|
348 | 348 | wpnodes = wpnodes[:1] |
|
349 | 349 | if ctx.node() in wpnodes: |
|
350 | 350 | return '@' |
|
351 | 351 | elif ctx.obsolete(): |
|
352 | 352 | return 'x' |
|
353 | 353 | elif ctx.closesbranch(): |
|
354 | 354 | return '_' |
|
355 | 355 | else: |
|
356 | 356 | return 'o' |
|
357 | 357 | |
|
358 | 358 | def showlatesttag(**args): |
|
359 | 359 | """:latesttag: List of strings. The global tags on the most recent globally |
|
360 | 360 | tagged ancestor of this changeset. |
|
361 | 361 | """ |
|
362 | 362 | return showlatesttags(None, **args) |
|
363 | 363 | |
|
364 | 364 | def showlatesttags(pattern, **args): |
|
365 | 365 | """helper method for the latesttag keyword and function""" |
|
366 | 366 | repo, ctx = args['repo'], args['ctx'] |
|
367 | 367 | cache = args['cache'] |
|
368 | 368 | latesttags = getlatesttags(repo, ctx, cache, pattern) |
|
369 | 369 | |
|
370 | 370 | # latesttag[0] is an implementation detail for sorting csets on different |
|
371 | 371 | # branches in a stable manner- it is the date the tagged cset was created, |
|
372 | 372 | # not the date the tag was created. Therefore it isn't made visible here. |
|
373 | 373 | makemap = lambda v: { |
|
374 | 374 | 'changes': _showchangessincetag, |
|
375 | 375 | 'distance': latesttags[1], |
|
376 | 376 | 'latesttag': v, # BC with {latesttag % '{latesttag}'} |
|
377 | 377 | 'tag': v |
|
378 | 378 | } |
|
379 | 379 | |
|
380 | 380 | tags = latesttags[2] |
|
381 | 381 | f = _showlist('latesttag', tags, separator=':', **args) |
|
382 | 382 | return _hybrid(f, tags, makemap, lambda x: x['latesttag']) |
|
383 | 383 | |
|
384 | 384 | def showlatesttagdistance(repo, ctx, templ, cache, **args): |
|
385 | 385 | """:latesttagdistance: Integer. Longest path to the latest tag.""" |
|
386 | 386 | return getlatesttags(repo, ctx, cache)[1] |
|
387 | 387 | |
|
388 | 388 | def showchangessincelatesttag(repo, ctx, templ, cache, **args): |
|
389 | 389 | """:changessincelatesttag: Integer. All ancestors not in the latest tag.""" |
|
390 | 390 | latesttag = getlatesttags(repo, ctx, cache)[2][0] |
|
391 | 391 | |
|
392 | 392 | return _showchangessincetag(repo, ctx, tag=latesttag, **args) |
|
393 | 393 | |
|
394 | 394 | def _showchangessincetag(repo, ctx, **args): |
|
395 | 395 | offset = 0 |
|
396 | 396 | revs = [ctx.rev()] |
|
397 | 397 | tag = args['tag'] |
|
398 | 398 | |
|
399 | 399 | # The only() revset doesn't currently support wdir() |
|
400 | 400 | if ctx.rev() is None: |
|
401 | 401 | offset = 1 |
|
402 | 402 | revs = [p.rev() for p in ctx.parents()] |
|
403 | 403 | |
|
404 | 404 | return len(repo.revs('only(%ld, %s)', revs, tag)) + offset |
|
405 | 405 | |
|
406 | 406 | def showmanifest(**args): |
|
407 | 407 | repo, ctx, templ = args['repo'], args['ctx'], args['templ'] |
|
408 | 408 | mnode = ctx.manifestnode() |
|
409 | 409 | if mnode is None: |
|
410 | 410 | # just avoid crash, we might want to use the 'ff...' hash in future |
|
411 | 411 | return |
|
412 | 412 | args = args.copy() |
|
413 | 413 | args.update({'rev': repo.manifest.rev(mnode), 'node': hex(mnode)}) |
|
414 | 414 | return templ('manifest', **args) |
|
415 | 415 | |
|
416 | 416 | def shownames(namespace, **args): |
|
417 | 417 | """helper method to generate a template keyword for a namespace""" |
|
418 | 418 | ctx = args['ctx'] |
|
419 | 419 | repo = ctx.repo() |
|
420 | 420 | ns = repo.names[namespace] |
|
421 | 421 | names = ns.names(repo, ctx.node()) |
|
422 | 422 | return showlist(ns.templatename, names, plural=namespace, **args) |
|
423 | 423 | |
|
424 | 424 | def shownamespaces(**args): |
|
425 | 425 | """:namespaces: Dict of lists. Names attached to this changeset per |
|
426 | 426 | namespace.""" |
|
427 | 427 | ctx = args['ctx'] |
|
428 | 428 | repo = ctx.repo() |
|
429 | 429 | namespaces = util.sortdict((k, showlist('name', ns.names(repo, ctx.node()), |
|
430 | 430 | **args)) |
|
431 | 431 | for k, ns in repo.names.iteritems()) |
|
432 | 432 | f = _showlist('namespace', list(namespaces), **args) |
|
433 | 433 | return _hybrid(f, namespaces, |
|
434 | 434 | lambda k: {'namespace': k, 'names': namespaces[k]}, |
|
435 | 435 | lambda x: x['namespace']) |
|
436 | 436 | |
|
437 | 437 | def shownode(repo, ctx, templ, **args): |
|
438 | 438 | """:node: String. The changeset identification hash, as a 40 hexadecimal |
|
439 | 439 | digit string. |
|
440 | 440 | """ |
|
441 | 441 | return ctx.hex() |
|
442 | 442 | |
|
443 | 443 | def showp1rev(repo, ctx, templ, **args): |
|
444 | 444 | """:p1rev: Integer. The repository-local revision number of the changeset's |
|
445 | 445 | first parent, or -1 if the changeset has no parents.""" |
|
446 | 446 | return ctx.p1().rev() |
|
447 | 447 | |
|
448 | 448 | def showp2rev(repo, ctx, templ, **args): |
|
449 | 449 | """:p2rev: Integer. The repository-local revision number of the changeset's |
|
450 | 450 | second parent, or -1 if the changeset has no second parent.""" |
|
451 | 451 | return ctx.p2().rev() |
|
452 | 452 | |
|
453 | 453 | def showp1node(repo, ctx, templ, **args): |
|
454 | 454 | """:p1node: String. The identification hash of the changeset's first parent, |
|
455 | 455 | as a 40 digit hexadecimal string. If the changeset has no parents, all |
|
456 | 456 | digits are 0.""" |
|
457 | 457 | return ctx.p1().hex() |
|
458 | 458 | |
|
459 | 459 | def showp2node(repo, ctx, templ, **args): |
|
460 | 460 | """:p2node: String. The identification hash of the changeset's second |
|
461 | 461 | parent, as a 40 digit hexadecimal string. If the changeset has no second |
|
462 | 462 | parent, all digits are 0.""" |
|
463 | 463 | return ctx.p2().hex() |
|
464 | 464 | |
|
465 | 465 | def showparents(**args): |
|
466 | 466 | """:parents: List of strings. The parents of the changeset in "rev:node" |
|
467 | 467 | format. If the changeset has only one "natural" parent (the predecessor |
|
468 | 468 | revision) nothing is shown.""" |
|
469 | 469 | repo = args['repo'] |
|
470 | 470 | ctx = args['ctx'] |
|
471 | 471 | parents = [[('rev', p.rev()), |
|
472 | 472 | ('node', p.hex()), |
|
473 | 473 | ('phase', p.phasestr())] |
|
474 | 474 | for p in scmutil.meaningfulparents(repo, ctx)] |
|
475 | 475 | return showlist('parent', parents, **args) |
|
476 | 476 | |
|
477 | 477 | def showphase(repo, ctx, templ, **args): |
|
478 | 478 | """:phase: String. The changeset phase name.""" |
|
479 | 479 | return ctx.phasestr() |
|
480 | 480 | |
|
481 | 481 | def showphaseidx(repo, ctx, templ, **args): |
|
482 | 482 | """:phaseidx: Integer. The changeset phase index.""" |
|
483 | 483 | return ctx.phase() |
|
484 | 484 | |
|
485 | 485 | def showrev(repo, ctx, templ, **args): |
|
486 | 486 | """:rev: Integer. The repository-local changeset revision number.""" |
|
487 | 487 | return scmutil.intrev(ctx.rev()) |
|
488 | 488 | |
|
489 | 489 | def showrevslist(name, revs, **args): |
|
490 | 490 | """helper to generate a list of revisions in which a mapped template will |
|
491 | 491 | be evaluated""" |
|
492 | 492 | repo = args['ctx'].repo() |
|
493 | 493 | f = _showlist(name, revs, **args) |
|
494 | 494 | return _hybrid(f, revs, |
|
495 | lambda x: {name: x, 'ctx': repo[x], 'revcache': {}}) | |
|
495 | lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}}) | |
|
496 | 496 | |
|
497 | 497 | def showsubrepos(**args): |
|
498 | 498 | """:subrepos: List of strings. Updated subrepositories in the changeset.""" |
|
499 | 499 | ctx = args['ctx'] |
|
500 | 500 | substate = ctx.substate |
|
501 | 501 | if not substate: |
|
502 | 502 | return showlist('subrepo', [], **args) |
|
503 | 503 | psubstate = ctx.parents()[0].substate or {} |
|
504 | 504 | subrepos = [] |
|
505 | 505 | for sub in substate: |
|
506 | 506 | if sub not in psubstate or substate[sub] != psubstate[sub]: |
|
507 | 507 | subrepos.append(sub) # modified or newly added in ctx |
|
508 | 508 | for sub in psubstate: |
|
509 | 509 | if sub not in substate: |
|
510 | 510 | subrepos.append(sub) # removed in ctx |
|
511 | 511 | return showlist('subrepo', sorted(subrepos), **args) |
|
512 | 512 | |
|
513 | 513 | # don't remove "showtags" definition, even though namespaces will put |
|
514 | 514 | # a helper function for "tags" keyword into "keywords" map automatically, |
|
515 | 515 | # because online help text is built without namespaces initialization |
|
516 | 516 | def showtags(**args): |
|
517 | 517 | """:tags: List of strings. Any tags associated with the changeset.""" |
|
518 | 518 | return shownames('tags', **args) |
|
519 | 519 | |
|
520 | 520 | # keywords are callables like: |
|
521 | 521 | # fn(repo, ctx, templ, cache, revcache, **args) |
|
522 | 522 | # with: |
|
523 | 523 | # repo - current repository instance |
|
524 | 524 | # ctx - the changectx being displayed |
|
525 | 525 | # templ - the templater instance |
|
526 | 526 | # cache - a cache dictionary for the whole templater run |
|
527 | 527 | # revcache - a cache dictionary for the current revision |
|
528 | 528 | keywords = { |
|
529 | 529 | 'activebookmark': showactivebookmark, |
|
530 | 530 | 'author': showauthor, |
|
531 | 531 | 'bisect': showbisect, |
|
532 | 532 | 'branch': showbranch, |
|
533 | 533 | 'branches': showbranches, |
|
534 | 534 | 'bookmarks': showbookmarks, |
|
535 | 535 | 'changessincelatesttag': showchangessincelatesttag, |
|
536 | 536 | 'children': showchildren, |
|
537 | 537 | # currentbookmark is deprecated |
|
538 | 538 | 'currentbookmark': showcurrentbookmark, |
|
539 | 539 | 'date': showdate, |
|
540 | 540 | 'desc': showdescription, |
|
541 | 541 | 'diffstat': showdiffstat, |
|
542 | 542 | 'extras': showextras, |
|
543 | 543 | 'file_adds': showfileadds, |
|
544 | 544 | 'file_copies': showfilecopies, |
|
545 | 545 | 'file_copies_switch': showfilecopiesswitch, |
|
546 | 546 | 'file_dels': showfiledels, |
|
547 | 547 | 'file_mods': showfilemods, |
|
548 | 548 | 'files': showfiles, |
|
549 | 549 | 'graphnode': showgraphnode, |
|
550 | 550 | 'latesttag': showlatesttag, |
|
551 | 551 | 'latesttagdistance': showlatesttagdistance, |
|
552 | 552 | 'manifest': showmanifest, |
|
553 | 553 | 'namespaces': shownamespaces, |
|
554 | 554 | 'node': shownode, |
|
555 | 555 | 'p1rev': showp1rev, |
|
556 | 556 | 'p1node': showp1node, |
|
557 | 557 | 'p2rev': showp2rev, |
|
558 | 558 | 'p2node': showp2node, |
|
559 | 559 | 'parents': showparents, |
|
560 | 560 | 'phase': showphase, |
|
561 | 561 | 'phaseidx': showphaseidx, |
|
562 | 562 | 'rev': showrev, |
|
563 | 563 | 'subrepos': showsubrepos, |
|
564 | 564 | 'tags': showtags, |
|
565 | 565 | } |
|
566 | 566 | |
|
567 | 567 | # tell hggettext to extract docstrings from these functions: |
|
568 | 568 | i18nfunctions = keywords.values() |
@@ -1,3559 +1,3566 | |||
|
1 | 1 | $ hg init a |
|
2 | 2 | $ cd a |
|
3 | 3 | $ echo a > a |
|
4 | 4 | $ hg add a |
|
5 | 5 | $ echo line 1 > b |
|
6 | 6 | $ echo line 2 >> b |
|
7 | 7 | $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>' |
|
8 | 8 | |
|
9 | 9 | $ hg add b |
|
10 | 10 | $ echo other 1 > c |
|
11 | 11 | $ echo other 2 >> c |
|
12 | 12 | $ echo >> c |
|
13 | 13 | $ echo other 3 >> c |
|
14 | 14 | $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>' |
|
15 | 15 | |
|
16 | 16 | $ hg add c |
|
17 | 17 | $ hg commit -m 'no person' -d '1200000 0' -u 'other@place' |
|
18 | 18 | $ echo c >> c |
|
19 | 19 | $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' |
|
20 | 20 | |
|
21 | 21 | $ echo foo > .hg/branch |
|
22 | 22 | $ hg commit -m 'new branch' -d '1400000 0' -u 'person' |
|
23 | 23 | |
|
24 | 24 | $ hg co -q 3 |
|
25 | 25 | $ echo other 4 >> d |
|
26 | 26 | $ hg add d |
|
27 | 27 | $ hg commit -m 'new head' -d '1500000 0' -u 'person' |
|
28 | 28 | |
|
29 | 29 | $ hg merge -q foo |
|
30 | 30 | $ hg commit -m 'merge' -d '1500001 0' -u 'person' |
|
31 | 31 | |
|
32 | 32 | Second branch starting at nullrev: |
|
33 | 33 | |
|
34 | 34 | $ hg update null |
|
35 | 35 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
36 | 36 | $ echo second > second |
|
37 | 37 | $ hg add second |
|
38 | 38 | $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' |
|
39 | 39 | created new head |
|
40 | 40 | |
|
41 | 41 | $ echo third > third |
|
42 | 42 | $ hg add third |
|
43 | 43 | $ hg mv second fourth |
|
44 | 44 | $ hg commit -m third -d "2020-01-01 10:01" |
|
45 | 45 | |
|
46 | 46 | $ hg log --template '{join(file_copies, ",\n")}\n' -r . |
|
47 | 47 | fourth (second) |
|
48 | 48 | $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r . |
|
49 | 49 | second -> fourth |
|
50 | 50 | $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7 |
|
51 | 51 | 8 t |
|
52 | 52 | 7 f |
|
53 | 53 | |
|
54 | 54 | Working-directory revision has special identifiers, though they are still |
|
55 | 55 | experimental: |
|
56 | 56 | |
|
57 | 57 | $ hg log -r 'wdir()' -T '{rev}:{node}\n' |
|
58 | 58 | 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
59 | 59 | |
|
60 | 60 | Some keywords are invalid for working-directory revision, but they should |
|
61 | 61 | never cause crash: |
|
62 | 62 | |
|
63 | 63 | $ hg log -r 'wdir()' -T '{manifest}\n' |
|
64 | 64 | |
|
65 | 65 | |
|
66 | 66 | Quoting for ui.logtemplate |
|
67 | 67 | |
|
68 | 68 | $ hg tip --config "ui.logtemplate={rev}\n" |
|
69 | 69 | 8 |
|
70 | 70 | $ hg tip --config "ui.logtemplate='{rev}\n'" |
|
71 | 71 | 8 |
|
72 | 72 | $ hg tip --config 'ui.logtemplate="{rev}\n"' |
|
73 | 73 | 8 |
|
74 | 74 | |
|
75 | 75 | Make sure user/global hgrc does not affect tests |
|
76 | 76 | |
|
77 | 77 | $ echo '[ui]' > .hg/hgrc |
|
78 | 78 | $ echo 'logtemplate =' >> .hg/hgrc |
|
79 | 79 | $ echo 'style =' >> .hg/hgrc |
|
80 | 80 | |
|
81 | 81 | Add some simple styles to settings |
|
82 | 82 | |
|
83 | 83 | $ echo '[templates]' >> .hg/hgrc |
|
84 | 84 | $ printf 'simple = "{rev}\\n"\n' >> .hg/hgrc |
|
85 | 85 | $ printf 'simple2 = {rev}\\n\n' >> .hg/hgrc |
|
86 | 86 | |
|
87 | 87 | $ hg log -l1 -Tsimple |
|
88 | 88 | 8 |
|
89 | 89 | $ hg log -l1 -Tsimple2 |
|
90 | 90 | 8 |
|
91 | 91 | |
|
92 | 92 | Test templates and style maps in files: |
|
93 | 93 | |
|
94 | 94 | $ echo "{rev}" > tmpl |
|
95 | 95 | $ hg log -l1 -T./tmpl |
|
96 | 96 | 8 |
|
97 | 97 | $ hg log -l1 -Tblah/blah |
|
98 | 98 | blah/blah (no-eol) |
|
99 | 99 | |
|
100 | 100 | $ printf 'changeset = "{rev}\\n"\n' > map-simple |
|
101 | 101 | $ hg log -l1 -T./map-simple |
|
102 | 102 | 8 |
|
103 | 103 | |
|
104 | 104 | Template should precede style option |
|
105 | 105 | |
|
106 | 106 | $ hg log -l1 --style default -T '{rev}\n' |
|
107 | 107 | 8 |
|
108 | 108 | |
|
109 | 109 | Add a commit with empty description, to ensure that the templates |
|
110 | 110 | below will omit the description line. |
|
111 | 111 | |
|
112 | 112 | $ echo c >> c |
|
113 | 113 | $ hg add c |
|
114 | 114 | $ hg commit -qm ' ' |
|
115 | 115 | |
|
116 | 116 | Default style is like normal output. Phases style should be the same |
|
117 | 117 | as default style, except for extra phase lines. |
|
118 | 118 | |
|
119 | 119 | $ hg log > log.out |
|
120 | 120 | $ hg log --style default > style.out |
|
121 | 121 | $ cmp log.out style.out || diff -u log.out style.out |
|
122 | 122 | $ hg log -T phases > phases.out |
|
123 | 123 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
124 | 124 | +phase: draft |
|
125 | 125 | +phase: draft |
|
126 | 126 | +phase: draft |
|
127 | 127 | +phase: draft |
|
128 | 128 | +phase: draft |
|
129 | 129 | +phase: draft |
|
130 | 130 | +phase: draft |
|
131 | 131 | +phase: draft |
|
132 | 132 | +phase: draft |
|
133 | 133 | +phase: draft |
|
134 | 134 | |
|
135 | 135 | $ hg log -v > log.out |
|
136 | 136 | $ hg log -v --style default > style.out |
|
137 | 137 | $ cmp log.out style.out || diff -u log.out style.out |
|
138 | 138 | $ hg log -v -T phases > phases.out |
|
139 | 139 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
140 | 140 | +phase: draft |
|
141 | 141 | +phase: draft |
|
142 | 142 | +phase: draft |
|
143 | 143 | +phase: draft |
|
144 | 144 | +phase: draft |
|
145 | 145 | +phase: draft |
|
146 | 146 | +phase: draft |
|
147 | 147 | +phase: draft |
|
148 | 148 | +phase: draft |
|
149 | 149 | +phase: draft |
|
150 | 150 | |
|
151 | 151 | $ hg log -q > log.out |
|
152 | 152 | $ hg log -q --style default > style.out |
|
153 | 153 | $ cmp log.out style.out || diff -u log.out style.out |
|
154 | 154 | $ hg log -q -T phases > phases.out |
|
155 | 155 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
156 | 156 | |
|
157 | 157 | $ hg log --debug > log.out |
|
158 | 158 | $ hg log --debug --style default > style.out |
|
159 | 159 | $ cmp log.out style.out || diff -u log.out style.out |
|
160 | 160 | $ hg log --debug -T phases > phases.out |
|
161 | 161 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
162 | 162 | |
|
163 | 163 | Default style of working-directory revision should also be the same (but |
|
164 | 164 | date may change while running tests): |
|
165 | 165 | |
|
166 | 166 | $ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out |
|
167 | 167 | $ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out |
|
168 | 168 | $ cmp log.out style.out || diff -u log.out style.out |
|
169 | 169 | |
|
170 | 170 | $ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out |
|
171 | 171 | $ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out |
|
172 | 172 | $ cmp log.out style.out || diff -u log.out style.out |
|
173 | 173 | |
|
174 | 174 | $ hg log -r 'wdir()' -q > log.out |
|
175 | 175 | $ hg log -r 'wdir()' -q --style default > style.out |
|
176 | 176 | $ cmp log.out style.out || diff -u log.out style.out |
|
177 | 177 | |
|
178 | 178 | $ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out |
|
179 | 179 | $ hg log -r 'wdir()' --debug --style default \ |
|
180 | 180 | > | sed 's|^date:.*|date:|' > style.out |
|
181 | 181 | $ cmp log.out style.out || diff -u log.out style.out |
|
182 | 182 | |
|
183 | 183 | Default style should also preserve color information (issue2866): |
|
184 | 184 | |
|
185 | 185 | $ cp $HGRCPATH $HGRCPATH-bak |
|
186 | 186 | $ cat <<EOF >> $HGRCPATH |
|
187 | 187 | > [extensions] |
|
188 | 188 | > color= |
|
189 | 189 | > EOF |
|
190 | 190 | |
|
191 | 191 | $ hg --color=debug log > log.out |
|
192 | 192 | $ hg --color=debug log --style default > style.out |
|
193 | 193 | $ cmp log.out style.out || diff -u log.out style.out |
|
194 | 194 | $ hg --color=debug log -T phases > phases.out |
|
195 | 195 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
196 | 196 | +[log.phase|phase: draft] |
|
197 | 197 | +[log.phase|phase: draft] |
|
198 | 198 | +[log.phase|phase: draft] |
|
199 | 199 | +[log.phase|phase: draft] |
|
200 | 200 | +[log.phase|phase: draft] |
|
201 | 201 | +[log.phase|phase: draft] |
|
202 | 202 | +[log.phase|phase: draft] |
|
203 | 203 | +[log.phase|phase: draft] |
|
204 | 204 | +[log.phase|phase: draft] |
|
205 | 205 | +[log.phase|phase: draft] |
|
206 | 206 | |
|
207 | 207 | $ hg --color=debug -v log > log.out |
|
208 | 208 | $ hg --color=debug -v log --style default > style.out |
|
209 | 209 | $ cmp log.out style.out || diff -u log.out style.out |
|
210 | 210 | $ hg --color=debug -v log -T phases > phases.out |
|
211 | 211 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
212 | 212 | +[log.phase|phase: draft] |
|
213 | 213 | +[log.phase|phase: draft] |
|
214 | 214 | +[log.phase|phase: draft] |
|
215 | 215 | +[log.phase|phase: draft] |
|
216 | 216 | +[log.phase|phase: draft] |
|
217 | 217 | +[log.phase|phase: draft] |
|
218 | 218 | +[log.phase|phase: draft] |
|
219 | 219 | +[log.phase|phase: draft] |
|
220 | 220 | +[log.phase|phase: draft] |
|
221 | 221 | +[log.phase|phase: draft] |
|
222 | 222 | |
|
223 | 223 | $ hg --color=debug -q log > log.out |
|
224 | 224 | $ hg --color=debug -q log --style default > style.out |
|
225 | 225 | $ cmp log.out style.out || diff -u log.out style.out |
|
226 | 226 | $ hg --color=debug -q log -T phases > phases.out |
|
227 | 227 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
228 | 228 | |
|
229 | 229 | $ hg --color=debug --debug log > log.out |
|
230 | 230 | $ hg --color=debug --debug log --style default > style.out |
|
231 | 231 | $ cmp log.out style.out || diff -u log.out style.out |
|
232 | 232 | $ hg --color=debug --debug log -T phases > phases.out |
|
233 | 233 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
234 | 234 | |
|
235 | 235 | $ mv $HGRCPATH-bak $HGRCPATH |
|
236 | 236 | |
|
237 | 237 | Remove commit with empty commit message, so as to not pollute further |
|
238 | 238 | tests. |
|
239 | 239 | |
|
240 | 240 | $ hg --config extensions.strip= strip -q . |
|
241 | 241 | |
|
242 | 242 | Revision with no copies (used to print a traceback): |
|
243 | 243 | |
|
244 | 244 | $ hg tip -v --template '\n' |
|
245 | 245 | |
|
246 | 246 | |
|
247 | 247 | Compact style works: |
|
248 | 248 | |
|
249 | 249 | $ hg log -Tcompact |
|
250 | 250 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
251 | 251 | third |
|
252 | 252 | |
|
253 | 253 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user |
|
254 | 254 | second |
|
255 | 255 | |
|
256 | 256 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
257 | 257 | merge |
|
258 | 258 | |
|
259 | 259 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
260 | 260 | new head |
|
261 | 261 | |
|
262 | 262 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
263 | 263 | new branch |
|
264 | 264 | |
|
265 | 265 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
266 | 266 | no user, no domain |
|
267 | 267 | |
|
268 | 268 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other |
|
269 | 269 | no person |
|
270 | 270 | |
|
271 | 271 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other |
|
272 | 272 | other 1 |
|
273 | 273 | |
|
274 | 274 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
275 | 275 | line 1 |
|
276 | 276 | |
|
277 | 277 | |
|
278 | 278 | $ hg log -v --style compact |
|
279 | 279 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
280 | 280 | third |
|
281 | 281 | |
|
282 | 282 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
283 | 283 | second |
|
284 | 284 | |
|
285 | 285 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
286 | 286 | merge |
|
287 | 287 | |
|
288 | 288 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
289 | 289 | new head |
|
290 | 290 | |
|
291 | 291 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
292 | 292 | new branch |
|
293 | 293 | |
|
294 | 294 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
295 | 295 | no user, no domain |
|
296 | 296 | |
|
297 | 297 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
298 | 298 | no person |
|
299 | 299 | |
|
300 | 300 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
301 | 301 | other 1 |
|
302 | 302 | other 2 |
|
303 | 303 | |
|
304 | 304 | other 3 |
|
305 | 305 | |
|
306 | 306 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
307 | 307 | line 1 |
|
308 | 308 | line 2 |
|
309 | 309 | |
|
310 | 310 | |
|
311 | 311 | $ hg log --debug --style compact |
|
312 | 312 | 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test |
|
313 | 313 | third |
|
314 | 314 | |
|
315 | 315 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
316 | 316 | second |
|
317 | 317 | |
|
318 | 318 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
319 | 319 | merge |
|
320 | 320 | |
|
321 | 321 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
322 | 322 | new head |
|
323 | 323 | |
|
324 | 324 | 4:3,-1 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
325 | 325 | new branch |
|
326 | 326 | |
|
327 | 327 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
328 | 328 | no user, no domain |
|
329 | 329 | |
|
330 | 330 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
331 | 331 | no person |
|
332 | 332 | |
|
333 | 333 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
334 | 334 | other 1 |
|
335 | 335 | other 2 |
|
336 | 336 | |
|
337 | 337 | other 3 |
|
338 | 338 | |
|
339 | 339 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
340 | 340 | line 1 |
|
341 | 341 | line 2 |
|
342 | 342 | |
|
343 | 343 | |
|
344 | 344 | Test xml styles: |
|
345 | 345 | |
|
346 | 346 | $ hg log --style xml -r 'not all()' |
|
347 | 347 | <?xml version="1.0"?> |
|
348 | 348 | <log> |
|
349 | 349 | </log> |
|
350 | 350 | |
|
351 | 351 | $ hg log --style xml |
|
352 | 352 | <?xml version="1.0"?> |
|
353 | 353 | <log> |
|
354 | 354 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
355 | 355 | <tag>tip</tag> |
|
356 | 356 | <author email="test">test</author> |
|
357 | 357 | <date>2020-01-01T10:01:00+00:00</date> |
|
358 | 358 | <msg xml:space="preserve">third</msg> |
|
359 | 359 | </logentry> |
|
360 | 360 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
361 | 361 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
362 | 362 | <author email="user@hostname">User Name</author> |
|
363 | 363 | <date>1970-01-12T13:46:40+00:00</date> |
|
364 | 364 | <msg xml:space="preserve">second</msg> |
|
365 | 365 | </logentry> |
|
366 | 366 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
367 | 367 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
368 | 368 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
369 | 369 | <author email="person">person</author> |
|
370 | 370 | <date>1970-01-18T08:40:01+00:00</date> |
|
371 | 371 | <msg xml:space="preserve">merge</msg> |
|
372 | 372 | </logentry> |
|
373 | 373 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
374 | 374 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
375 | 375 | <author email="person">person</author> |
|
376 | 376 | <date>1970-01-18T08:40:00+00:00</date> |
|
377 | 377 | <msg xml:space="preserve">new head</msg> |
|
378 | 378 | </logentry> |
|
379 | 379 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
380 | 380 | <branch>foo</branch> |
|
381 | 381 | <author email="person">person</author> |
|
382 | 382 | <date>1970-01-17T04:53:20+00:00</date> |
|
383 | 383 | <msg xml:space="preserve">new branch</msg> |
|
384 | 384 | </logentry> |
|
385 | 385 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
386 | 386 | <author email="person">person</author> |
|
387 | 387 | <date>1970-01-16T01:06:40+00:00</date> |
|
388 | 388 | <msg xml:space="preserve">no user, no domain</msg> |
|
389 | 389 | </logentry> |
|
390 | 390 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
391 | 391 | <author email="other@place">other</author> |
|
392 | 392 | <date>1970-01-14T21:20:00+00:00</date> |
|
393 | 393 | <msg xml:space="preserve">no person</msg> |
|
394 | 394 | </logentry> |
|
395 | 395 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
396 | 396 | <author email="other@place">A. N. Other</author> |
|
397 | 397 | <date>1970-01-13T17:33:20+00:00</date> |
|
398 | 398 | <msg xml:space="preserve">other 1 |
|
399 | 399 | other 2 |
|
400 | 400 | |
|
401 | 401 | other 3</msg> |
|
402 | 402 | </logentry> |
|
403 | 403 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
404 | 404 | <author email="user@hostname">User Name</author> |
|
405 | 405 | <date>1970-01-12T13:46:40+00:00</date> |
|
406 | 406 | <msg xml:space="preserve">line 1 |
|
407 | 407 | line 2</msg> |
|
408 | 408 | </logentry> |
|
409 | 409 | </log> |
|
410 | 410 | |
|
411 | 411 | $ hg log -v --style xml |
|
412 | 412 | <?xml version="1.0"?> |
|
413 | 413 | <log> |
|
414 | 414 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
415 | 415 | <tag>tip</tag> |
|
416 | 416 | <author email="test">test</author> |
|
417 | 417 | <date>2020-01-01T10:01:00+00:00</date> |
|
418 | 418 | <msg xml:space="preserve">third</msg> |
|
419 | 419 | <paths> |
|
420 | 420 | <path action="A">fourth</path> |
|
421 | 421 | <path action="A">third</path> |
|
422 | 422 | <path action="R">second</path> |
|
423 | 423 | </paths> |
|
424 | 424 | <copies> |
|
425 | 425 | <copy source="second">fourth</copy> |
|
426 | 426 | </copies> |
|
427 | 427 | </logentry> |
|
428 | 428 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
429 | 429 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
430 | 430 | <author email="user@hostname">User Name</author> |
|
431 | 431 | <date>1970-01-12T13:46:40+00:00</date> |
|
432 | 432 | <msg xml:space="preserve">second</msg> |
|
433 | 433 | <paths> |
|
434 | 434 | <path action="A">second</path> |
|
435 | 435 | </paths> |
|
436 | 436 | </logentry> |
|
437 | 437 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
438 | 438 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
439 | 439 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
440 | 440 | <author email="person">person</author> |
|
441 | 441 | <date>1970-01-18T08:40:01+00:00</date> |
|
442 | 442 | <msg xml:space="preserve">merge</msg> |
|
443 | 443 | <paths> |
|
444 | 444 | </paths> |
|
445 | 445 | </logentry> |
|
446 | 446 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
447 | 447 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
448 | 448 | <author email="person">person</author> |
|
449 | 449 | <date>1970-01-18T08:40:00+00:00</date> |
|
450 | 450 | <msg xml:space="preserve">new head</msg> |
|
451 | 451 | <paths> |
|
452 | 452 | <path action="A">d</path> |
|
453 | 453 | </paths> |
|
454 | 454 | </logentry> |
|
455 | 455 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
456 | 456 | <branch>foo</branch> |
|
457 | 457 | <author email="person">person</author> |
|
458 | 458 | <date>1970-01-17T04:53:20+00:00</date> |
|
459 | 459 | <msg xml:space="preserve">new branch</msg> |
|
460 | 460 | <paths> |
|
461 | 461 | </paths> |
|
462 | 462 | </logentry> |
|
463 | 463 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
464 | 464 | <author email="person">person</author> |
|
465 | 465 | <date>1970-01-16T01:06:40+00:00</date> |
|
466 | 466 | <msg xml:space="preserve">no user, no domain</msg> |
|
467 | 467 | <paths> |
|
468 | 468 | <path action="M">c</path> |
|
469 | 469 | </paths> |
|
470 | 470 | </logentry> |
|
471 | 471 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
472 | 472 | <author email="other@place">other</author> |
|
473 | 473 | <date>1970-01-14T21:20:00+00:00</date> |
|
474 | 474 | <msg xml:space="preserve">no person</msg> |
|
475 | 475 | <paths> |
|
476 | 476 | <path action="A">c</path> |
|
477 | 477 | </paths> |
|
478 | 478 | </logentry> |
|
479 | 479 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
480 | 480 | <author email="other@place">A. N. Other</author> |
|
481 | 481 | <date>1970-01-13T17:33:20+00:00</date> |
|
482 | 482 | <msg xml:space="preserve">other 1 |
|
483 | 483 | other 2 |
|
484 | 484 | |
|
485 | 485 | other 3</msg> |
|
486 | 486 | <paths> |
|
487 | 487 | <path action="A">b</path> |
|
488 | 488 | </paths> |
|
489 | 489 | </logentry> |
|
490 | 490 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
491 | 491 | <author email="user@hostname">User Name</author> |
|
492 | 492 | <date>1970-01-12T13:46:40+00:00</date> |
|
493 | 493 | <msg xml:space="preserve">line 1 |
|
494 | 494 | line 2</msg> |
|
495 | 495 | <paths> |
|
496 | 496 | <path action="A">a</path> |
|
497 | 497 | </paths> |
|
498 | 498 | </logentry> |
|
499 | 499 | </log> |
|
500 | 500 | |
|
501 | 501 | $ hg log --debug --style xml |
|
502 | 502 | <?xml version="1.0"?> |
|
503 | 503 | <log> |
|
504 | 504 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
505 | 505 | <tag>tip</tag> |
|
506 | 506 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> |
|
507 | 507 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
508 | 508 | <author email="test">test</author> |
|
509 | 509 | <date>2020-01-01T10:01:00+00:00</date> |
|
510 | 510 | <msg xml:space="preserve">third</msg> |
|
511 | 511 | <paths> |
|
512 | 512 | <path action="A">fourth</path> |
|
513 | 513 | <path action="A">third</path> |
|
514 | 514 | <path action="R">second</path> |
|
515 | 515 | </paths> |
|
516 | 516 | <copies> |
|
517 | 517 | <copy source="second">fourth</copy> |
|
518 | 518 | </copies> |
|
519 | 519 | <extra key="branch">default</extra> |
|
520 | 520 | </logentry> |
|
521 | 521 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
522 | 522 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
523 | 523 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
524 | 524 | <author email="user@hostname">User Name</author> |
|
525 | 525 | <date>1970-01-12T13:46:40+00:00</date> |
|
526 | 526 | <msg xml:space="preserve">second</msg> |
|
527 | 527 | <paths> |
|
528 | 528 | <path action="A">second</path> |
|
529 | 529 | </paths> |
|
530 | 530 | <extra key="branch">default</extra> |
|
531 | 531 | </logentry> |
|
532 | 532 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
533 | 533 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
534 | 534 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
535 | 535 | <author email="person">person</author> |
|
536 | 536 | <date>1970-01-18T08:40:01+00:00</date> |
|
537 | 537 | <msg xml:space="preserve">merge</msg> |
|
538 | 538 | <paths> |
|
539 | 539 | </paths> |
|
540 | 540 | <extra key="branch">default</extra> |
|
541 | 541 | </logentry> |
|
542 | 542 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
543 | 543 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
544 | 544 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
545 | 545 | <author email="person">person</author> |
|
546 | 546 | <date>1970-01-18T08:40:00+00:00</date> |
|
547 | 547 | <msg xml:space="preserve">new head</msg> |
|
548 | 548 | <paths> |
|
549 | 549 | <path action="A">d</path> |
|
550 | 550 | </paths> |
|
551 | 551 | <extra key="branch">default</extra> |
|
552 | 552 | </logentry> |
|
553 | 553 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
554 | 554 | <branch>foo</branch> |
|
555 | 555 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
556 | 556 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
557 | 557 | <author email="person">person</author> |
|
558 | 558 | <date>1970-01-17T04:53:20+00:00</date> |
|
559 | 559 | <msg xml:space="preserve">new branch</msg> |
|
560 | 560 | <paths> |
|
561 | 561 | </paths> |
|
562 | 562 | <extra key="branch">foo</extra> |
|
563 | 563 | </logentry> |
|
564 | 564 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
565 | 565 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> |
|
566 | 566 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
567 | 567 | <author email="person">person</author> |
|
568 | 568 | <date>1970-01-16T01:06:40+00:00</date> |
|
569 | 569 | <msg xml:space="preserve">no user, no domain</msg> |
|
570 | 570 | <paths> |
|
571 | 571 | <path action="M">c</path> |
|
572 | 572 | </paths> |
|
573 | 573 | <extra key="branch">default</extra> |
|
574 | 574 | </logentry> |
|
575 | 575 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
576 | 576 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> |
|
577 | 577 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
578 | 578 | <author email="other@place">other</author> |
|
579 | 579 | <date>1970-01-14T21:20:00+00:00</date> |
|
580 | 580 | <msg xml:space="preserve">no person</msg> |
|
581 | 581 | <paths> |
|
582 | 582 | <path action="A">c</path> |
|
583 | 583 | </paths> |
|
584 | 584 | <extra key="branch">default</extra> |
|
585 | 585 | </logentry> |
|
586 | 586 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
587 | 587 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> |
|
588 | 588 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
589 | 589 | <author email="other@place">A. N. Other</author> |
|
590 | 590 | <date>1970-01-13T17:33:20+00:00</date> |
|
591 | 591 | <msg xml:space="preserve">other 1 |
|
592 | 592 | other 2 |
|
593 | 593 | |
|
594 | 594 | other 3</msg> |
|
595 | 595 | <paths> |
|
596 | 596 | <path action="A">b</path> |
|
597 | 597 | </paths> |
|
598 | 598 | <extra key="branch">default</extra> |
|
599 | 599 | </logentry> |
|
600 | 600 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
601 | 601 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
602 | 602 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
603 | 603 | <author email="user@hostname">User Name</author> |
|
604 | 604 | <date>1970-01-12T13:46:40+00:00</date> |
|
605 | 605 | <msg xml:space="preserve">line 1 |
|
606 | 606 | line 2</msg> |
|
607 | 607 | <paths> |
|
608 | 608 | <path action="A">a</path> |
|
609 | 609 | </paths> |
|
610 | 610 | <extra key="branch">default</extra> |
|
611 | 611 | </logentry> |
|
612 | 612 | </log> |
|
613 | 613 | |
|
614 | 614 | |
|
615 | 615 | Test JSON style: |
|
616 | 616 | |
|
617 | 617 | $ hg log -k nosuch -Tjson |
|
618 | 618 | [] |
|
619 | 619 | |
|
620 | 620 | $ hg log -qr . -Tjson |
|
621 | 621 | [ |
|
622 | 622 | { |
|
623 | 623 | "rev": 8, |
|
624 | 624 | "node": "95c24699272ef57d062b8bccc32c878bf841784a" |
|
625 | 625 | } |
|
626 | 626 | ] |
|
627 | 627 | |
|
628 | 628 | $ hg log -vpr . -Tjson --stat |
|
629 | 629 | [ |
|
630 | 630 | { |
|
631 | 631 | "rev": 8, |
|
632 | 632 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
633 | 633 | "branch": "default", |
|
634 | 634 | "phase": "draft", |
|
635 | 635 | "user": "test", |
|
636 | 636 | "date": [1577872860, 0], |
|
637 | 637 | "desc": "third", |
|
638 | 638 | "bookmarks": [], |
|
639 | 639 | "tags": ["tip"], |
|
640 | 640 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
641 | 641 | "files": ["fourth", "second", "third"], |
|
642 | 642 | "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", |
|
643 | 643 | "diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n" |
|
644 | 644 | } |
|
645 | 645 | ] |
|
646 | 646 | |
|
647 | 647 | honor --git but not format-breaking diffopts |
|
648 | 648 | $ hg --config diff.noprefix=True log --git -vpr . -Tjson |
|
649 | 649 | [ |
|
650 | 650 | { |
|
651 | 651 | "rev": 8, |
|
652 | 652 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
653 | 653 | "branch": "default", |
|
654 | 654 | "phase": "draft", |
|
655 | 655 | "user": "test", |
|
656 | 656 | "date": [1577872860, 0], |
|
657 | 657 | "desc": "third", |
|
658 | 658 | "bookmarks": [], |
|
659 | 659 | "tags": ["tip"], |
|
660 | 660 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
661 | 661 | "files": ["fourth", "second", "third"], |
|
662 | 662 | "diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n" |
|
663 | 663 | } |
|
664 | 664 | ] |
|
665 | 665 | |
|
666 | 666 | $ hg log -T json |
|
667 | 667 | [ |
|
668 | 668 | { |
|
669 | 669 | "rev": 8, |
|
670 | 670 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
671 | 671 | "branch": "default", |
|
672 | 672 | "phase": "draft", |
|
673 | 673 | "user": "test", |
|
674 | 674 | "date": [1577872860, 0], |
|
675 | 675 | "desc": "third", |
|
676 | 676 | "bookmarks": [], |
|
677 | 677 | "tags": ["tip"], |
|
678 | 678 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"] |
|
679 | 679 | }, |
|
680 | 680 | { |
|
681 | 681 | "rev": 7, |
|
682 | 682 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
683 | 683 | "branch": "default", |
|
684 | 684 | "phase": "draft", |
|
685 | 685 | "user": "User Name <user@hostname>", |
|
686 | 686 | "date": [1000000, 0], |
|
687 | 687 | "desc": "second", |
|
688 | 688 | "bookmarks": [], |
|
689 | 689 | "tags": [], |
|
690 | 690 | "parents": ["0000000000000000000000000000000000000000"] |
|
691 | 691 | }, |
|
692 | 692 | { |
|
693 | 693 | "rev": 6, |
|
694 | 694 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
695 | 695 | "branch": "default", |
|
696 | 696 | "phase": "draft", |
|
697 | 697 | "user": "person", |
|
698 | 698 | "date": [1500001, 0], |
|
699 | 699 | "desc": "merge", |
|
700 | 700 | "bookmarks": [], |
|
701 | 701 | "tags": [], |
|
702 | 702 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"] |
|
703 | 703 | }, |
|
704 | 704 | { |
|
705 | 705 | "rev": 5, |
|
706 | 706 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
707 | 707 | "branch": "default", |
|
708 | 708 | "phase": "draft", |
|
709 | 709 | "user": "person", |
|
710 | 710 | "date": [1500000, 0], |
|
711 | 711 | "desc": "new head", |
|
712 | 712 | "bookmarks": [], |
|
713 | 713 | "tags": [], |
|
714 | 714 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
715 | 715 | }, |
|
716 | 716 | { |
|
717 | 717 | "rev": 4, |
|
718 | 718 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
719 | 719 | "branch": "foo", |
|
720 | 720 | "phase": "draft", |
|
721 | 721 | "user": "person", |
|
722 | 722 | "date": [1400000, 0], |
|
723 | 723 | "desc": "new branch", |
|
724 | 724 | "bookmarks": [], |
|
725 | 725 | "tags": [], |
|
726 | 726 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
727 | 727 | }, |
|
728 | 728 | { |
|
729 | 729 | "rev": 3, |
|
730 | 730 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
731 | 731 | "branch": "default", |
|
732 | 732 | "phase": "draft", |
|
733 | 733 | "user": "person", |
|
734 | 734 | "date": [1300000, 0], |
|
735 | 735 | "desc": "no user, no domain", |
|
736 | 736 | "bookmarks": [], |
|
737 | 737 | "tags": [], |
|
738 | 738 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"] |
|
739 | 739 | }, |
|
740 | 740 | { |
|
741 | 741 | "rev": 2, |
|
742 | 742 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
743 | 743 | "branch": "default", |
|
744 | 744 | "phase": "draft", |
|
745 | 745 | "user": "other@place", |
|
746 | 746 | "date": [1200000, 0], |
|
747 | 747 | "desc": "no person", |
|
748 | 748 | "bookmarks": [], |
|
749 | 749 | "tags": [], |
|
750 | 750 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"] |
|
751 | 751 | }, |
|
752 | 752 | { |
|
753 | 753 | "rev": 1, |
|
754 | 754 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
755 | 755 | "branch": "default", |
|
756 | 756 | "phase": "draft", |
|
757 | 757 | "user": "A. N. Other <other@place>", |
|
758 | 758 | "date": [1100000, 0], |
|
759 | 759 | "desc": "other 1\nother 2\n\nother 3", |
|
760 | 760 | "bookmarks": [], |
|
761 | 761 | "tags": [], |
|
762 | 762 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"] |
|
763 | 763 | }, |
|
764 | 764 | { |
|
765 | 765 | "rev": 0, |
|
766 | 766 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
767 | 767 | "branch": "default", |
|
768 | 768 | "phase": "draft", |
|
769 | 769 | "user": "User Name <user@hostname>", |
|
770 | 770 | "date": [1000000, 0], |
|
771 | 771 | "desc": "line 1\nline 2", |
|
772 | 772 | "bookmarks": [], |
|
773 | 773 | "tags": [], |
|
774 | 774 | "parents": ["0000000000000000000000000000000000000000"] |
|
775 | 775 | } |
|
776 | 776 | ] |
|
777 | 777 | |
|
778 | 778 | $ hg heads -v -Tjson |
|
779 | 779 | [ |
|
780 | 780 | { |
|
781 | 781 | "rev": 8, |
|
782 | 782 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
783 | 783 | "branch": "default", |
|
784 | 784 | "phase": "draft", |
|
785 | 785 | "user": "test", |
|
786 | 786 | "date": [1577872860, 0], |
|
787 | 787 | "desc": "third", |
|
788 | 788 | "bookmarks": [], |
|
789 | 789 | "tags": ["tip"], |
|
790 | 790 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
791 | 791 | "files": ["fourth", "second", "third"] |
|
792 | 792 | }, |
|
793 | 793 | { |
|
794 | 794 | "rev": 6, |
|
795 | 795 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
796 | 796 | "branch": "default", |
|
797 | 797 | "phase": "draft", |
|
798 | 798 | "user": "person", |
|
799 | 799 | "date": [1500001, 0], |
|
800 | 800 | "desc": "merge", |
|
801 | 801 | "bookmarks": [], |
|
802 | 802 | "tags": [], |
|
803 | 803 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
804 | 804 | "files": [] |
|
805 | 805 | }, |
|
806 | 806 | { |
|
807 | 807 | "rev": 4, |
|
808 | 808 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
809 | 809 | "branch": "foo", |
|
810 | 810 | "phase": "draft", |
|
811 | 811 | "user": "person", |
|
812 | 812 | "date": [1400000, 0], |
|
813 | 813 | "desc": "new branch", |
|
814 | 814 | "bookmarks": [], |
|
815 | 815 | "tags": [], |
|
816 | 816 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
817 | 817 | "files": [] |
|
818 | 818 | } |
|
819 | 819 | ] |
|
820 | 820 | |
|
821 | 821 | $ hg log --debug -Tjson |
|
822 | 822 | [ |
|
823 | 823 | { |
|
824 | 824 | "rev": 8, |
|
825 | 825 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
826 | 826 | "branch": "default", |
|
827 | 827 | "phase": "draft", |
|
828 | 828 | "user": "test", |
|
829 | 829 | "date": [1577872860, 0], |
|
830 | 830 | "desc": "third", |
|
831 | 831 | "bookmarks": [], |
|
832 | 832 | "tags": ["tip"], |
|
833 | 833 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
834 | 834 | "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64", |
|
835 | 835 | "extra": {"branch": "default"}, |
|
836 | 836 | "modified": [], |
|
837 | 837 | "added": ["fourth", "third"], |
|
838 | 838 | "removed": ["second"] |
|
839 | 839 | }, |
|
840 | 840 | { |
|
841 | 841 | "rev": 7, |
|
842 | 842 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
843 | 843 | "branch": "default", |
|
844 | 844 | "phase": "draft", |
|
845 | 845 | "user": "User Name <user@hostname>", |
|
846 | 846 | "date": [1000000, 0], |
|
847 | 847 | "desc": "second", |
|
848 | 848 | "bookmarks": [], |
|
849 | 849 | "tags": [], |
|
850 | 850 | "parents": ["0000000000000000000000000000000000000000"], |
|
851 | 851 | "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf", |
|
852 | 852 | "extra": {"branch": "default"}, |
|
853 | 853 | "modified": [], |
|
854 | 854 | "added": ["second"], |
|
855 | 855 | "removed": [] |
|
856 | 856 | }, |
|
857 | 857 | { |
|
858 | 858 | "rev": 6, |
|
859 | 859 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
860 | 860 | "branch": "default", |
|
861 | 861 | "phase": "draft", |
|
862 | 862 | "user": "person", |
|
863 | 863 | "date": [1500001, 0], |
|
864 | 864 | "desc": "merge", |
|
865 | 865 | "bookmarks": [], |
|
866 | 866 | "tags": [], |
|
867 | 867 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
868 | 868 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
869 | 869 | "extra": {"branch": "default"}, |
|
870 | 870 | "modified": [], |
|
871 | 871 | "added": [], |
|
872 | 872 | "removed": [] |
|
873 | 873 | }, |
|
874 | 874 | { |
|
875 | 875 | "rev": 5, |
|
876 | 876 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
877 | 877 | "branch": "default", |
|
878 | 878 | "phase": "draft", |
|
879 | 879 | "user": "person", |
|
880 | 880 | "date": [1500000, 0], |
|
881 | 881 | "desc": "new head", |
|
882 | 882 | "bookmarks": [], |
|
883 | 883 | "tags": [], |
|
884 | 884 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
885 | 885 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
886 | 886 | "extra": {"branch": "default"}, |
|
887 | 887 | "modified": [], |
|
888 | 888 | "added": ["d"], |
|
889 | 889 | "removed": [] |
|
890 | 890 | }, |
|
891 | 891 | { |
|
892 | 892 | "rev": 4, |
|
893 | 893 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
894 | 894 | "branch": "foo", |
|
895 | 895 | "phase": "draft", |
|
896 | 896 | "user": "person", |
|
897 | 897 | "date": [1400000, 0], |
|
898 | 898 | "desc": "new branch", |
|
899 | 899 | "bookmarks": [], |
|
900 | 900 | "tags": [], |
|
901 | 901 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
902 | 902 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
903 | 903 | "extra": {"branch": "foo"}, |
|
904 | 904 | "modified": [], |
|
905 | 905 | "added": [], |
|
906 | 906 | "removed": [] |
|
907 | 907 | }, |
|
908 | 908 | { |
|
909 | 909 | "rev": 3, |
|
910 | 910 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
911 | 911 | "branch": "default", |
|
912 | 912 | "phase": "draft", |
|
913 | 913 | "user": "person", |
|
914 | 914 | "date": [1300000, 0], |
|
915 | 915 | "desc": "no user, no domain", |
|
916 | 916 | "bookmarks": [], |
|
917 | 917 | "tags": [], |
|
918 | 918 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"], |
|
919 | 919 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
920 | 920 | "extra": {"branch": "default"}, |
|
921 | 921 | "modified": ["c"], |
|
922 | 922 | "added": [], |
|
923 | 923 | "removed": [] |
|
924 | 924 | }, |
|
925 | 925 | { |
|
926 | 926 | "rev": 2, |
|
927 | 927 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
928 | 928 | "branch": "default", |
|
929 | 929 | "phase": "draft", |
|
930 | 930 | "user": "other@place", |
|
931 | 931 | "date": [1200000, 0], |
|
932 | 932 | "desc": "no person", |
|
933 | 933 | "bookmarks": [], |
|
934 | 934 | "tags": [], |
|
935 | 935 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"], |
|
936 | 936 | "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1", |
|
937 | 937 | "extra": {"branch": "default"}, |
|
938 | 938 | "modified": [], |
|
939 | 939 | "added": ["c"], |
|
940 | 940 | "removed": [] |
|
941 | 941 | }, |
|
942 | 942 | { |
|
943 | 943 | "rev": 1, |
|
944 | 944 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
945 | 945 | "branch": "default", |
|
946 | 946 | "phase": "draft", |
|
947 | 947 | "user": "A. N. Other <other@place>", |
|
948 | 948 | "date": [1100000, 0], |
|
949 | 949 | "desc": "other 1\nother 2\n\nother 3", |
|
950 | 950 | "bookmarks": [], |
|
951 | 951 | "tags": [], |
|
952 | 952 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"], |
|
953 | 953 | "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55", |
|
954 | 954 | "extra": {"branch": "default"}, |
|
955 | 955 | "modified": [], |
|
956 | 956 | "added": ["b"], |
|
957 | 957 | "removed": [] |
|
958 | 958 | }, |
|
959 | 959 | { |
|
960 | 960 | "rev": 0, |
|
961 | 961 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
962 | 962 | "branch": "default", |
|
963 | 963 | "phase": "draft", |
|
964 | 964 | "user": "User Name <user@hostname>", |
|
965 | 965 | "date": [1000000, 0], |
|
966 | 966 | "desc": "line 1\nline 2", |
|
967 | 967 | "bookmarks": [], |
|
968 | 968 | "tags": [], |
|
969 | 969 | "parents": ["0000000000000000000000000000000000000000"], |
|
970 | 970 | "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0", |
|
971 | 971 | "extra": {"branch": "default"}, |
|
972 | 972 | "modified": [], |
|
973 | 973 | "added": ["a"], |
|
974 | 974 | "removed": [] |
|
975 | 975 | } |
|
976 | 976 | ] |
|
977 | 977 | |
|
978 | 978 | Error if style not readable: |
|
979 | 979 | |
|
980 | 980 | #if unix-permissions no-root |
|
981 | 981 | $ touch q |
|
982 | 982 | $ chmod 0 q |
|
983 | 983 | $ hg log --style ./q |
|
984 | 984 | abort: Permission denied: ./q |
|
985 | 985 | [255] |
|
986 | 986 | #endif |
|
987 | 987 | |
|
988 | 988 | Error if no style: |
|
989 | 989 | |
|
990 | 990 | $ hg log --style notexist |
|
991 | 991 | abort: style 'notexist' not found |
|
992 | 992 | (available styles: bisect, changelog, compact, default, phases, status, xml) |
|
993 | 993 | [255] |
|
994 | 994 | |
|
995 | 995 | $ hg log -T list |
|
996 | 996 | available styles: bisect, changelog, compact, default, phases, status, xml |
|
997 | 997 | abort: specify a template |
|
998 | 998 | [255] |
|
999 | 999 | |
|
1000 | 1000 | Error if style missing key: |
|
1001 | 1001 | |
|
1002 | 1002 | $ echo 'q = q' > t |
|
1003 | 1003 | $ hg log --style ./t |
|
1004 | 1004 | abort: "changeset" not in template map |
|
1005 | 1005 | [255] |
|
1006 | 1006 | |
|
1007 | 1007 | Error if style missing value: |
|
1008 | 1008 | |
|
1009 | 1009 | $ echo 'changeset =' > t |
|
1010 | 1010 | $ hg log --style t |
|
1011 | 1011 | abort: t:1: missing value |
|
1012 | 1012 | [255] |
|
1013 | 1013 | |
|
1014 | 1014 | Error if include fails: |
|
1015 | 1015 | |
|
1016 | 1016 | $ echo 'changeset = q' >> t |
|
1017 | 1017 | #if unix-permissions no-root |
|
1018 | 1018 | $ hg log --style ./t |
|
1019 | 1019 | abort: template file ./q: Permission denied |
|
1020 | 1020 | [255] |
|
1021 | 1021 | $ rm -f q |
|
1022 | 1022 | #endif |
|
1023 | 1023 | |
|
1024 | 1024 | Include works: |
|
1025 | 1025 | |
|
1026 | 1026 | $ echo '{rev}' > q |
|
1027 | 1027 | $ hg log --style ./t |
|
1028 | 1028 | 8 |
|
1029 | 1029 | 7 |
|
1030 | 1030 | 6 |
|
1031 | 1031 | 5 |
|
1032 | 1032 | 4 |
|
1033 | 1033 | 3 |
|
1034 | 1034 | 2 |
|
1035 | 1035 | 1 |
|
1036 | 1036 | 0 |
|
1037 | 1037 | |
|
1038 | 1038 | Check that recursive reference does not fall into RuntimeError (issue4758): |
|
1039 | 1039 | |
|
1040 | 1040 | common mistake: |
|
1041 | 1041 | |
|
1042 | 1042 | $ hg log -T '{changeset}\n' |
|
1043 | 1043 | abort: recursive reference 'changeset' in template |
|
1044 | 1044 | [255] |
|
1045 | 1045 | |
|
1046 | 1046 | circular reference: |
|
1047 | 1047 | |
|
1048 | 1048 | $ cat << EOF > issue4758 |
|
1049 | 1049 | > changeset = '{foo}' |
|
1050 | 1050 | > foo = '{changeset}' |
|
1051 | 1051 | > EOF |
|
1052 | 1052 | $ hg log --style ./issue4758 |
|
1053 | 1053 | abort: recursive reference 'foo' in template |
|
1054 | 1054 | [255] |
|
1055 | 1055 | |
|
1056 | 1056 | buildmap() -> gettemplate(), where no thunk was made: |
|
1057 | 1057 | |
|
1058 | 1058 | $ hg log -T '{files % changeset}\n' |
|
1059 | 1059 | abort: recursive reference 'changeset' in template |
|
1060 | 1060 | [255] |
|
1061 | 1061 | |
|
1062 | 1062 | not a recursion if a keyword of the same name exists: |
|
1063 | 1063 | |
|
1064 | 1064 | $ cat << EOF > issue4758 |
|
1065 | 1065 | > changeset = '{tags % rev}' |
|
1066 | 1066 | > rev = '{rev} {tag}\n' |
|
1067 | 1067 | > EOF |
|
1068 | 1068 | $ hg log --style ./issue4758 -r tip |
|
1069 | 1069 | 8 tip |
|
1070 | 1070 | |
|
1071 | 1071 | Check that {phase} works correctly on parents: |
|
1072 | 1072 | |
|
1073 | 1073 | $ cat << EOF > parentphase |
|
1074 | 1074 | > changeset_debug = '{rev} ({phase}):{parents}\n' |
|
1075 | 1075 | > parent = ' {rev} ({phase})' |
|
1076 | 1076 | > EOF |
|
1077 | 1077 | $ hg phase -r 5 --public |
|
1078 | 1078 | $ hg phase -r 7 --secret --force |
|
1079 | 1079 | $ hg log --debug -G --style ./parentphase |
|
1080 | 1080 | @ 8 (secret): 7 (secret) -1 (public) |
|
1081 | 1081 | | |
|
1082 | 1082 | o 7 (secret): -1 (public) -1 (public) |
|
1083 | 1083 | |
|
1084 | 1084 | o 6 (draft): 5 (public) 4 (draft) |
|
1085 | 1085 | |\ |
|
1086 | 1086 | | o 5 (public): 3 (public) -1 (public) |
|
1087 | 1087 | | | |
|
1088 | 1088 | o | 4 (draft): 3 (public) -1 (public) |
|
1089 | 1089 | |/ |
|
1090 | 1090 | o 3 (public): 2 (public) -1 (public) |
|
1091 | 1091 | | |
|
1092 | 1092 | o 2 (public): 1 (public) -1 (public) |
|
1093 | 1093 | | |
|
1094 | 1094 | o 1 (public): 0 (public) -1 (public) |
|
1095 | 1095 | | |
|
1096 | 1096 | o 0 (public): -1 (public) -1 (public) |
|
1097 | 1097 | |
|
1098 | 1098 | |
|
1099 | 1099 | Missing non-standard names give no error (backward compatibility): |
|
1100 | 1100 | |
|
1101 | 1101 | $ echo "changeset = '{c}'" > t |
|
1102 | 1102 | $ hg log --style ./t |
|
1103 | 1103 | |
|
1104 | 1104 | Defining non-standard name works: |
|
1105 | 1105 | |
|
1106 | 1106 | $ cat <<EOF > t |
|
1107 | 1107 | > changeset = '{c}' |
|
1108 | 1108 | > c = q |
|
1109 | 1109 | > EOF |
|
1110 | 1110 | $ hg log --style ./t |
|
1111 | 1111 | 8 |
|
1112 | 1112 | 7 |
|
1113 | 1113 | 6 |
|
1114 | 1114 | 5 |
|
1115 | 1115 | 4 |
|
1116 | 1116 | 3 |
|
1117 | 1117 | 2 |
|
1118 | 1118 | 1 |
|
1119 | 1119 | 0 |
|
1120 | 1120 | |
|
1121 | 1121 | ui.style works: |
|
1122 | 1122 | |
|
1123 | 1123 | $ echo '[ui]' > .hg/hgrc |
|
1124 | 1124 | $ echo 'style = t' >> .hg/hgrc |
|
1125 | 1125 | $ hg log |
|
1126 | 1126 | 8 |
|
1127 | 1127 | 7 |
|
1128 | 1128 | 6 |
|
1129 | 1129 | 5 |
|
1130 | 1130 | 4 |
|
1131 | 1131 | 3 |
|
1132 | 1132 | 2 |
|
1133 | 1133 | 1 |
|
1134 | 1134 | 0 |
|
1135 | 1135 | |
|
1136 | 1136 | |
|
1137 | 1137 | Issue338: |
|
1138 | 1138 | |
|
1139 | 1139 | $ hg log --style=changelog > changelog |
|
1140 | 1140 | |
|
1141 | 1141 | $ cat changelog |
|
1142 | 1142 | 2020-01-01 test <test> |
|
1143 | 1143 | |
|
1144 | 1144 | * fourth, second, third: |
|
1145 | 1145 | third |
|
1146 | 1146 | [95c24699272e] [tip] |
|
1147 | 1147 | |
|
1148 | 1148 | 1970-01-12 User Name <user@hostname> |
|
1149 | 1149 | |
|
1150 | 1150 | * second: |
|
1151 | 1151 | second |
|
1152 | 1152 | [29114dbae42b] |
|
1153 | 1153 | |
|
1154 | 1154 | 1970-01-18 person <person> |
|
1155 | 1155 | |
|
1156 | 1156 | * merge |
|
1157 | 1157 | [d41e714fe50d] |
|
1158 | 1158 | |
|
1159 | 1159 | * d: |
|
1160 | 1160 | new head |
|
1161 | 1161 | [13207e5a10d9] |
|
1162 | 1162 | |
|
1163 | 1163 | 1970-01-17 person <person> |
|
1164 | 1164 | |
|
1165 | 1165 | * new branch |
|
1166 | 1166 | [bbe44766e73d] <foo> |
|
1167 | 1167 | |
|
1168 | 1168 | 1970-01-16 person <person> |
|
1169 | 1169 | |
|
1170 | 1170 | * c: |
|
1171 | 1171 | no user, no domain |
|
1172 | 1172 | [10e46f2dcbf4] |
|
1173 | 1173 | |
|
1174 | 1174 | 1970-01-14 other <other@place> |
|
1175 | 1175 | |
|
1176 | 1176 | * c: |
|
1177 | 1177 | no person |
|
1178 | 1178 | [97054abb4ab8] |
|
1179 | 1179 | |
|
1180 | 1180 | 1970-01-13 A. N. Other <other@place> |
|
1181 | 1181 | |
|
1182 | 1182 | * b: |
|
1183 | 1183 | other 1 other 2 |
|
1184 | 1184 | |
|
1185 | 1185 | other 3 |
|
1186 | 1186 | [b608e9d1a3f0] |
|
1187 | 1187 | |
|
1188 | 1188 | 1970-01-12 User Name <user@hostname> |
|
1189 | 1189 | |
|
1190 | 1190 | * a: |
|
1191 | 1191 | line 1 line 2 |
|
1192 | 1192 | [1e4e1b8f71e0] |
|
1193 | 1193 | |
|
1194 | 1194 | |
|
1195 | 1195 | Issue2130: xml output for 'hg heads' is malformed |
|
1196 | 1196 | |
|
1197 | 1197 | $ hg heads --style changelog |
|
1198 | 1198 | 2020-01-01 test <test> |
|
1199 | 1199 | |
|
1200 | 1200 | * fourth, second, third: |
|
1201 | 1201 | third |
|
1202 | 1202 | [95c24699272e] [tip] |
|
1203 | 1203 | |
|
1204 | 1204 | 1970-01-18 person <person> |
|
1205 | 1205 | |
|
1206 | 1206 | * merge |
|
1207 | 1207 | [d41e714fe50d] |
|
1208 | 1208 | |
|
1209 | 1209 | 1970-01-17 person <person> |
|
1210 | 1210 | |
|
1211 | 1211 | * new branch |
|
1212 | 1212 | [bbe44766e73d] <foo> |
|
1213 | 1213 | |
|
1214 | 1214 | |
|
1215 | 1215 | Keys work: |
|
1216 | 1216 | |
|
1217 | 1217 | $ for key in author branch branches date desc file_adds file_dels file_mods \ |
|
1218 | 1218 | > file_copies file_copies_switch files \ |
|
1219 | 1219 | > manifest node parents rev tags diffstat extras \ |
|
1220 | 1220 | > p1rev p2rev p1node p2node; do |
|
1221 | 1221 | > for mode in '' --verbose --debug; do |
|
1222 | 1222 | > hg log $mode --template "$key$mode: {$key}\n" |
|
1223 | 1223 | > done |
|
1224 | 1224 | > done |
|
1225 | 1225 | author: test |
|
1226 | 1226 | author: User Name <user@hostname> |
|
1227 | 1227 | author: person |
|
1228 | 1228 | author: person |
|
1229 | 1229 | author: person |
|
1230 | 1230 | author: person |
|
1231 | 1231 | author: other@place |
|
1232 | 1232 | author: A. N. Other <other@place> |
|
1233 | 1233 | author: User Name <user@hostname> |
|
1234 | 1234 | author--verbose: test |
|
1235 | 1235 | author--verbose: User Name <user@hostname> |
|
1236 | 1236 | author--verbose: person |
|
1237 | 1237 | author--verbose: person |
|
1238 | 1238 | author--verbose: person |
|
1239 | 1239 | author--verbose: person |
|
1240 | 1240 | author--verbose: other@place |
|
1241 | 1241 | author--verbose: A. N. Other <other@place> |
|
1242 | 1242 | author--verbose: User Name <user@hostname> |
|
1243 | 1243 | author--debug: test |
|
1244 | 1244 | author--debug: User Name <user@hostname> |
|
1245 | 1245 | author--debug: person |
|
1246 | 1246 | author--debug: person |
|
1247 | 1247 | author--debug: person |
|
1248 | 1248 | author--debug: person |
|
1249 | 1249 | author--debug: other@place |
|
1250 | 1250 | author--debug: A. N. Other <other@place> |
|
1251 | 1251 | author--debug: User Name <user@hostname> |
|
1252 | 1252 | branch: default |
|
1253 | 1253 | branch: default |
|
1254 | 1254 | branch: default |
|
1255 | 1255 | branch: default |
|
1256 | 1256 | branch: foo |
|
1257 | 1257 | branch: default |
|
1258 | 1258 | branch: default |
|
1259 | 1259 | branch: default |
|
1260 | 1260 | branch: default |
|
1261 | 1261 | branch--verbose: default |
|
1262 | 1262 | branch--verbose: default |
|
1263 | 1263 | branch--verbose: default |
|
1264 | 1264 | branch--verbose: default |
|
1265 | 1265 | branch--verbose: foo |
|
1266 | 1266 | branch--verbose: default |
|
1267 | 1267 | branch--verbose: default |
|
1268 | 1268 | branch--verbose: default |
|
1269 | 1269 | branch--verbose: default |
|
1270 | 1270 | branch--debug: default |
|
1271 | 1271 | branch--debug: default |
|
1272 | 1272 | branch--debug: default |
|
1273 | 1273 | branch--debug: default |
|
1274 | 1274 | branch--debug: foo |
|
1275 | 1275 | branch--debug: default |
|
1276 | 1276 | branch--debug: default |
|
1277 | 1277 | branch--debug: default |
|
1278 | 1278 | branch--debug: default |
|
1279 | 1279 | branches: |
|
1280 | 1280 | branches: |
|
1281 | 1281 | branches: |
|
1282 | 1282 | branches: |
|
1283 | 1283 | branches: foo |
|
1284 | 1284 | branches: |
|
1285 | 1285 | branches: |
|
1286 | 1286 | branches: |
|
1287 | 1287 | branches: |
|
1288 | 1288 | branches--verbose: |
|
1289 | 1289 | branches--verbose: |
|
1290 | 1290 | branches--verbose: |
|
1291 | 1291 | branches--verbose: |
|
1292 | 1292 | branches--verbose: foo |
|
1293 | 1293 | branches--verbose: |
|
1294 | 1294 | branches--verbose: |
|
1295 | 1295 | branches--verbose: |
|
1296 | 1296 | branches--verbose: |
|
1297 | 1297 | branches--debug: |
|
1298 | 1298 | branches--debug: |
|
1299 | 1299 | branches--debug: |
|
1300 | 1300 | branches--debug: |
|
1301 | 1301 | branches--debug: foo |
|
1302 | 1302 | branches--debug: |
|
1303 | 1303 | branches--debug: |
|
1304 | 1304 | branches--debug: |
|
1305 | 1305 | branches--debug: |
|
1306 | 1306 | date: 1577872860.00 |
|
1307 | 1307 | date: 1000000.00 |
|
1308 | 1308 | date: 1500001.00 |
|
1309 | 1309 | date: 1500000.00 |
|
1310 | 1310 | date: 1400000.00 |
|
1311 | 1311 | date: 1300000.00 |
|
1312 | 1312 | date: 1200000.00 |
|
1313 | 1313 | date: 1100000.00 |
|
1314 | 1314 | date: 1000000.00 |
|
1315 | 1315 | date--verbose: 1577872860.00 |
|
1316 | 1316 | date--verbose: 1000000.00 |
|
1317 | 1317 | date--verbose: 1500001.00 |
|
1318 | 1318 | date--verbose: 1500000.00 |
|
1319 | 1319 | date--verbose: 1400000.00 |
|
1320 | 1320 | date--verbose: 1300000.00 |
|
1321 | 1321 | date--verbose: 1200000.00 |
|
1322 | 1322 | date--verbose: 1100000.00 |
|
1323 | 1323 | date--verbose: 1000000.00 |
|
1324 | 1324 | date--debug: 1577872860.00 |
|
1325 | 1325 | date--debug: 1000000.00 |
|
1326 | 1326 | date--debug: 1500001.00 |
|
1327 | 1327 | date--debug: 1500000.00 |
|
1328 | 1328 | date--debug: 1400000.00 |
|
1329 | 1329 | date--debug: 1300000.00 |
|
1330 | 1330 | date--debug: 1200000.00 |
|
1331 | 1331 | date--debug: 1100000.00 |
|
1332 | 1332 | date--debug: 1000000.00 |
|
1333 | 1333 | desc: third |
|
1334 | 1334 | desc: second |
|
1335 | 1335 | desc: merge |
|
1336 | 1336 | desc: new head |
|
1337 | 1337 | desc: new branch |
|
1338 | 1338 | desc: no user, no domain |
|
1339 | 1339 | desc: no person |
|
1340 | 1340 | desc: other 1 |
|
1341 | 1341 | other 2 |
|
1342 | 1342 | |
|
1343 | 1343 | other 3 |
|
1344 | 1344 | desc: line 1 |
|
1345 | 1345 | line 2 |
|
1346 | 1346 | desc--verbose: third |
|
1347 | 1347 | desc--verbose: second |
|
1348 | 1348 | desc--verbose: merge |
|
1349 | 1349 | desc--verbose: new head |
|
1350 | 1350 | desc--verbose: new branch |
|
1351 | 1351 | desc--verbose: no user, no domain |
|
1352 | 1352 | desc--verbose: no person |
|
1353 | 1353 | desc--verbose: other 1 |
|
1354 | 1354 | other 2 |
|
1355 | 1355 | |
|
1356 | 1356 | other 3 |
|
1357 | 1357 | desc--verbose: line 1 |
|
1358 | 1358 | line 2 |
|
1359 | 1359 | desc--debug: third |
|
1360 | 1360 | desc--debug: second |
|
1361 | 1361 | desc--debug: merge |
|
1362 | 1362 | desc--debug: new head |
|
1363 | 1363 | desc--debug: new branch |
|
1364 | 1364 | desc--debug: no user, no domain |
|
1365 | 1365 | desc--debug: no person |
|
1366 | 1366 | desc--debug: other 1 |
|
1367 | 1367 | other 2 |
|
1368 | 1368 | |
|
1369 | 1369 | other 3 |
|
1370 | 1370 | desc--debug: line 1 |
|
1371 | 1371 | line 2 |
|
1372 | 1372 | file_adds: fourth third |
|
1373 | 1373 | file_adds: second |
|
1374 | 1374 | file_adds: |
|
1375 | 1375 | file_adds: d |
|
1376 | 1376 | file_adds: |
|
1377 | 1377 | file_adds: |
|
1378 | 1378 | file_adds: c |
|
1379 | 1379 | file_adds: b |
|
1380 | 1380 | file_adds: a |
|
1381 | 1381 | file_adds--verbose: fourth third |
|
1382 | 1382 | file_adds--verbose: second |
|
1383 | 1383 | file_adds--verbose: |
|
1384 | 1384 | file_adds--verbose: d |
|
1385 | 1385 | file_adds--verbose: |
|
1386 | 1386 | file_adds--verbose: |
|
1387 | 1387 | file_adds--verbose: c |
|
1388 | 1388 | file_adds--verbose: b |
|
1389 | 1389 | file_adds--verbose: a |
|
1390 | 1390 | file_adds--debug: fourth third |
|
1391 | 1391 | file_adds--debug: second |
|
1392 | 1392 | file_adds--debug: |
|
1393 | 1393 | file_adds--debug: d |
|
1394 | 1394 | file_adds--debug: |
|
1395 | 1395 | file_adds--debug: |
|
1396 | 1396 | file_adds--debug: c |
|
1397 | 1397 | file_adds--debug: b |
|
1398 | 1398 | file_adds--debug: a |
|
1399 | 1399 | file_dels: second |
|
1400 | 1400 | file_dels: |
|
1401 | 1401 | file_dels: |
|
1402 | 1402 | file_dels: |
|
1403 | 1403 | file_dels: |
|
1404 | 1404 | file_dels: |
|
1405 | 1405 | file_dels: |
|
1406 | 1406 | file_dels: |
|
1407 | 1407 | file_dels: |
|
1408 | 1408 | file_dels--verbose: second |
|
1409 | 1409 | file_dels--verbose: |
|
1410 | 1410 | file_dels--verbose: |
|
1411 | 1411 | file_dels--verbose: |
|
1412 | 1412 | file_dels--verbose: |
|
1413 | 1413 | file_dels--verbose: |
|
1414 | 1414 | file_dels--verbose: |
|
1415 | 1415 | file_dels--verbose: |
|
1416 | 1416 | file_dels--verbose: |
|
1417 | 1417 | file_dels--debug: second |
|
1418 | 1418 | file_dels--debug: |
|
1419 | 1419 | file_dels--debug: |
|
1420 | 1420 | file_dels--debug: |
|
1421 | 1421 | file_dels--debug: |
|
1422 | 1422 | file_dels--debug: |
|
1423 | 1423 | file_dels--debug: |
|
1424 | 1424 | file_dels--debug: |
|
1425 | 1425 | file_dels--debug: |
|
1426 | 1426 | file_mods: |
|
1427 | 1427 | file_mods: |
|
1428 | 1428 | file_mods: |
|
1429 | 1429 | file_mods: |
|
1430 | 1430 | file_mods: |
|
1431 | 1431 | file_mods: c |
|
1432 | 1432 | file_mods: |
|
1433 | 1433 | file_mods: |
|
1434 | 1434 | file_mods: |
|
1435 | 1435 | file_mods--verbose: |
|
1436 | 1436 | file_mods--verbose: |
|
1437 | 1437 | file_mods--verbose: |
|
1438 | 1438 | file_mods--verbose: |
|
1439 | 1439 | file_mods--verbose: |
|
1440 | 1440 | file_mods--verbose: c |
|
1441 | 1441 | file_mods--verbose: |
|
1442 | 1442 | file_mods--verbose: |
|
1443 | 1443 | file_mods--verbose: |
|
1444 | 1444 | file_mods--debug: |
|
1445 | 1445 | file_mods--debug: |
|
1446 | 1446 | file_mods--debug: |
|
1447 | 1447 | file_mods--debug: |
|
1448 | 1448 | file_mods--debug: |
|
1449 | 1449 | file_mods--debug: c |
|
1450 | 1450 | file_mods--debug: |
|
1451 | 1451 | file_mods--debug: |
|
1452 | 1452 | file_mods--debug: |
|
1453 | 1453 | file_copies: fourth (second) |
|
1454 | 1454 | file_copies: |
|
1455 | 1455 | file_copies: |
|
1456 | 1456 | file_copies: |
|
1457 | 1457 | file_copies: |
|
1458 | 1458 | file_copies: |
|
1459 | 1459 | file_copies: |
|
1460 | 1460 | file_copies: |
|
1461 | 1461 | file_copies: |
|
1462 | 1462 | file_copies--verbose: fourth (second) |
|
1463 | 1463 | file_copies--verbose: |
|
1464 | 1464 | file_copies--verbose: |
|
1465 | 1465 | file_copies--verbose: |
|
1466 | 1466 | file_copies--verbose: |
|
1467 | 1467 | file_copies--verbose: |
|
1468 | 1468 | file_copies--verbose: |
|
1469 | 1469 | file_copies--verbose: |
|
1470 | 1470 | file_copies--verbose: |
|
1471 | 1471 | file_copies--debug: fourth (second) |
|
1472 | 1472 | file_copies--debug: |
|
1473 | 1473 | file_copies--debug: |
|
1474 | 1474 | file_copies--debug: |
|
1475 | 1475 | file_copies--debug: |
|
1476 | 1476 | file_copies--debug: |
|
1477 | 1477 | file_copies--debug: |
|
1478 | 1478 | file_copies--debug: |
|
1479 | 1479 | file_copies--debug: |
|
1480 | 1480 | file_copies_switch: |
|
1481 | 1481 | file_copies_switch: |
|
1482 | 1482 | file_copies_switch: |
|
1483 | 1483 | file_copies_switch: |
|
1484 | 1484 | file_copies_switch: |
|
1485 | 1485 | file_copies_switch: |
|
1486 | 1486 | file_copies_switch: |
|
1487 | 1487 | file_copies_switch: |
|
1488 | 1488 | file_copies_switch: |
|
1489 | 1489 | file_copies_switch--verbose: |
|
1490 | 1490 | file_copies_switch--verbose: |
|
1491 | 1491 | file_copies_switch--verbose: |
|
1492 | 1492 | file_copies_switch--verbose: |
|
1493 | 1493 | file_copies_switch--verbose: |
|
1494 | 1494 | file_copies_switch--verbose: |
|
1495 | 1495 | file_copies_switch--verbose: |
|
1496 | 1496 | file_copies_switch--verbose: |
|
1497 | 1497 | file_copies_switch--verbose: |
|
1498 | 1498 | file_copies_switch--debug: |
|
1499 | 1499 | file_copies_switch--debug: |
|
1500 | 1500 | file_copies_switch--debug: |
|
1501 | 1501 | file_copies_switch--debug: |
|
1502 | 1502 | file_copies_switch--debug: |
|
1503 | 1503 | file_copies_switch--debug: |
|
1504 | 1504 | file_copies_switch--debug: |
|
1505 | 1505 | file_copies_switch--debug: |
|
1506 | 1506 | file_copies_switch--debug: |
|
1507 | 1507 | files: fourth second third |
|
1508 | 1508 | files: second |
|
1509 | 1509 | files: |
|
1510 | 1510 | files: d |
|
1511 | 1511 | files: |
|
1512 | 1512 | files: c |
|
1513 | 1513 | files: c |
|
1514 | 1514 | files: b |
|
1515 | 1515 | files: a |
|
1516 | 1516 | files--verbose: fourth second third |
|
1517 | 1517 | files--verbose: second |
|
1518 | 1518 | files--verbose: |
|
1519 | 1519 | files--verbose: d |
|
1520 | 1520 | files--verbose: |
|
1521 | 1521 | files--verbose: c |
|
1522 | 1522 | files--verbose: c |
|
1523 | 1523 | files--verbose: b |
|
1524 | 1524 | files--verbose: a |
|
1525 | 1525 | files--debug: fourth second third |
|
1526 | 1526 | files--debug: second |
|
1527 | 1527 | files--debug: |
|
1528 | 1528 | files--debug: d |
|
1529 | 1529 | files--debug: |
|
1530 | 1530 | files--debug: c |
|
1531 | 1531 | files--debug: c |
|
1532 | 1532 | files--debug: b |
|
1533 | 1533 | files--debug: a |
|
1534 | 1534 | manifest: 6:94961b75a2da |
|
1535 | 1535 | manifest: 5:f2dbc354b94e |
|
1536 | 1536 | manifest: 4:4dc3def4f9b4 |
|
1537 | 1537 | manifest: 4:4dc3def4f9b4 |
|
1538 | 1538 | manifest: 3:cb5a1327723b |
|
1539 | 1539 | manifest: 3:cb5a1327723b |
|
1540 | 1540 | manifest: 2:6e0e82995c35 |
|
1541 | 1541 | manifest: 1:4e8d705b1e53 |
|
1542 | 1542 | manifest: 0:a0c8bcbbb45c |
|
1543 | 1543 | manifest--verbose: 6:94961b75a2da |
|
1544 | 1544 | manifest--verbose: 5:f2dbc354b94e |
|
1545 | 1545 | manifest--verbose: 4:4dc3def4f9b4 |
|
1546 | 1546 | manifest--verbose: 4:4dc3def4f9b4 |
|
1547 | 1547 | manifest--verbose: 3:cb5a1327723b |
|
1548 | 1548 | manifest--verbose: 3:cb5a1327723b |
|
1549 | 1549 | manifest--verbose: 2:6e0e82995c35 |
|
1550 | 1550 | manifest--verbose: 1:4e8d705b1e53 |
|
1551 | 1551 | manifest--verbose: 0:a0c8bcbbb45c |
|
1552 | 1552 | manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64 |
|
1553 | 1553 | manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf |
|
1554 | 1554 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1555 | 1555 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1556 | 1556 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1557 | 1557 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1558 | 1558 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
1559 | 1559 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
1560 | 1560 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
1561 | 1561 | node: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1562 | 1562 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1563 | 1563 | node: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1564 | 1564 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1565 | 1565 | node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1566 | 1566 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1567 | 1567 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
1568 | 1568 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1569 | 1569 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1570 | 1570 | node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1571 | 1571 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1572 | 1572 | node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1573 | 1573 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1574 | 1574 | node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1575 | 1575 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1576 | 1576 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
1577 | 1577 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1578 | 1578 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1579 | 1579 | node--debug: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1580 | 1580 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1581 | 1581 | node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1582 | 1582 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1583 | 1583 | node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1584 | 1584 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1585 | 1585 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
1586 | 1586 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1587 | 1587 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1588 | 1588 | parents: |
|
1589 | 1589 | parents: -1:000000000000 |
|
1590 | 1590 | parents: 5:13207e5a10d9 4:bbe44766e73d |
|
1591 | 1591 | parents: 3:10e46f2dcbf4 |
|
1592 | 1592 | parents: |
|
1593 | 1593 | parents: |
|
1594 | 1594 | parents: |
|
1595 | 1595 | parents: |
|
1596 | 1596 | parents: |
|
1597 | 1597 | parents--verbose: |
|
1598 | 1598 | parents--verbose: -1:000000000000 |
|
1599 | 1599 | parents--verbose: 5:13207e5a10d9 4:bbe44766e73d |
|
1600 | 1600 | parents--verbose: 3:10e46f2dcbf4 |
|
1601 | 1601 | parents--verbose: |
|
1602 | 1602 | parents--verbose: |
|
1603 | 1603 | parents--verbose: |
|
1604 | 1604 | parents--verbose: |
|
1605 | 1605 | parents--verbose: |
|
1606 | 1606 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 |
|
1607 | 1607 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1608 | 1608 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1609 | 1609 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1610 | 1610 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1611 | 1611 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 |
|
1612 | 1612 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
1613 | 1613 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
1614 | 1614 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1615 | 1615 | rev: 8 |
|
1616 | 1616 | rev: 7 |
|
1617 | 1617 | rev: 6 |
|
1618 | 1618 | rev: 5 |
|
1619 | 1619 | rev: 4 |
|
1620 | 1620 | rev: 3 |
|
1621 | 1621 | rev: 2 |
|
1622 | 1622 | rev: 1 |
|
1623 | 1623 | rev: 0 |
|
1624 | 1624 | rev--verbose: 8 |
|
1625 | 1625 | rev--verbose: 7 |
|
1626 | 1626 | rev--verbose: 6 |
|
1627 | 1627 | rev--verbose: 5 |
|
1628 | 1628 | rev--verbose: 4 |
|
1629 | 1629 | rev--verbose: 3 |
|
1630 | 1630 | rev--verbose: 2 |
|
1631 | 1631 | rev--verbose: 1 |
|
1632 | 1632 | rev--verbose: 0 |
|
1633 | 1633 | rev--debug: 8 |
|
1634 | 1634 | rev--debug: 7 |
|
1635 | 1635 | rev--debug: 6 |
|
1636 | 1636 | rev--debug: 5 |
|
1637 | 1637 | rev--debug: 4 |
|
1638 | 1638 | rev--debug: 3 |
|
1639 | 1639 | rev--debug: 2 |
|
1640 | 1640 | rev--debug: 1 |
|
1641 | 1641 | rev--debug: 0 |
|
1642 | 1642 | tags: tip |
|
1643 | 1643 | tags: |
|
1644 | 1644 | tags: |
|
1645 | 1645 | tags: |
|
1646 | 1646 | tags: |
|
1647 | 1647 | tags: |
|
1648 | 1648 | tags: |
|
1649 | 1649 | tags: |
|
1650 | 1650 | tags: |
|
1651 | 1651 | tags--verbose: tip |
|
1652 | 1652 | tags--verbose: |
|
1653 | 1653 | tags--verbose: |
|
1654 | 1654 | tags--verbose: |
|
1655 | 1655 | tags--verbose: |
|
1656 | 1656 | tags--verbose: |
|
1657 | 1657 | tags--verbose: |
|
1658 | 1658 | tags--verbose: |
|
1659 | 1659 | tags--verbose: |
|
1660 | 1660 | tags--debug: tip |
|
1661 | 1661 | tags--debug: |
|
1662 | 1662 | tags--debug: |
|
1663 | 1663 | tags--debug: |
|
1664 | 1664 | tags--debug: |
|
1665 | 1665 | tags--debug: |
|
1666 | 1666 | tags--debug: |
|
1667 | 1667 | tags--debug: |
|
1668 | 1668 | tags--debug: |
|
1669 | 1669 | diffstat: 3: +2/-1 |
|
1670 | 1670 | diffstat: 1: +1/-0 |
|
1671 | 1671 | diffstat: 0: +0/-0 |
|
1672 | 1672 | diffstat: 1: +1/-0 |
|
1673 | 1673 | diffstat: 0: +0/-0 |
|
1674 | 1674 | diffstat: 1: +1/-0 |
|
1675 | 1675 | diffstat: 1: +4/-0 |
|
1676 | 1676 | diffstat: 1: +2/-0 |
|
1677 | 1677 | diffstat: 1: +1/-0 |
|
1678 | 1678 | diffstat--verbose: 3: +2/-1 |
|
1679 | 1679 | diffstat--verbose: 1: +1/-0 |
|
1680 | 1680 | diffstat--verbose: 0: +0/-0 |
|
1681 | 1681 | diffstat--verbose: 1: +1/-0 |
|
1682 | 1682 | diffstat--verbose: 0: +0/-0 |
|
1683 | 1683 | diffstat--verbose: 1: +1/-0 |
|
1684 | 1684 | diffstat--verbose: 1: +4/-0 |
|
1685 | 1685 | diffstat--verbose: 1: +2/-0 |
|
1686 | 1686 | diffstat--verbose: 1: +1/-0 |
|
1687 | 1687 | diffstat--debug: 3: +2/-1 |
|
1688 | 1688 | diffstat--debug: 1: +1/-0 |
|
1689 | 1689 | diffstat--debug: 0: +0/-0 |
|
1690 | 1690 | diffstat--debug: 1: +1/-0 |
|
1691 | 1691 | diffstat--debug: 0: +0/-0 |
|
1692 | 1692 | diffstat--debug: 1: +1/-0 |
|
1693 | 1693 | diffstat--debug: 1: +4/-0 |
|
1694 | 1694 | diffstat--debug: 1: +2/-0 |
|
1695 | 1695 | diffstat--debug: 1: +1/-0 |
|
1696 | 1696 | extras: branch=default |
|
1697 | 1697 | extras: branch=default |
|
1698 | 1698 | extras: branch=default |
|
1699 | 1699 | extras: branch=default |
|
1700 | 1700 | extras: branch=foo |
|
1701 | 1701 | extras: branch=default |
|
1702 | 1702 | extras: branch=default |
|
1703 | 1703 | extras: branch=default |
|
1704 | 1704 | extras: branch=default |
|
1705 | 1705 | extras--verbose: branch=default |
|
1706 | 1706 | extras--verbose: branch=default |
|
1707 | 1707 | extras--verbose: branch=default |
|
1708 | 1708 | extras--verbose: branch=default |
|
1709 | 1709 | extras--verbose: branch=foo |
|
1710 | 1710 | extras--verbose: branch=default |
|
1711 | 1711 | extras--verbose: branch=default |
|
1712 | 1712 | extras--verbose: branch=default |
|
1713 | 1713 | extras--verbose: branch=default |
|
1714 | 1714 | extras--debug: branch=default |
|
1715 | 1715 | extras--debug: branch=default |
|
1716 | 1716 | extras--debug: branch=default |
|
1717 | 1717 | extras--debug: branch=default |
|
1718 | 1718 | extras--debug: branch=foo |
|
1719 | 1719 | extras--debug: branch=default |
|
1720 | 1720 | extras--debug: branch=default |
|
1721 | 1721 | extras--debug: branch=default |
|
1722 | 1722 | extras--debug: branch=default |
|
1723 | 1723 | p1rev: 7 |
|
1724 | 1724 | p1rev: -1 |
|
1725 | 1725 | p1rev: 5 |
|
1726 | 1726 | p1rev: 3 |
|
1727 | 1727 | p1rev: 3 |
|
1728 | 1728 | p1rev: 2 |
|
1729 | 1729 | p1rev: 1 |
|
1730 | 1730 | p1rev: 0 |
|
1731 | 1731 | p1rev: -1 |
|
1732 | 1732 | p1rev--verbose: 7 |
|
1733 | 1733 | p1rev--verbose: -1 |
|
1734 | 1734 | p1rev--verbose: 5 |
|
1735 | 1735 | p1rev--verbose: 3 |
|
1736 | 1736 | p1rev--verbose: 3 |
|
1737 | 1737 | p1rev--verbose: 2 |
|
1738 | 1738 | p1rev--verbose: 1 |
|
1739 | 1739 | p1rev--verbose: 0 |
|
1740 | 1740 | p1rev--verbose: -1 |
|
1741 | 1741 | p1rev--debug: 7 |
|
1742 | 1742 | p1rev--debug: -1 |
|
1743 | 1743 | p1rev--debug: 5 |
|
1744 | 1744 | p1rev--debug: 3 |
|
1745 | 1745 | p1rev--debug: 3 |
|
1746 | 1746 | p1rev--debug: 2 |
|
1747 | 1747 | p1rev--debug: 1 |
|
1748 | 1748 | p1rev--debug: 0 |
|
1749 | 1749 | p1rev--debug: -1 |
|
1750 | 1750 | p2rev: -1 |
|
1751 | 1751 | p2rev: -1 |
|
1752 | 1752 | p2rev: 4 |
|
1753 | 1753 | p2rev: -1 |
|
1754 | 1754 | p2rev: -1 |
|
1755 | 1755 | p2rev: -1 |
|
1756 | 1756 | p2rev: -1 |
|
1757 | 1757 | p2rev: -1 |
|
1758 | 1758 | p2rev: -1 |
|
1759 | 1759 | p2rev--verbose: -1 |
|
1760 | 1760 | p2rev--verbose: -1 |
|
1761 | 1761 | p2rev--verbose: 4 |
|
1762 | 1762 | p2rev--verbose: -1 |
|
1763 | 1763 | p2rev--verbose: -1 |
|
1764 | 1764 | p2rev--verbose: -1 |
|
1765 | 1765 | p2rev--verbose: -1 |
|
1766 | 1766 | p2rev--verbose: -1 |
|
1767 | 1767 | p2rev--verbose: -1 |
|
1768 | 1768 | p2rev--debug: -1 |
|
1769 | 1769 | p2rev--debug: -1 |
|
1770 | 1770 | p2rev--debug: 4 |
|
1771 | 1771 | p2rev--debug: -1 |
|
1772 | 1772 | p2rev--debug: -1 |
|
1773 | 1773 | p2rev--debug: -1 |
|
1774 | 1774 | p2rev--debug: -1 |
|
1775 | 1775 | p2rev--debug: -1 |
|
1776 | 1776 | p2rev--debug: -1 |
|
1777 | 1777 | p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1778 | 1778 | p1node: 0000000000000000000000000000000000000000 |
|
1779 | 1779 | p1node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1780 | 1780 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1781 | 1781 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1782 | 1782 | p1node: 97054abb4ab824450e9164180baf491ae0078465 |
|
1783 | 1783 | p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1784 | 1784 | p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1785 | 1785 | p1node: 0000000000000000000000000000000000000000 |
|
1786 | 1786 | p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1787 | 1787 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
1788 | 1788 | p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1789 | 1789 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1790 | 1790 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1791 | 1791 | p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
1792 | 1792 | p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1793 | 1793 | p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1794 | 1794 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
1795 | 1795 | p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1796 | 1796 | p1node--debug: 0000000000000000000000000000000000000000 |
|
1797 | 1797 | p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1798 | 1798 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1799 | 1799 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1800 | 1800 | p1node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
1801 | 1801 | p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1802 | 1802 | p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1803 | 1803 | p1node--debug: 0000000000000000000000000000000000000000 |
|
1804 | 1804 | p2node: 0000000000000000000000000000000000000000 |
|
1805 | 1805 | p2node: 0000000000000000000000000000000000000000 |
|
1806 | 1806 | p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1807 | 1807 | p2node: 0000000000000000000000000000000000000000 |
|
1808 | 1808 | p2node: 0000000000000000000000000000000000000000 |
|
1809 | 1809 | p2node: 0000000000000000000000000000000000000000 |
|
1810 | 1810 | p2node: 0000000000000000000000000000000000000000 |
|
1811 | 1811 | p2node: 0000000000000000000000000000000000000000 |
|
1812 | 1812 | p2node: 0000000000000000000000000000000000000000 |
|
1813 | 1813 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1814 | 1814 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1815 | 1815 | p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1816 | 1816 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1817 | 1817 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1818 | 1818 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1819 | 1819 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1820 | 1820 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1821 | 1821 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1822 | 1822 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1823 | 1823 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1824 | 1824 | p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1825 | 1825 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1826 | 1826 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1827 | 1827 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1828 | 1828 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1829 | 1829 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1830 | 1830 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1831 | 1831 | |
|
1832 | 1832 | Filters work: |
|
1833 | 1833 | |
|
1834 | 1834 | $ hg log --template '{author|domain}\n' |
|
1835 | 1835 | |
|
1836 | 1836 | hostname |
|
1837 | 1837 | |
|
1838 | 1838 | |
|
1839 | 1839 | |
|
1840 | 1840 | |
|
1841 | 1841 | place |
|
1842 | 1842 | place |
|
1843 | 1843 | hostname |
|
1844 | 1844 | |
|
1845 | 1845 | $ hg log --template '{author|person}\n' |
|
1846 | 1846 | test |
|
1847 | 1847 | User Name |
|
1848 | 1848 | person |
|
1849 | 1849 | person |
|
1850 | 1850 | person |
|
1851 | 1851 | person |
|
1852 | 1852 | other |
|
1853 | 1853 | A. N. Other |
|
1854 | 1854 | User Name |
|
1855 | 1855 | |
|
1856 | 1856 | $ hg log --template '{author|user}\n' |
|
1857 | 1857 | test |
|
1858 | 1858 | user |
|
1859 | 1859 | person |
|
1860 | 1860 | person |
|
1861 | 1861 | person |
|
1862 | 1862 | person |
|
1863 | 1863 | other |
|
1864 | 1864 | other |
|
1865 | 1865 | user |
|
1866 | 1866 | |
|
1867 | 1867 | $ hg log --template '{date|date}\n' |
|
1868 | 1868 | Wed Jan 01 10:01:00 2020 +0000 |
|
1869 | 1869 | Mon Jan 12 13:46:40 1970 +0000 |
|
1870 | 1870 | Sun Jan 18 08:40:01 1970 +0000 |
|
1871 | 1871 | Sun Jan 18 08:40:00 1970 +0000 |
|
1872 | 1872 | Sat Jan 17 04:53:20 1970 +0000 |
|
1873 | 1873 | Fri Jan 16 01:06:40 1970 +0000 |
|
1874 | 1874 | Wed Jan 14 21:20:00 1970 +0000 |
|
1875 | 1875 | Tue Jan 13 17:33:20 1970 +0000 |
|
1876 | 1876 | Mon Jan 12 13:46:40 1970 +0000 |
|
1877 | 1877 | |
|
1878 | 1878 | $ hg log --template '{date|isodate}\n' |
|
1879 | 1879 | 2020-01-01 10:01 +0000 |
|
1880 | 1880 | 1970-01-12 13:46 +0000 |
|
1881 | 1881 | 1970-01-18 08:40 +0000 |
|
1882 | 1882 | 1970-01-18 08:40 +0000 |
|
1883 | 1883 | 1970-01-17 04:53 +0000 |
|
1884 | 1884 | 1970-01-16 01:06 +0000 |
|
1885 | 1885 | 1970-01-14 21:20 +0000 |
|
1886 | 1886 | 1970-01-13 17:33 +0000 |
|
1887 | 1887 | 1970-01-12 13:46 +0000 |
|
1888 | 1888 | |
|
1889 | 1889 | $ hg log --template '{date|isodatesec}\n' |
|
1890 | 1890 | 2020-01-01 10:01:00 +0000 |
|
1891 | 1891 | 1970-01-12 13:46:40 +0000 |
|
1892 | 1892 | 1970-01-18 08:40:01 +0000 |
|
1893 | 1893 | 1970-01-18 08:40:00 +0000 |
|
1894 | 1894 | 1970-01-17 04:53:20 +0000 |
|
1895 | 1895 | 1970-01-16 01:06:40 +0000 |
|
1896 | 1896 | 1970-01-14 21:20:00 +0000 |
|
1897 | 1897 | 1970-01-13 17:33:20 +0000 |
|
1898 | 1898 | 1970-01-12 13:46:40 +0000 |
|
1899 | 1899 | |
|
1900 | 1900 | $ hg log --template '{date|rfc822date}\n' |
|
1901 | 1901 | Wed, 01 Jan 2020 10:01:00 +0000 |
|
1902 | 1902 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
1903 | 1903 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
1904 | 1904 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
1905 | 1905 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
1906 | 1906 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
1907 | 1907 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
1908 | 1908 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
1909 | 1909 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
1910 | 1910 | |
|
1911 | 1911 | $ hg log --template '{desc|firstline}\n' |
|
1912 | 1912 | third |
|
1913 | 1913 | second |
|
1914 | 1914 | merge |
|
1915 | 1915 | new head |
|
1916 | 1916 | new branch |
|
1917 | 1917 | no user, no domain |
|
1918 | 1918 | no person |
|
1919 | 1919 | other 1 |
|
1920 | 1920 | line 1 |
|
1921 | 1921 | |
|
1922 | 1922 | $ hg log --template '{node|short}\n' |
|
1923 | 1923 | 95c24699272e |
|
1924 | 1924 | 29114dbae42b |
|
1925 | 1925 | d41e714fe50d |
|
1926 | 1926 | 13207e5a10d9 |
|
1927 | 1927 | bbe44766e73d |
|
1928 | 1928 | 10e46f2dcbf4 |
|
1929 | 1929 | 97054abb4ab8 |
|
1930 | 1930 | b608e9d1a3f0 |
|
1931 | 1931 | 1e4e1b8f71e0 |
|
1932 | 1932 | |
|
1933 | 1933 | $ hg log --template '<changeset author="{author|xmlescape}"/>\n' |
|
1934 | 1934 | <changeset author="test"/> |
|
1935 | 1935 | <changeset author="User Name <user@hostname>"/> |
|
1936 | 1936 | <changeset author="person"/> |
|
1937 | 1937 | <changeset author="person"/> |
|
1938 | 1938 | <changeset author="person"/> |
|
1939 | 1939 | <changeset author="person"/> |
|
1940 | 1940 | <changeset author="other@place"/> |
|
1941 | 1941 | <changeset author="A. N. Other <other@place>"/> |
|
1942 | 1942 | <changeset author="User Name <user@hostname>"/> |
|
1943 | 1943 | |
|
1944 | 1944 | $ hg log --template '{rev}: {children}\n' |
|
1945 | 1945 | 8: |
|
1946 | 1946 | 7: 8:95c24699272e |
|
1947 | 1947 | 6: |
|
1948 | 1948 | 5: 6:d41e714fe50d |
|
1949 | 1949 | 4: 6:d41e714fe50d |
|
1950 | 1950 | 3: 4:bbe44766e73d 5:13207e5a10d9 |
|
1951 | 1951 | 2: 3:10e46f2dcbf4 |
|
1952 | 1952 | 1: 2:97054abb4ab8 |
|
1953 | 1953 | 0: 1:b608e9d1a3f0 |
|
1954 | 1954 | |
|
1955 | 1955 | Formatnode filter works: |
|
1956 | 1956 | |
|
1957 | 1957 | $ hg -q log -r 0 --template '{node|formatnode}\n' |
|
1958 | 1958 | 1e4e1b8f71e0 |
|
1959 | 1959 | |
|
1960 | 1960 | $ hg log -r 0 --template '{node|formatnode}\n' |
|
1961 | 1961 | 1e4e1b8f71e0 |
|
1962 | 1962 | |
|
1963 | 1963 | $ hg -v log -r 0 --template '{node|formatnode}\n' |
|
1964 | 1964 | 1e4e1b8f71e0 |
|
1965 | 1965 | |
|
1966 | 1966 | $ hg --debug log -r 0 --template '{node|formatnode}\n' |
|
1967 | 1967 | 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1968 | 1968 | |
|
1969 | 1969 | Age filter: |
|
1970 | 1970 | |
|
1971 | 1971 | $ hg init unstable-hash |
|
1972 | 1972 | $ cd unstable-hash |
|
1973 | 1973 | $ hg log --template '{date|age}\n' > /dev/null || exit 1 |
|
1974 | 1974 | |
|
1975 | 1975 | >>> from datetime import datetime, timedelta |
|
1976 | 1976 | >>> fp = open('a', 'w') |
|
1977 | 1977 | >>> n = datetime.now() + timedelta(366 * 7) |
|
1978 | 1978 | >>> fp.write('%d-%d-%d 00:00' % (n.year, n.month, n.day)) |
|
1979 | 1979 | >>> fp.close() |
|
1980 | 1980 | $ hg add a |
|
1981 | 1981 | $ hg commit -m future -d "`cat a`" |
|
1982 | 1982 | |
|
1983 | 1983 | $ hg log -l1 --template '{date|age}\n' |
|
1984 | 1984 | 7 years from now |
|
1985 | 1985 | |
|
1986 | 1986 | $ cd .. |
|
1987 | 1987 | $ rm -rf unstable-hash |
|
1988 | 1988 | |
|
1989 | 1989 | Add a dummy commit to make up for the instability of the above: |
|
1990 | 1990 | |
|
1991 | 1991 | $ echo a > a |
|
1992 | 1992 | $ hg add a |
|
1993 | 1993 | $ hg ci -m future |
|
1994 | 1994 | |
|
1995 | 1995 | Count filter: |
|
1996 | 1996 | |
|
1997 | 1997 | $ hg log -l1 --template '{node|count} {node|short|count}\n' |
|
1998 | 1998 | 40 12 |
|
1999 | 1999 | |
|
2000 | 2000 | $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n' |
|
2001 | 2001 | 0 1 4 |
|
2002 | 2002 | |
|
2003 | 2003 | $ hg log -G --template '{rev}: children: {children|count}, \ |
|
2004 | 2004 | > tags: {tags|count}, file_adds: {file_adds|count}, \ |
|
2005 | 2005 | > ancestors: {revset("ancestors(%s)", rev)|count}' |
|
2006 | 2006 | @ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3 |
|
2007 | 2007 | | |
|
2008 | 2008 | o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2 |
|
2009 | 2009 | | |
|
2010 | 2010 | o 7: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2011 | 2011 | |
|
2012 | 2012 | o 6: children: 0, tags: 0, file_adds: 0, ancestors: 7 |
|
2013 | 2013 | |\ |
|
2014 | 2014 | | o 5: children: 1, tags: 0, file_adds: 1, ancestors: 5 |
|
2015 | 2015 | | | |
|
2016 | 2016 | o | 4: children: 1, tags: 0, file_adds: 0, ancestors: 5 |
|
2017 | 2017 | |/ |
|
2018 | 2018 | o 3: children: 2, tags: 0, file_adds: 0, ancestors: 4 |
|
2019 | 2019 | | |
|
2020 | 2020 | o 2: children: 1, tags: 0, file_adds: 1, ancestors: 3 |
|
2021 | 2021 | | |
|
2022 | 2022 | o 1: children: 1, tags: 0, file_adds: 1, ancestors: 2 |
|
2023 | 2023 | | |
|
2024 | 2024 | o 0: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2025 | 2025 | |
|
2026 | 2026 | |
|
2027 | 2027 | Upper/lower filters: |
|
2028 | 2028 | |
|
2029 | 2029 | $ hg log -r0 --template '{branch|upper}\n' |
|
2030 | 2030 | DEFAULT |
|
2031 | 2031 | $ hg log -r0 --template '{author|lower}\n' |
|
2032 | 2032 | user name <user@hostname> |
|
2033 | 2033 | $ hg log -r0 --template '{date|upper}\n' |
|
2034 | 2034 | abort: template filter 'upper' is not compatible with keyword 'date' |
|
2035 | 2035 | [255] |
|
2036 | 2036 | |
|
2037 | 2037 | Add a commit that does all possible modifications at once |
|
2038 | 2038 | |
|
2039 | 2039 | $ echo modify >> third |
|
2040 | 2040 | $ touch b |
|
2041 | 2041 | $ hg add b |
|
2042 | 2042 | $ hg mv fourth fifth |
|
2043 | 2043 | $ hg rm a |
|
2044 | 2044 | $ hg ci -m "Modify, add, remove, rename" |
|
2045 | 2045 | |
|
2046 | 2046 | Check the status template |
|
2047 | 2047 | |
|
2048 | 2048 | $ cat <<EOF >> $HGRCPATH |
|
2049 | 2049 | > [extensions] |
|
2050 | 2050 | > color= |
|
2051 | 2051 | > EOF |
|
2052 | 2052 | |
|
2053 | 2053 | $ hg log -T status -r 10 |
|
2054 | 2054 | changeset: 10:0f9759ec227a |
|
2055 | 2055 | tag: tip |
|
2056 | 2056 | user: test |
|
2057 | 2057 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2058 | 2058 | summary: Modify, add, remove, rename |
|
2059 | 2059 | files: |
|
2060 | 2060 | M third |
|
2061 | 2061 | A b |
|
2062 | 2062 | A fifth |
|
2063 | 2063 | R a |
|
2064 | 2064 | R fourth |
|
2065 | 2065 | |
|
2066 | 2066 | $ hg log -T status -C -r 10 |
|
2067 | 2067 | changeset: 10:0f9759ec227a |
|
2068 | 2068 | tag: tip |
|
2069 | 2069 | user: test |
|
2070 | 2070 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2071 | 2071 | summary: Modify, add, remove, rename |
|
2072 | 2072 | files: |
|
2073 | 2073 | M third |
|
2074 | 2074 | A b |
|
2075 | 2075 | A fifth |
|
2076 | 2076 | fourth |
|
2077 | 2077 | R a |
|
2078 | 2078 | R fourth |
|
2079 | 2079 | |
|
2080 | 2080 | $ hg log -T status -C -r 10 -v |
|
2081 | 2081 | changeset: 10:0f9759ec227a |
|
2082 | 2082 | tag: tip |
|
2083 | 2083 | user: test |
|
2084 | 2084 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2085 | 2085 | description: |
|
2086 | 2086 | Modify, add, remove, rename |
|
2087 | 2087 | |
|
2088 | 2088 | files: |
|
2089 | 2089 | M third |
|
2090 | 2090 | A b |
|
2091 | 2091 | A fifth |
|
2092 | 2092 | fourth |
|
2093 | 2093 | R a |
|
2094 | 2094 | R fourth |
|
2095 | 2095 | |
|
2096 | 2096 | $ hg log -T status -C -r 10 --debug |
|
2097 | 2097 | changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c |
|
2098 | 2098 | tag: tip |
|
2099 | 2099 | phase: secret |
|
2100 | 2100 | parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066 |
|
2101 | 2101 | parent: -1:0000000000000000000000000000000000000000 |
|
2102 | 2102 | manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567 |
|
2103 | 2103 | user: test |
|
2104 | 2104 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2105 | 2105 | extra: branch=default |
|
2106 | 2106 | description: |
|
2107 | 2107 | Modify, add, remove, rename |
|
2108 | 2108 | |
|
2109 | 2109 | files: |
|
2110 | 2110 | M third |
|
2111 | 2111 | A b |
|
2112 | 2112 | A fifth |
|
2113 | 2113 | fourth |
|
2114 | 2114 | R a |
|
2115 | 2115 | R fourth |
|
2116 | 2116 | |
|
2117 | 2117 | $ hg log -T status -C -r 10 --quiet |
|
2118 | 2118 | 10:0f9759ec227a |
|
2119 | 2119 | $ hg --color=debug log -T status -r 10 |
|
2120 | 2120 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2121 | 2121 | [log.tag|tag: tip] |
|
2122 | 2122 | [log.user|user: test] |
|
2123 | 2123 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2124 | 2124 | [log.summary|summary: Modify, add, remove, rename] |
|
2125 | 2125 | [ui.note log.files|files:] |
|
2126 | 2126 | [status.modified|M third] |
|
2127 | 2127 | [status.added|A b] |
|
2128 | 2128 | [status.added|A fifth] |
|
2129 | 2129 | [status.removed|R a] |
|
2130 | 2130 | [status.removed|R fourth] |
|
2131 | 2131 | |
|
2132 | 2132 | $ hg --color=debug log -T status -C -r 10 |
|
2133 | 2133 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2134 | 2134 | [log.tag|tag: tip] |
|
2135 | 2135 | [log.user|user: test] |
|
2136 | 2136 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2137 | 2137 | [log.summary|summary: Modify, add, remove, rename] |
|
2138 | 2138 | [ui.note log.files|files:] |
|
2139 | 2139 | [status.modified|M third] |
|
2140 | 2140 | [status.added|A b] |
|
2141 | 2141 | [status.added|A fifth] |
|
2142 | 2142 | [status.copied| fourth] |
|
2143 | 2143 | [status.removed|R a] |
|
2144 | 2144 | [status.removed|R fourth] |
|
2145 | 2145 | |
|
2146 | 2146 | $ hg --color=debug log -T status -C -r 10 -v |
|
2147 | 2147 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2148 | 2148 | [log.tag|tag: tip] |
|
2149 | 2149 | [log.user|user: test] |
|
2150 | 2150 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2151 | 2151 | [ui.note log.description|description:] |
|
2152 | 2152 | [ui.note log.description|Modify, add, remove, rename] |
|
2153 | 2153 | |
|
2154 | 2154 | [ui.note log.files|files:] |
|
2155 | 2155 | [status.modified|M third] |
|
2156 | 2156 | [status.added|A b] |
|
2157 | 2157 | [status.added|A fifth] |
|
2158 | 2158 | [status.copied| fourth] |
|
2159 | 2159 | [status.removed|R a] |
|
2160 | 2160 | [status.removed|R fourth] |
|
2161 | 2161 | |
|
2162 | 2162 | $ hg --color=debug log -T status -C -r 10 --debug |
|
2163 | 2163 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c] |
|
2164 | 2164 | [log.tag|tag: tip] |
|
2165 | 2165 | [log.phase|phase: secret] |
|
2166 | 2166 | [log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066] |
|
2167 | 2167 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2168 | 2168 | [ui.debug log.manifest|manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567] |
|
2169 | 2169 | [log.user|user: test] |
|
2170 | 2170 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2171 | 2171 | [ui.debug log.extra|extra: branch=default] |
|
2172 | 2172 | [ui.note log.description|description:] |
|
2173 | 2173 | [ui.note log.description|Modify, add, remove, rename] |
|
2174 | 2174 | |
|
2175 | 2175 | [ui.note log.files|files:] |
|
2176 | 2176 | [status.modified|M third] |
|
2177 | 2177 | [status.added|A b] |
|
2178 | 2178 | [status.added|A fifth] |
|
2179 | 2179 | [status.copied| fourth] |
|
2180 | 2180 | [status.removed|R a] |
|
2181 | 2181 | [status.removed|R fourth] |
|
2182 | 2182 | |
|
2183 | 2183 | $ hg --color=debug log -T status -C -r 10 --quiet |
|
2184 | 2184 | [log.node|10:0f9759ec227a] |
|
2185 | 2185 | |
|
2186 | 2186 | Check the bisect template |
|
2187 | 2187 | |
|
2188 | 2188 | $ hg bisect -g 1 |
|
2189 | 2189 | $ hg bisect -b 3 --noupdate |
|
2190 | 2190 | Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) |
|
2191 | 2191 | $ hg log -T bisect -r 0:4 |
|
2192 | 2192 | changeset: 0:1e4e1b8f71e0 |
|
2193 | 2193 | bisect: good (implicit) |
|
2194 | 2194 | user: User Name <user@hostname> |
|
2195 | 2195 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2196 | 2196 | summary: line 1 |
|
2197 | 2197 | |
|
2198 | 2198 | changeset: 1:b608e9d1a3f0 |
|
2199 | 2199 | bisect: good |
|
2200 | 2200 | user: A. N. Other <other@place> |
|
2201 | 2201 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2202 | 2202 | summary: other 1 |
|
2203 | 2203 | |
|
2204 | 2204 | changeset: 2:97054abb4ab8 |
|
2205 | 2205 | bisect: untested |
|
2206 | 2206 | user: other@place |
|
2207 | 2207 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2208 | 2208 | summary: no person |
|
2209 | 2209 | |
|
2210 | 2210 | changeset: 3:10e46f2dcbf4 |
|
2211 | 2211 | bisect: bad |
|
2212 | 2212 | user: person |
|
2213 | 2213 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2214 | 2214 | summary: no user, no domain |
|
2215 | 2215 | |
|
2216 | 2216 | changeset: 4:bbe44766e73d |
|
2217 | 2217 | bisect: bad (implicit) |
|
2218 | 2218 | branch: foo |
|
2219 | 2219 | user: person |
|
2220 | 2220 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2221 | 2221 | summary: new branch |
|
2222 | 2222 | |
|
2223 | 2223 | $ hg log --debug -T bisect -r 0:4 |
|
2224 | 2224 | changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2225 | 2225 | bisect: good (implicit) |
|
2226 | 2226 | phase: public |
|
2227 | 2227 | parent: -1:0000000000000000000000000000000000000000 |
|
2228 | 2228 | parent: -1:0000000000000000000000000000000000000000 |
|
2229 | 2229 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
2230 | 2230 | user: User Name <user@hostname> |
|
2231 | 2231 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2232 | 2232 | files+: a |
|
2233 | 2233 | extra: branch=default |
|
2234 | 2234 | description: |
|
2235 | 2235 | line 1 |
|
2236 | 2236 | line 2 |
|
2237 | 2237 | |
|
2238 | 2238 | |
|
2239 | 2239 | changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2240 | 2240 | bisect: good |
|
2241 | 2241 | phase: public |
|
2242 | 2242 | parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2243 | 2243 | parent: -1:0000000000000000000000000000000000000000 |
|
2244 | 2244 | manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
2245 | 2245 | user: A. N. Other <other@place> |
|
2246 | 2246 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2247 | 2247 | files+: b |
|
2248 | 2248 | extra: branch=default |
|
2249 | 2249 | description: |
|
2250 | 2250 | other 1 |
|
2251 | 2251 | other 2 |
|
2252 | 2252 | |
|
2253 | 2253 | other 3 |
|
2254 | 2254 | |
|
2255 | 2255 | |
|
2256 | 2256 | changeset: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2257 | 2257 | bisect: untested |
|
2258 | 2258 | phase: public |
|
2259 | 2259 | parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2260 | 2260 | parent: -1:0000000000000000000000000000000000000000 |
|
2261 | 2261 | manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
2262 | 2262 | user: other@place |
|
2263 | 2263 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2264 | 2264 | files+: c |
|
2265 | 2265 | extra: branch=default |
|
2266 | 2266 | description: |
|
2267 | 2267 | no person |
|
2268 | 2268 | |
|
2269 | 2269 | |
|
2270 | 2270 | changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2271 | 2271 | bisect: bad |
|
2272 | 2272 | phase: public |
|
2273 | 2273 | parent: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2274 | 2274 | parent: -1:0000000000000000000000000000000000000000 |
|
2275 | 2275 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2276 | 2276 | user: person |
|
2277 | 2277 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2278 | 2278 | files: c |
|
2279 | 2279 | extra: branch=default |
|
2280 | 2280 | description: |
|
2281 | 2281 | no user, no domain |
|
2282 | 2282 | |
|
2283 | 2283 | |
|
2284 | 2284 | changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2285 | 2285 | bisect: bad (implicit) |
|
2286 | 2286 | branch: foo |
|
2287 | 2287 | phase: draft |
|
2288 | 2288 | parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2289 | 2289 | parent: -1:0000000000000000000000000000000000000000 |
|
2290 | 2290 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2291 | 2291 | user: person |
|
2292 | 2292 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2293 | 2293 | extra: branch=foo |
|
2294 | 2294 | description: |
|
2295 | 2295 | new branch |
|
2296 | 2296 | |
|
2297 | 2297 | |
|
2298 | 2298 | $ hg log -v -T bisect -r 0:4 |
|
2299 | 2299 | changeset: 0:1e4e1b8f71e0 |
|
2300 | 2300 | bisect: good (implicit) |
|
2301 | 2301 | user: User Name <user@hostname> |
|
2302 | 2302 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2303 | 2303 | files: a |
|
2304 | 2304 | description: |
|
2305 | 2305 | line 1 |
|
2306 | 2306 | line 2 |
|
2307 | 2307 | |
|
2308 | 2308 | |
|
2309 | 2309 | changeset: 1:b608e9d1a3f0 |
|
2310 | 2310 | bisect: good |
|
2311 | 2311 | user: A. N. Other <other@place> |
|
2312 | 2312 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2313 | 2313 | files: b |
|
2314 | 2314 | description: |
|
2315 | 2315 | other 1 |
|
2316 | 2316 | other 2 |
|
2317 | 2317 | |
|
2318 | 2318 | other 3 |
|
2319 | 2319 | |
|
2320 | 2320 | |
|
2321 | 2321 | changeset: 2:97054abb4ab8 |
|
2322 | 2322 | bisect: untested |
|
2323 | 2323 | user: other@place |
|
2324 | 2324 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2325 | 2325 | files: c |
|
2326 | 2326 | description: |
|
2327 | 2327 | no person |
|
2328 | 2328 | |
|
2329 | 2329 | |
|
2330 | 2330 | changeset: 3:10e46f2dcbf4 |
|
2331 | 2331 | bisect: bad |
|
2332 | 2332 | user: person |
|
2333 | 2333 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2334 | 2334 | files: c |
|
2335 | 2335 | description: |
|
2336 | 2336 | no user, no domain |
|
2337 | 2337 | |
|
2338 | 2338 | |
|
2339 | 2339 | changeset: 4:bbe44766e73d |
|
2340 | 2340 | bisect: bad (implicit) |
|
2341 | 2341 | branch: foo |
|
2342 | 2342 | user: person |
|
2343 | 2343 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2344 | 2344 | description: |
|
2345 | 2345 | new branch |
|
2346 | 2346 | |
|
2347 | 2347 | |
|
2348 | 2348 | $ hg --color=debug log -T bisect -r 0:4 |
|
2349 | 2349 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2350 | 2350 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2351 | 2351 | [log.user|user: User Name <user@hostname>] |
|
2352 | 2352 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2353 | 2353 | [log.summary|summary: line 1] |
|
2354 | 2354 | |
|
2355 | 2355 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2356 | 2356 | [log.bisect bisect.good|bisect: good] |
|
2357 | 2357 | [log.user|user: A. N. Other <other@place>] |
|
2358 | 2358 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2359 | 2359 | [log.summary|summary: other 1] |
|
2360 | 2360 | |
|
2361 | 2361 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2362 | 2362 | [log.bisect bisect.untested|bisect: untested] |
|
2363 | 2363 | [log.user|user: other@place] |
|
2364 | 2364 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2365 | 2365 | [log.summary|summary: no person] |
|
2366 | 2366 | |
|
2367 | 2367 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2368 | 2368 | [log.bisect bisect.bad|bisect: bad] |
|
2369 | 2369 | [log.user|user: person] |
|
2370 | 2370 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2371 | 2371 | [log.summary|summary: no user, no domain] |
|
2372 | 2372 | |
|
2373 | 2373 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2374 | 2374 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2375 | 2375 | [log.branch|branch: foo] |
|
2376 | 2376 | [log.user|user: person] |
|
2377 | 2377 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2378 | 2378 | [log.summary|summary: new branch] |
|
2379 | 2379 | |
|
2380 | 2380 | $ hg --color=debug log --debug -T bisect -r 0:4 |
|
2381 | 2381 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2382 | 2382 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2383 | 2383 | [log.phase|phase: public] |
|
2384 | 2384 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2385 | 2385 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2386 | 2386 | [ui.debug log.manifest|manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0] |
|
2387 | 2387 | [log.user|user: User Name <user@hostname>] |
|
2388 | 2388 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2389 | 2389 | [ui.debug log.files|files+: a] |
|
2390 | 2390 | [ui.debug log.extra|extra: branch=default] |
|
2391 | 2391 | [ui.note log.description|description:] |
|
2392 | 2392 | [ui.note log.description|line 1 |
|
2393 | 2393 | line 2] |
|
2394 | 2394 | |
|
2395 | 2395 | |
|
2396 | 2396 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2397 | 2397 | [log.bisect bisect.good|bisect: good] |
|
2398 | 2398 | [log.phase|phase: public] |
|
2399 | 2399 | [log.parent changeset.public|parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2400 | 2400 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2401 | 2401 | [ui.debug log.manifest|manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55] |
|
2402 | 2402 | [log.user|user: A. N. Other <other@place>] |
|
2403 | 2403 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2404 | 2404 | [ui.debug log.files|files+: b] |
|
2405 | 2405 | [ui.debug log.extra|extra: branch=default] |
|
2406 | 2406 | [ui.note log.description|description:] |
|
2407 | 2407 | [ui.note log.description|other 1 |
|
2408 | 2408 | other 2 |
|
2409 | 2409 | |
|
2410 | 2410 | other 3] |
|
2411 | 2411 | |
|
2412 | 2412 | |
|
2413 | 2413 | [log.changeset changeset.public|changeset: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2414 | 2414 | [log.bisect bisect.untested|bisect: untested] |
|
2415 | 2415 | [log.phase|phase: public] |
|
2416 | 2416 | [log.parent changeset.public|parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2417 | 2417 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2418 | 2418 | [ui.debug log.manifest|manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1] |
|
2419 | 2419 | [log.user|user: other@place] |
|
2420 | 2420 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2421 | 2421 | [ui.debug log.files|files+: c] |
|
2422 | 2422 | [ui.debug log.extra|extra: branch=default] |
|
2423 | 2423 | [ui.note log.description|description:] |
|
2424 | 2424 | [ui.note log.description|no person] |
|
2425 | 2425 | |
|
2426 | 2426 | |
|
2427 | 2427 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2428 | 2428 | [log.bisect bisect.bad|bisect: bad] |
|
2429 | 2429 | [log.phase|phase: public] |
|
2430 | 2430 | [log.parent changeset.public|parent: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2431 | 2431 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2432 | 2432 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2433 | 2433 | [log.user|user: person] |
|
2434 | 2434 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2435 | 2435 | [ui.debug log.files|files: c] |
|
2436 | 2436 | [ui.debug log.extra|extra: branch=default] |
|
2437 | 2437 | [ui.note log.description|description:] |
|
2438 | 2438 | [ui.note log.description|no user, no domain] |
|
2439 | 2439 | |
|
2440 | 2440 | |
|
2441 | 2441 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74] |
|
2442 | 2442 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2443 | 2443 | [log.branch|branch: foo] |
|
2444 | 2444 | [log.phase|phase: draft] |
|
2445 | 2445 | [log.parent changeset.public|parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2446 | 2446 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2447 | 2447 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2448 | 2448 | [log.user|user: person] |
|
2449 | 2449 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2450 | 2450 | [ui.debug log.extra|extra: branch=foo] |
|
2451 | 2451 | [ui.note log.description|description:] |
|
2452 | 2452 | [ui.note log.description|new branch] |
|
2453 | 2453 | |
|
2454 | 2454 | |
|
2455 | 2455 | $ hg --color=debug log -v -T bisect -r 0:4 |
|
2456 | 2456 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2457 | 2457 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2458 | 2458 | [log.user|user: User Name <user@hostname>] |
|
2459 | 2459 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2460 | 2460 | [ui.note log.files|files: a] |
|
2461 | 2461 | [ui.note log.description|description:] |
|
2462 | 2462 | [ui.note log.description|line 1 |
|
2463 | 2463 | line 2] |
|
2464 | 2464 | |
|
2465 | 2465 | |
|
2466 | 2466 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2467 | 2467 | [log.bisect bisect.good|bisect: good] |
|
2468 | 2468 | [log.user|user: A. N. Other <other@place>] |
|
2469 | 2469 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2470 | 2470 | [ui.note log.files|files: b] |
|
2471 | 2471 | [ui.note log.description|description:] |
|
2472 | 2472 | [ui.note log.description|other 1 |
|
2473 | 2473 | other 2 |
|
2474 | 2474 | |
|
2475 | 2475 | other 3] |
|
2476 | 2476 | |
|
2477 | 2477 | |
|
2478 | 2478 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2479 | 2479 | [log.bisect bisect.untested|bisect: untested] |
|
2480 | 2480 | [log.user|user: other@place] |
|
2481 | 2481 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2482 | 2482 | [ui.note log.files|files: c] |
|
2483 | 2483 | [ui.note log.description|description:] |
|
2484 | 2484 | [ui.note log.description|no person] |
|
2485 | 2485 | |
|
2486 | 2486 | |
|
2487 | 2487 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2488 | 2488 | [log.bisect bisect.bad|bisect: bad] |
|
2489 | 2489 | [log.user|user: person] |
|
2490 | 2490 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2491 | 2491 | [ui.note log.files|files: c] |
|
2492 | 2492 | [ui.note log.description|description:] |
|
2493 | 2493 | [ui.note log.description|no user, no domain] |
|
2494 | 2494 | |
|
2495 | 2495 | |
|
2496 | 2496 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2497 | 2497 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2498 | 2498 | [log.branch|branch: foo] |
|
2499 | 2499 | [log.user|user: person] |
|
2500 | 2500 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2501 | 2501 | [ui.note log.description|description:] |
|
2502 | 2502 | [ui.note log.description|new branch] |
|
2503 | 2503 | |
|
2504 | 2504 | |
|
2505 | 2505 | $ hg bisect --reset |
|
2506 | 2506 | |
|
2507 | 2507 | Error on syntax: |
|
2508 | 2508 | |
|
2509 | 2509 | $ echo 'x = "f' >> t |
|
2510 | 2510 | $ hg log |
|
2511 | 2511 | abort: t:3: unmatched quotes |
|
2512 | 2512 | [255] |
|
2513 | 2513 | |
|
2514 | 2514 | $ hg log -T '{date' |
|
2515 | 2515 | hg: parse error at 1: unterminated template expansion |
|
2516 | 2516 | [255] |
|
2517 | 2517 | |
|
2518 | 2518 | Behind the scenes, this will throw TypeError |
|
2519 | 2519 | |
|
2520 | 2520 | $ hg log -l 3 --template '{date|obfuscate}\n' |
|
2521 | 2521 | abort: template filter 'obfuscate' is not compatible with keyword 'date' |
|
2522 | 2522 | [255] |
|
2523 | 2523 | |
|
2524 | 2524 | Behind the scenes, this will throw a ValueError |
|
2525 | 2525 | |
|
2526 | 2526 | $ hg log -l 3 --template 'line: {desc|shortdate}\n' |
|
2527 | 2527 | abort: template filter 'shortdate' is not compatible with keyword 'desc' |
|
2528 | 2528 | [255] |
|
2529 | 2529 | |
|
2530 | 2530 | Behind the scenes, this will throw AttributeError |
|
2531 | 2531 | |
|
2532 | 2532 | $ hg log -l 3 --template 'line: {date|escape}\n' |
|
2533 | 2533 | abort: template filter 'escape' is not compatible with keyword 'date' |
|
2534 | 2534 | [255] |
|
2535 | 2535 | |
|
2536 | 2536 | $ hg log -l 3 --template 'line: {extras|localdate}\n' |
|
2537 | 2537 | hg: parse error: localdate expects a date information |
|
2538 | 2538 | [255] |
|
2539 | 2539 | |
|
2540 | 2540 | Behind the scenes, this will throw ValueError |
|
2541 | 2541 | |
|
2542 | 2542 | $ hg tip --template '{author|email|date}\n' |
|
2543 | 2543 | hg: parse error: date expects a date information |
|
2544 | 2544 | [255] |
|
2545 | 2545 | |
|
2546 | 2546 | Error in nested template: |
|
2547 | 2547 | |
|
2548 | 2548 | $ hg log -T '{"date' |
|
2549 | 2549 | hg: parse error at 2: unterminated string |
|
2550 | 2550 | [255] |
|
2551 | 2551 | |
|
2552 | 2552 | $ hg log -T '{"foo{date|=}"}' |
|
2553 | 2553 | hg: parse error at 11: syntax error |
|
2554 | 2554 | [255] |
|
2555 | 2555 | |
|
2556 | 2556 | Thrown an error if a template function doesn't exist |
|
2557 | 2557 | |
|
2558 | 2558 | $ hg tip --template '{foo()}\n' |
|
2559 | 2559 | hg: parse error: unknown function 'foo' |
|
2560 | 2560 | [255] |
|
2561 | 2561 | |
|
2562 | 2562 | Pass generator object created by template function to filter |
|
2563 | 2563 | |
|
2564 | 2564 | $ hg log -l 1 --template '{if(author, author)|user}\n' |
|
2565 | 2565 | test |
|
2566 | 2566 | |
|
2567 | 2567 | Test diff function: |
|
2568 | 2568 | |
|
2569 | 2569 | $ hg diff -c 8 |
|
2570 | 2570 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2571 | 2571 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2572 | 2572 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2573 | 2573 | @@ -0,0 +1,1 @@ |
|
2574 | 2574 | +second |
|
2575 | 2575 | diff -r 29114dbae42b -r 95c24699272e second |
|
2576 | 2576 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2577 | 2577 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2578 | 2578 | @@ -1,1 +0,0 @@ |
|
2579 | 2579 | -second |
|
2580 | 2580 | diff -r 29114dbae42b -r 95c24699272e third |
|
2581 | 2581 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2582 | 2582 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2583 | 2583 | @@ -0,0 +1,1 @@ |
|
2584 | 2584 | +third |
|
2585 | 2585 | |
|
2586 | 2586 | $ hg log -r 8 -T "{diff()}" |
|
2587 | 2587 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2588 | 2588 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2589 | 2589 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2590 | 2590 | @@ -0,0 +1,1 @@ |
|
2591 | 2591 | +second |
|
2592 | 2592 | diff -r 29114dbae42b -r 95c24699272e second |
|
2593 | 2593 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2594 | 2594 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2595 | 2595 | @@ -1,1 +0,0 @@ |
|
2596 | 2596 | -second |
|
2597 | 2597 | diff -r 29114dbae42b -r 95c24699272e third |
|
2598 | 2598 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2599 | 2599 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2600 | 2600 | @@ -0,0 +1,1 @@ |
|
2601 | 2601 | +third |
|
2602 | 2602 | |
|
2603 | 2603 | $ hg log -r 8 -T "{diff('glob:f*')}" |
|
2604 | 2604 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2605 | 2605 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2606 | 2606 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2607 | 2607 | @@ -0,0 +1,1 @@ |
|
2608 | 2608 | +second |
|
2609 | 2609 | |
|
2610 | 2610 | $ hg log -r 8 -T "{diff('', 'glob:f*')}" |
|
2611 | 2611 | diff -r 29114dbae42b -r 95c24699272e second |
|
2612 | 2612 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2613 | 2613 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2614 | 2614 | @@ -1,1 +0,0 @@ |
|
2615 | 2615 | -second |
|
2616 | 2616 | diff -r 29114dbae42b -r 95c24699272e third |
|
2617 | 2617 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2618 | 2618 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2619 | 2619 | @@ -0,0 +1,1 @@ |
|
2620 | 2620 | +third |
|
2621 | 2621 | |
|
2622 | 2622 | $ hg log -r 8 -T "{diff('FOURTH'|lower)}" |
|
2623 | 2623 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2624 | 2624 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2625 | 2625 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2626 | 2626 | @@ -0,0 +1,1 @@ |
|
2627 | 2627 | +second |
|
2628 | 2628 | |
|
2629 | 2629 | $ cd .. |
|
2630 | 2630 | |
|
2631 | 2631 | |
|
2632 | 2632 | latesttag: |
|
2633 | 2633 | |
|
2634 | 2634 | $ hg init latesttag |
|
2635 | 2635 | $ cd latesttag |
|
2636 | 2636 | |
|
2637 | 2637 | $ echo a > file |
|
2638 | 2638 | $ hg ci -Am a -d '0 0' |
|
2639 | 2639 | adding file |
|
2640 | 2640 | |
|
2641 | 2641 | $ echo b >> file |
|
2642 | 2642 | $ hg ci -m b -d '1 0' |
|
2643 | 2643 | |
|
2644 | 2644 | $ echo c >> head1 |
|
2645 | 2645 | $ hg ci -Am h1c -d '2 0' |
|
2646 | 2646 | adding head1 |
|
2647 | 2647 | |
|
2648 | 2648 | $ hg update -q 1 |
|
2649 | 2649 | $ echo d >> head2 |
|
2650 | 2650 | $ hg ci -Am h2d -d '3 0' |
|
2651 | 2651 | adding head2 |
|
2652 | 2652 | created new head |
|
2653 | 2653 | |
|
2654 | 2654 | $ echo e >> head2 |
|
2655 | 2655 | $ hg ci -m h2e -d '4 0' |
|
2656 | 2656 | |
|
2657 | 2657 | $ hg merge -q |
|
2658 | 2658 | $ hg ci -m merge -d '5 -3600' |
|
2659 | 2659 | |
|
2660 | 2660 | No tag set: |
|
2661 | 2661 | |
|
2662 | 2662 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2663 | 2663 | 5: null+5 |
|
2664 | 2664 | 4: null+4 |
|
2665 | 2665 | 3: null+3 |
|
2666 | 2666 | 2: null+3 |
|
2667 | 2667 | 1: null+2 |
|
2668 | 2668 | 0: null+1 |
|
2669 | 2669 | |
|
2670 | 2670 | One common tag: longest path wins: |
|
2671 | 2671 | |
|
2672 | 2672 | $ hg tag -r 1 -m t1 -d '6 0' t1 |
|
2673 | 2673 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2674 | 2674 | 6: t1+4 |
|
2675 | 2675 | 5: t1+3 |
|
2676 | 2676 | 4: t1+2 |
|
2677 | 2677 | 3: t1+1 |
|
2678 | 2678 | 2: t1+1 |
|
2679 | 2679 | 1: t1+0 |
|
2680 | 2680 | 0: null+1 |
|
2681 | 2681 | |
|
2682 | 2682 | One ancestor tag: more recent wins: |
|
2683 | 2683 | |
|
2684 | 2684 | $ hg tag -r 2 -m t2 -d '7 0' t2 |
|
2685 | 2685 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2686 | 2686 | 7: t2+3 |
|
2687 | 2687 | 6: t2+2 |
|
2688 | 2688 | 5: t2+1 |
|
2689 | 2689 | 4: t1+2 |
|
2690 | 2690 | 3: t1+1 |
|
2691 | 2691 | 2: t2+0 |
|
2692 | 2692 | 1: t1+0 |
|
2693 | 2693 | 0: null+1 |
|
2694 | 2694 | |
|
2695 | 2695 | Two branch tags: more recent wins: |
|
2696 | 2696 | |
|
2697 | 2697 | $ hg tag -r 3 -m t3 -d '8 0' t3 |
|
2698 | 2698 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2699 | 2699 | 8: t3+5 |
|
2700 | 2700 | 7: t3+4 |
|
2701 | 2701 | 6: t3+3 |
|
2702 | 2702 | 5: t3+2 |
|
2703 | 2703 | 4: t3+1 |
|
2704 | 2704 | 3: t3+0 |
|
2705 | 2705 | 2: t2+0 |
|
2706 | 2706 | 1: t1+0 |
|
2707 | 2707 | 0: null+1 |
|
2708 | 2708 | |
|
2709 | 2709 | Merged tag overrides: |
|
2710 | 2710 | |
|
2711 | 2711 | $ hg tag -r 5 -m t5 -d '9 0' t5 |
|
2712 | 2712 | $ hg tag -r 3 -m at3 -d '10 0' at3 |
|
2713 | 2713 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2714 | 2714 | 10: t5+5 |
|
2715 | 2715 | 9: t5+4 |
|
2716 | 2716 | 8: t5+3 |
|
2717 | 2717 | 7: t5+2 |
|
2718 | 2718 | 6: t5+1 |
|
2719 | 2719 | 5: t5+0 |
|
2720 | 2720 | 4: at3:t3+1 |
|
2721 | 2721 | 3: at3:t3+0 |
|
2722 | 2722 | 2: t2+0 |
|
2723 | 2723 | 1: t1+0 |
|
2724 | 2724 | 0: null+1 |
|
2725 | 2725 | |
|
2726 | 2726 | $ hg log --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
|
2727 | 2727 | 10: t5+5,5 |
|
2728 | 2728 | 9: t5+4,4 |
|
2729 | 2729 | 8: t5+3,3 |
|
2730 | 2730 | 7: t5+2,2 |
|
2731 | 2731 | 6: t5+1,1 |
|
2732 | 2732 | 5: t5+0,0 |
|
2733 | 2733 | 4: at3+1,1 t3+1,1 |
|
2734 | 2734 | 3: at3+0,0 t3+0,0 |
|
2735 | 2735 | 2: t2+0,0 |
|
2736 | 2736 | 1: t1+0,0 |
|
2737 | 2737 | 0: null+1,1 |
|
2738 | 2738 | |
|
2739 | 2739 | $ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
|
2740 | 2740 | 10: t3, C: 8, D: 7 |
|
2741 | 2741 | 9: t3, C: 7, D: 6 |
|
2742 | 2742 | 8: t3, C: 6, D: 5 |
|
2743 | 2743 | 7: t3, C: 5, D: 4 |
|
2744 | 2744 | 6: t3, C: 4, D: 3 |
|
2745 | 2745 | 5: t3, C: 3, D: 2 |
|
2746 | 2746 | 4: t3, C: 1, D: 1 |
|
2747 | 2747 | 3: t3, C: 0, D: 0 |
|
2748 | 2748 | 2: t1, C: 1, D: 1 |
|
2749 | 2749 | 1: t1, C: 0, D: 0 |
|
2750 | 2750 | 0: null, C: 1, D: 1 |
|
2751 | 2751 | |
|
2752 | 2752 | $ cd .. |
|
2753 | 2753 | |
|
2754 | 2754 | |
|
2755 | 2755 | Style path expansion: issue1948 - ui.style option doesn't work on OSX |
|
2756 | 2756 | if it is a relative path |
|
2757 | 2757 | |
|
2758 | 2758 | $ mkdir -p home/styles |
|
2759 | 2759 | |
|
2760 | 2760 | $ cat > home/styles/teststyle <<EOF |
|
2761 | 2761 | > changeset = 'test {rev}:{node|short}\n' |
|
2762 | 2762 | > EOF |
|
2763 | 2763 | |
|
2764 | 2764 | $ HOME=`pwd`/home; export HOME |
|
2765 | 2765 | |
|
2766 | 2766 | $ cat > latesttag/.hg/hgrc <<EOF |
|
2767 | 2767 | > [ui] |
|
2768 | 2768 | > style = ~/styles/teststyle |
|
2769 | 2769 | > EOF |
|
2770 | 2770 | |
|
2771 | 2771 | $ hg -R latesttag tip |
|
2772 | 2772 | test 10:9b4a630e5f5f |
|
2773 | 2773 | |
|
2774 | 2774 | Test recursive showlist template (issue1989): |
|
2775 | 2775 | |
|
2776 | 2776 | $ cat > style1989 <<EOF |
|
2777 | 2777 | > changeset = '{file_mods}{manifest}{extras}' |
|
2778 | 2778 | > file_mod = 'M|{author|person}\n' |
|
2779 | 2779 | > manifest = '{rev},{author}\n' |
|
2780 | 2780 | > extra = '{key}: {author}\n' |
|
2781 | 2781 | > EOF |
|
2782 | 2782 | |
|
2783 | 2783 | $ hg -R latesttag log -r tip --style=style1989 |
|
2784 | 2784 | M|test |
|
2785 | 2785 | 10,test |
|
2786 | 2786 | branch: test |
|
2787 | 2787 | |
|
2788 | 2788 | Test new-style inline templating: |
|
2789 | 2789 | |
|
2790 | 2790 | $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' |
|
2791 | 2791 | modified files: .hgtags |
|
2792 | 2792 | |
|
2793 | 2793 | Test the sub function of templating for expansion: |
|
2794 | 2794 | |
|
2795 | 2795 | $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n' |
|
2796 | 2796 | xx |
|
2797 | 2797 | |
|
2798 | 2798 | $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n' |
|
2799 | 2799 | hg: parse error: sub got an invalid pattern: [ |
|
2800 | 2800 | [255] |
|
2801 | 2801 | $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n' |
|
2802 | 2802 | hg: parse error: sub got an invalid replacement: \1 |
|
2803 | 2803 | [255] |
|
2804 | 2804 | |
|
2805 | 2805 | Test the strip function with chars specified: |
|
2806 | 2806 | |
|
2807 | 2807 | $ hg log -R latesttag --template '{desc}\n' |
|
2808 | 2808 | at3 |
|
2809 | 2809 | t5 |
|
2810 | 2810 | t3 |
|
2811 | 2811 | t2 |
|
2812 | 2812 | t1 |
|
2813 | 2813 | merge |
|
2814 | 2814 | h2e |
|
2815 | 2815 | h2d |
|
2816 | 2816 | h1c |
|
2817 | 2817 | b |
|
2818 | 2818 | a |
|
2819 | 2819 | |
|
2820 | 2820 | $ hg log -R latesttag --template '{strip(desc, "te")}\n' |
|
2821 | 2821 | at3 |
|
2822 | 2822 | 5 |
|
2823 | 2823 | 3 |
|
2824 | 2824 | 2 |
|
2825 | 2825 | 1 |
|
2826 | 2826 | merg |
|
2827 | 2827 | h2 |
|
2828 | 2828 | h2d |
|
2829 | 2829 | h1c |
|
2830 | 2830 | b |
|
2831 | 2831 | a |
|
2832 | 2832 | |
|
2833 | 2833 | Test date format: |
|
2834 | 2834 | |
|
2835 | 2835 | $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' |
|
2836 | 2836 | date: 70 01 01 10 +0000 |
|
2837 | 2837 | date: 70 01 01 09 +0000 |
|
2838 | 2838 | date: 70 01 01 08 +0000 |
|
2839 | 2839 | date: 70 01 01 07 +0000 |
|
2840 | 2840 | date: 70 01 01 06 +0000 |
|
2841 | 2841 | date: 70 01 01 05 +0100 |
|
2842 | 2842 | date: 70 01 01 04 +0000 |
|
2843 | 2843 | date: 70 01 01 03 +0000 |
|
2844 | 2844 | date: 70 01 01 02 +0000 |
|
2845 | 2845 | date: 70 01 01 01 +0000 |
|
2846 | 2846 | date: 70 01 01 00 +0000 |
|
2847 | 2847 | |
|
2848 | 2848 | Test invalid date: |
|
2849 | 2849 | |
|
2850 | 2850 | $ hg log -R latesttag -T '{date(rev)}\n' |
|
2851 | 2851 | hg: parse error: date expects a date information |
|
2852 | 2852 | [255] |
|
2853 | 2853 | |
|
2854 | 2854 | Test integer literal: |
|
2855 | 2855 | |
|
2856 | 2856 | $ hg log -Ra -r0 -T '{(0)}\n' |
|
2857 | 2857 | 0 |
|
2858 | 2858 | $ hg log -Ra -r0 -T '{(123)}\n' |
|
2859 | 2859 | 123 |
|
2860 | 2860 | $ hg log -Ra -r0 -T '{(-4)}\n' |
|
2861 | 2861 | -4 |
|
2862 | 2862 | $ hg log -Ra -r0 -T '{(-)}\n' |
|
2863 | 2863 | hg: parse error at 2: integer literal without digits |
|
2864 | 2864 | [255] |
|
2865 | 2865 | $ hg log -Ra -r0 -T '{(-a)}\n' |
|
2866 | 2866 | hg: parse error at 2: integer literal without digits |
|
2867 | 2867 | [255] |
|
2868 | 2868 | |
|
2869 | 2869 | top-level integer literal is interpreted as symbol (i.e. variable name): |
|
2870 | 2870 | |
|
2871 | 2871 | $ hg log -Ra -r0 -T '{1}\n' |
|
2872 | 2872 | |
|
2873 | 2873 | $ hg log -Ra -r0 -T '{if("t", "{1}")}\n' |
|
2874 | 2874 | |
|
2875 | 2875 | $ hg log -Ra -r0 -T '{1|stringify}\n' |
|
2876 | 2876 | |
|
2877 | 2877 | |
|
2878 | 2878 | unless explicit symbol is expected: |
|
2879 | 2879 | |
|
2880 | 2880 | $ hg log -Ra -r0 -T '{desc|1}\n' |
|
2881 | 2881 | hg: parse error: expected a symbol, got 'integer' |
|
2882 | 2882 | [255] |
|
2883 | 2883 | $ hg log -Ra -r0 -T '{1()}\n' |
|
2884 | 2884 | hg: parse error: expected a symbol, got 'integer' |
|
2885 | 2885 | [255] |
|
2886 | 2886 | |
|
2887 | 2887 | Test string literal: |
|
2888 | 2888 | |
|
2889 | 2889 | $ hg log -Ra -r0 -T '{"string with no template fragment"}\n' |
|
2890 | 2890 | string with no template fragment |
|
2891 | 2891 | $ hg log -Ra -r0 -T '{"template: {rev}"}\n' |
|
2892 | 2892 | template: 0 |
|
2893 | 2893 | $ hg log -Ra -r0 -T '{r"rawstring: {rev}"}\n' |
|
2894 | 2894 | rawstring: {rev} |
|
2895 | 2895 | |
|
2896 | 2896 | because map operation requires template, raw string can't be used |
|
2897 | 2897 | |
|
2898 | 2898 | $ hg log -Ra -r0 -T '{files % r"rawstring"}\n' |
|
2899 | 2899 | hg: parse error: expected template specifier |
|
2900 | 2900 | [255] |
|
2901 | 2901 | |
|
2902 | 2902 | Test string escaping: |
|
2903 | 2903 | |
|
2904 | 2904 | $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2905 | 2905 | > |
|
2906 | 2906 | <>\n<[> |
|
2907 | 2907 | <>\n<]> |
|
2908 | 2908 | <>\n< |
|
2909 | 2909 | |
|
2910 | 2910 | $ hg log -R latesttag -r 0 \ |
|
2911 | 2911 | > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2912 | 2912 | > |
|
2913 | 2913 | <>\n<[> |
|
2914 | 2914 | <>\n<]> |
|
2915 | 2915 | <>\n< |
|
2916 | 2916 | |
|
2917 | 2917 | $ hg log -R latesttag -r 0 -T esc \ |
|
2918 | 2918 | > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2919 | 2919 | > |
|
2920 | 2920 | <>\n<[> |
|
2921 | 2921 | <>\n<]> |
|
2922 | 2922 | <>\n< |
|
2923 | 2923 | |
|
2924 | 2924 | $ cat <<'EOF' > esctmpl |
|
2925 | 2925 | > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2926 | 2926 | > EOF |
|
2927 | 2927 | $ hg log -R latesttag -r 0 --style ./esctmpl |
|
2928 | 2928 | > |
|
2929 | 2929 | <>\n<[> |
|
2930 | 2930 | <>\n<]> |
|
2931 | 2931 | <>\n< |
|
2932 | 2932 | |
|
2933 | 2933 | Test string escaping of quotes: |
|
2934 | 2934 | |
|
2935 | 2935 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
2936 | 2936 | " |
|
2937 | 2937 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
2938 | 2938 | \" |
|
2939 | 2939 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
2940 | 2940 | \" |
|
2941 | 2941 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
2942 | 2942 | \\\" |
|
2943 | 2943 | |
|
2944 | 2944 | |
|
2945 | 2945 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
2946 | 2946 | " |
|
2947 | 2947 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
2948 | 2948 | \" |
|
2949 | 2949 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
2950 | 2950 | \" |
|
2951 | 2951 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
2952 | 2952 | \\\" |
|
2953 | 2953 | |
|
2954 | 2954 | Test exception in quoted template. single backslash before quotation mark is |
|
2955 | 2955 | stripped before parsing: |
|
2956 | 2956 | |
|
2957 | 2957 | $ cat <<'EOF' > escquotetmpl |
|
2958 | 2958 | > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n" |
|
2959 | 2959 | > EOF |
|
2960 | 2960 | $ cd latesttag |
|
2961 | 2961 | $ hg log -r 2 --style ../escquotetmpl |
|
2962 | 2962 | " \" \" \\" head1 |
|
2963 | 2963 | |
|
2964 | 2964 | $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"' |
|
2965 | 2965 | valid |
|
2966 | 2966 | $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'" |
|
2967 | 2967 | valid |
|
2968 | 2968 | |
|
2969 | 2969 | Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested |
|
2970 | 2970 | _evalifliteral() templates (issue4733): |
|
2971 | 2971 | |
|
2972 | 2972 | $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n' |
|
2973 | 2973 | "2 |
|
2974 | 2974 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n' |
|
2975 | 2975 | "2 |
|
2976 | 2976 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n' |
|
2977 | 2977 | "2 |
|
2978 | 2978 | |
|
2979 | 2979 | $ hg log -r 2 -T '{if(rev, "\\\"")}\n' |
|
2980 | 2980 | \" |
|
2981 | 2981 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n' |
|
2982 | 2982 | \" |
|
2983 | 2983 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
2984 | 2984 | \" |
|
2985 | 2985 | |
|
2986 | 2986 | $ hg log -r 2 -T '{if(rev, r"\\\"")}\n' |
|
2987 | 2987 | \\\" |
|
2988 | 2988 | $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n' |
|
2989 | 2989 | \\\" |
|
2990 | 2990 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
2991 | 2991 | \\\" |
|
2992 | 2992 | |
|
2993 | 2993 | escaped single quotes and errors: |
|
2994 | 2994 | |
|
2995 | 2995 | $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n' |
|
2996 | 2996 | foo |
|
2997 | 2997 | $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n' |
|
2998 | 2998 | foo |
|
2999 | 2999 | $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n' |
|
3000 | 3000 | hg: parse error at 21: unterminated string |
|
3001 | 3001 | [255] |
|
3002 | 3002 | $ hg log -r 2 -T '{if(rev, \"\\"")}\n' |
|
3003 | 3003 | hg: parse error: trailing \ in string |
|
3004 | 3004 | [255] |
|
3005 | 3005 | $ hg log -r 2 -T '{if(rev, r\"\\"")}\n' |
|
3006 | 3006 | hg: parse error: trailing \ in string |
|
3007 | 3007 | [255] |
|
3008 | 3008 | |
|
3009 | 3009 | $ cd .. |
|
3010 | 3010 | |
|
3011 | 3011 | Test leading backslashes: |
|
3012 | 3012 | |
|
3013 | 3013 | $ cd latesttag |
|
3014 | 3014 | $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n' |
|
3015 | 3015 | {rev} {file} |
|
3016 | 3016 | $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n' |
|
3017 | 3017 | \2 \head1 |
|
3018 | 3018 | $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n' |
|
3019 | 3019 | \{rev} \{file} |
|
3020 | 3020 | $ cd .. |
|
3021 | 3021 | |
|
3022 | 3022 | Test leading backslashes in "if" expression (issue4714): |
|
3023 | 3023 | |
|
3024 | 3024 | $ cd latesttag |
|
3025 | 3025 | $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n' |
|
3026 | 3026 | {rev} \{rev} |
|
3027 | 3027 | $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n' |
|
3028 | 3028 | \2 \\{rev} |
|
3029 | 3029 | $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n' |
|
3030 | 3030 | \{rev} \\\{rev} |
|
3031 | 3031 | $ cd .. |
|
3032 | 3032 | |
|
3033 | 3033 | "string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice) |
|
3034 | 3034 | |
|
3035 | 3035 | $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n' |
|
3036 | 3036 | \x6e |
|
3037 | 3037 | $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n' |
|
3038 | 3038 | \x5c\x786e |
|
3039 | 3039 | $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n' |
|
3040 | 3040 | \x6e |
|
3041 | 3041 | $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n' |
|
3042 | 3042 | \x5c\x786e |
|
3043 | 3043 | |
|
3044 | 3044 | $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n' |
|
3045 | 3045 | \x6e |
|
3046 | 3046 | $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n' |
|
3047 | 3047 | \x5c\x786e |
|
3048 | 3048 | $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n' |
|
3049 | 3049 | \x6e |
|
3050 | 3050 | $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n' |
|
3051 | 3051 | \x5c\x786e |
|
3052 | 3052 | |
|
3053 | 3053 | $ hg log -R a -r 8 --template '{join(files, "\n")}\n' |
|
3054 | 3054 | fourth |
|
3055 | 3055 | second |
|
3056 | 3056 | third |
|
3057 | 3057 | $ hg log -R a -r 8 --template '{join(files, r"\n")}\n' |
|
3058 | 3058 | fourth\nsecond\nthird |
|
3059 | 3059 | |
|
3060 | 3060 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}' |
|
3061 | 3061 | <p> |
|
3062 | 3062 | 1st |
|
3063 | 3063 | </p> |
|
3064 | 3064 | <p> |
|
3065 | 3065 | 2nd |
|
3066 | 3066 | </p> |
|
3067 | 3067 | $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}' |
|
3068 | 3068 | <p> |
|
3069 | 3069 | 1st\n\n2nd |
|
3070 | 3070 | </p> |
|
3071 | 3071 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}' |
|
3072 | 3072 | 1st |
|
3073 | 3073 | |
|
3074 | 3074 | 2nd |
|
3075 | 3075 | |
|
3076 | 3076 | $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n' |
|
3077 | 3077 | o perso |
|
3078 | 3078 | $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n' |
|
3079 | 3079 | no person |
|
3080 | 3080 | $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n' |
|
3081 | 3081 | o perso |
|
3082 | 3082 | $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n' |
|
3083 | 3083 | no perso |
|
3084 | 3084 | |
|
3085 | 3085 | $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n' |
|
3086 | 3086 | -o perso- |
|
3087 | 3087 | $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n' |
|
3088 | 3088 | no person |
|
3089 | 3089 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n' |
|
3090 | 3090 | \x2do perso\x2d |
|
3091 | 3091 | $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n' |
|
3092 | 3092 | -o perso- |
|
3093 | 3093 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n' |
|
3094 | 3094 | \x2do perso\x6e |
|
3095 | 3095 | |
|
3096 | 3096 | $ hg log -R a -r 8 --template '{files % "{file}\n"}' |
|
3097 | 3097 | fourth |
|
3098 | 3098 | second |
|
3099 | 3099 | third |
|
3100 | 3100 | |
|
3101 | 3101 | Test string escaping in nested expression: |
|
3102 | 3102 | |
|
3103 | 3103 | $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n' |
|
3104 | 3104 | fourth\x6esecond\x6ethird |
|
3105 | 3105 | $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n' |
|
3106 | 3106 | fourth\x6esecond\x6ethird |
|
3107 | 3107 | |
|
3108 | 3108 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n' |
|
3109 | 3109 | fourth\x6esecond\x6ethird |
|
3110 | 3110 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n' |
|
3111 | 3111 | fourth\x5c\x786esecond\x5c\x786ethird |
|
3112 | 3112 | |
|
3113 | 3113 | $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n' |
|
3114 | 3114 | 3:\x6eo user, \x6eo domai\x6e |
|
3115 | 3115 | 4:\x5c\x786eew bra\x5c\x786ech |
|
3116 | 3116 | |
|
3117 | 3117 | Test quotes in nested expression are evaluated just like a $(command) |
|
3118 | 3118 | substitution in POSIX shells: |
|
3119 | 3119 | |
|
3120 | 3120 | $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n' |
|
3121 | 3121 | 8:95c24699272e |
|
3122 | 3122 | $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n' |
|
3123 | 3123 | {8} "95c24699272e" |
|
3124 | 3124 | |
|
3125 | 3125 | Test recursive evaluation: |
|
3126 | 3126 | |
|
3127 | 3127 | $ hg init r |
|
3128 | 3128 | $ cd r |
|
3129 | 3129 | $ echo a > a |
|
3130 | 3130 | $ hg ci -Am '{rev}' |
|
3131 | 3131 | adding a |
|
3132 | 3132 | $ hg log -r 0 --template '{if(rev, desc)}\n' |
|
3133 | 3133 | {rev} |
|
3134 | 3134 | $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n' |
|
3135 | 3135 | test 0 |
|
3136 | 3136 | |
|
3137 | 3137 | $ hg branch -q 'text.{rev}' |
|
3138 | 3138 | $ echo aa >> aa |
|
3139 | 3139 | $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped' |
|
3140 | 3140 | |
|
3141 | 3141 | $ hg log -l1 --template '{fill(desc, "20", author, branch)}' |
|
3142 | 3142 | {node|short}desc to |
|
3143 | 3143 | text.{rev}be wrapped |
|
3144 | 3144 | text.{rev}desc to be |
|
3145 | 3145 | text.{rev}wrapped (no-eol) |
|
3146 | 3146 | $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}' |
|
3147 | 3147 | bcc7ff960b8e:desc to |
|
3148 | 3148 | text.1:be wrapped |
|
3149 | 3149 | text.1:desc to be |
|
3150 | 3150 | text.1:wrapped (no-eol) |
|
3151 | 3151 | |
|
3152 | 3152 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}' |
|
3153 | 3153 | {node|short} (no-eol) |
|
3154 | 3154 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}' |
|
3155 | 3155 | bcc-ff---b-e (no-eol) |
|
3156 | 3156 | |
|
3157 | 3157 | $ cat >> .hg/hgrc <<EOF |
|
3158 | 3158 | > [extensions] |
|
3159 | 3159 | > color= |
|
3160 | 3160 | > [color] |
|
3161 | 3161 | > mode=ansi |
|
3162 | 3162 | > text.{rev} = red |
|
3163 | 3163 | > text.1 = green |
|
3164 | 3164 | > EOF |
|
3165 | 3165 | $ hg log --color=always -l 1 --template '{label(branch, "text\n")}' |
|
3166 | 3166 | \x1b[0;31mtext\x1b[0m (esc) |
|
3167 | 3167 | $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}' |
|
3168 | 3168 | \x1b[0;32mtext\x1b[0m (esc) |
|
3169 | 3169 | |
|
3170 | 3170 | Test branches inside if statement: |
|
3171 | 3171 | |
|
3172 | 3172 | $ hg log -r 0 --template '{if(branches, "yes", "no")}\n' |
|
3173 | 3173 | no |
|
3174 | 3174 | |
|
3175 | 3175 | Test get function: |
|
3176 | 3176 | |
|
3177 | 3177 | $ hg log -r 0 --template '{get(extras, "branch")}\n' |
|
3178 | 3178 | default |
|
3179 | 3179 | $ hg log -r 0 --template '{get(files, "should_fail")}\n' |
|
3180 | 3180 | hg: parse error: get() expects a dict as first argument |
|
3181 | 3181 | [255] |
|
3182 | 3182 | |
|
3183 | 3183 | Test localdate(date, tz) function: |
|
3184 | 3184 | |
|
3185 | 3185 | $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n' |
|
3186 | 3186 | 1970-01-01 09:00 +0900 |
|
3187 | 3187 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n' |
|
3188 | 3188 | 1970-01-01 00:00 +0000 |
|
3189 | 3189 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n' |
|
3190 | 3190 | 1970-01-01 02:00 +0200 |
|
3191 | 3191 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n' |
|
3192 | 3192 | 1970-01-01 00:00 +0000 |
|
3193 | 3193 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n' |
|
3194 | 3194 | 1970-01-01 00:00 +0000 |
|
3195 | 3195 | $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n' |
|
3196 | 3196 | hg: parse error: localdate expects a timezone |
|
3197 | 3197 | [255] |
|
3198 | 3198 | $ hg log -r0 -T '{localdate(date, date)|isodate}\n' |
|
3199 | 3199 | hg: parse error: localdate expects a timezone |
|
3200 | 3200 | [255] |
|
3201 | 3201 | |
|
3202 | 3202 | Test shortest(node) function: |
|
3203 | 3203 | |
|
3204 | 3204 | $ echo b > b |
|
3205 | 3205 | $ hg ci -qAm b |
|
3206 | 3206 | $ hg log --template '{shortest(node)}\n' |
|
3207 | 3207 | e777 |
|
3208 | 3208 | bcc7 |
|
3209 | 3209 | f776 |
|
3210 | 3210 | $ hg log --template '{shortest(node, 10)}\n' |
|
3211 | 3211 | e777603221 |
|
3212 | 3212 | bcc7ff960b |
|
3213 | 3213 | f7769ec2ab |
|
3214 | 3214 | $ hg log --template '{node|shortest}\n' -l1 |
|
3215 | 3215 | e777 |
|
3216 | 3216 | |
|
3217 | 3217 | Test pad function |
|
3218 | 3218 | |
|
3219 | 3219 | $ hg log --template '{pad(rev, 20)} {author|user}\n' |
|
3220 | 3220 | 2 test |
|
3221 | 3221 | 1 {node|short} |
|
3222 | 3222 | 0 test |
|
3223 | 3223 | |
|
3224 | 3224 | $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n' |
|
3225 | 3225 | 2 test |
|
3226 | 3226 | 1 {node|short} |
|
3227 | 3227 | 0 test |
|
3228 | 3228 | |
|
3229 | 3229 | $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n' |
|
3230 | 3230 | 2------------------- test |
|
3231 | 3231 | 1------------------- {node|short} |
|
3232 | 3232 | 0------------------- test |
|
3233 | 3233 | |
|
3234 | 3234 | Test template string in pad function |
|
3235 | 3235 | |
|
3236 | 3236 | $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n' |
|
3237 | 3237 | {0} test |
|
3238 | 3238 | |
|
3239 | 3239 | $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n' |
|
3240 | 3240 | \{rev} test |
|
3241 | 3241 | |
|
3242 | 3242 | Test ifcontains function |
|
3243 | 3243 | |
|
3244 | 3244 | $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n' |
|
3245 | 3245 | 2 is in the string |
|
3246 | 3246 | 1 is not |
|
3247 | 3247 | 0 is in the string |
|
3248 | 3248 | |
|
3249 | 3249 | $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n' |
|
3250 | 3250 | 2 did not add a |
|
3251 | 3251 | 1 did not add a |
|
3252 | 3252 | 0 added a |
|
3253 | 3253 | |
|
3254 | 3254 | Test revset function |
|
3255 | 3255 | |
|
3256 | 3256 | $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n' |
|
3257 | 3257 | 2 current rev |
|
3258 | 3258 | 1 not current rev |
|
3259 | 3259 | 0 not current rev |
|
3260 | 3260 | |
|
3261 | 3261 | $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n' |
|
3262 | 3262 | 2 match rev |
|
3263 | 3263 | 1 match rev |
|
3264 | 3264 | 0 not match rev |
|
3265 | 3265 | |
|
3266 | 3266 | $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n' |
|
3267 | 3267 | 2 Parents: 1 |
|
3268 | 3268 | 1 Parents: 0 |
|
3269 | 3269 | 0 Parents: |
|
3270 | 3270 | |
|
3271 | 3271 | $ cat >> .hg/hgrc <<EOF |
|
3272 | 3272 | > [revsetalias] |
|
3273 | 3273 | > myparents(\$1) = parents(\$1) |
|
3274 | 3274 | > EOF |
|
3275 | 3275 | $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n' |
|
3276 | 3276 | 2 Parents: 1 |
|
3277 | 3277 | 1 Parents: 0 |
|
3278 | 3278 | 0 Parents: |
|
3279 | 3279 | |
|
3280 | 3280 | $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n' |
|
3281 | 3281 | Rev: 2 |
|
3282 | 3282 | Ancestor: 0 |
|
3283 | 3283 | Ancestor: 1 |
|
3284 | 3284 | Ancestor: 2 |
|
3285 | 3285 | |
|
3286 | 3286 | Rev: 1 |
|
3287 | 3287 | Ancestor: 0 |
|
3288 | 3288 | Ancestor: 1 |
|
3289 | 3289 | |
|
3290 | 3290 | Rev: 0 |
|
3291 | 3291 | Ancestor: 0 |
|
3292 | 3292 | |
|
3293 | 3293 | $ hg log --template '{revset("TIP"|lower)}\n' -l1 |
|
3294 | 3294 | 2 |
|
3295 | 3295 | |
|
3296 | 3296 | a list template is evaluated for each item of revset |
|
3297 | 3297 | |
|
3298 | 3298 | $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n' |
|
3299 | 3299 | 2 p: 1:bcc7ff960b8e |
|
3300 | 3300 | 1 p: 0:f7769ec2ab97 |
|
3301 | 3301 | 0 p: |
|
3302 | 3302 | |
|
3303 | 3303 | therefore, 'revcache' should be recreated for each rev |
|
3304 | 3304 | |
|
3305 | 3305 | $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n' |
|
3306 | 3306 | 2 aa b |
|
3307 | 3307 | p |
|
3308 | 3308 | 1 |
|
3309 | 3309 | p a |
|
3310 | 3310 | 0 a |
|
3311 | 3311 | p |
|
3312 | 3312 | |
|
3313 | a revset item must be evaluated as an integer revision, not an offset from tip | |
|
3314 | ||
|
3315 | $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n' | |
|
3316 | -1:000000000000 | |
|
3317 | $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n' | |
|
3318 | -1:000000000000 | |
|
3319 | ||
|
3313 | 3320 | Test active bookmark templating |
|
3314 | 3321 | |
|
3315 | 3322 | $ hg book foo |
|
3316 | 3323 | $ hg book bar |
|
3317 | 3324 | $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n" |
|
3318 | 3325 | 2 bar* foo |
|
3319 | 3326 | 1 |
|
3320 | 3327 | 0 |
|
3321 | 3328 | $ hg log --template "{rev} {activebookmark}\n" |
|
3322 | 3329 | 2 bar |
|
3323 | 3330 | 1 |
|
3324 | 3331 | 0 |
|
3325 | 3332 | $ hg bookmarks --inactive bar |
|
3326 | 3333 | $ hg log --template "{rev} {activebookmark}\n" |
|
3327 | 3334 | 2 |
|
3328 | 3335 | 1 |
|
3329 | 3336 | 0 |
|
3330 | 3337 | $ hg book -r1 baz |
|
3331 | 3338 | $ hg log --template "{rev} {join(bookmarks, ' ')}\n" |
|
3332 | 3339 | 2 bar foo |
|
3333 | 3340 | 1 baz |
|
3334 | 3341 | 0 |
|
3335 | 3342 | $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n" |
|
3336 | 3343 | 2 t |
|
3337 | 3344 | 1 f |
|
3338 | 3345 | 0 f |
|
3339 | 3346 | |
|
3340 | 3347 | Test namespaces dict |
|
3341 | 3348 | |
|
3342 | 3349 | $ hg log -T '{rev}{namespaces % " {namespace}={join(names, ",")}"}\n' |
|
3343 | 3350 | 2 bookmarks=bar,foo tags=tip branches=text.{rev} |
|
3344 | 3351 | 1 bookmarks=baz tags= branches=text.{rev} |
|
3345 | 3352 | 0 bookmarks= tags= branches=default |
|
3346 | 3353 | $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}' |
|
3347 | 3354 | bookmarks: bar foo |
|
3348 | 3355 | tags: tip |
|
3349 | 3356 | branches: text.{rev} |
|
3350 | 3357 | $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}' |
|
3351 | 3358 | bookmarks: |
|
3352 | 3359 | bar |
|
3353 | 3360 | foo |
|
3354 | 3361 | tags: |
|
3355 | 3362 | tip |
|
3356 | 3363 | branches: |
|
3357 | 3364 | text.{rev} |
|
3358 | 3365 | $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}' |
|
3359 | 3366 | bar |
|
3360 | 3367 | foo |
|
3361 | 3368 | |
|
3362 | 3369 | Test stringify on sub expressions |
|
3363 | 3370 | |
|
3364 | 3371 | $ cd .. |
|
3365 | 3372 | $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n' |
|
3366 | 3373 | fourth, second, third |
|
3367 | 3374 | $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n' |
|
3368 | 3375 | abc |
|
3369 | 3376 | |
|
3370 | 3377 | Test splitlines |
|
3371 | 3378 | |
|
3372 | 3379 | $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}" |
|
3373 | 3380 | @ foo Modify, add, remove, rename |
|
3374 | 3381 | | |
|
3375 | 3382 | o foo future |
|
3376 | 3383 | | |
|
3377 | 3384 | o foo third |
|
3378 | 3385 | | |
|
3379 | 3386 | o foo second |
|
3380 | 3387 | |
|
3381 | 3388 | o foo merge |
|
3382 | 3389 | |\ |
|
3383 | 3390 | | o foo new head |
|
3384 | 3391 | | | |
|
3385 | 3392 | o | foo new branch |
|
3386 | 3393 | |/ |
|
3387 | 3394 | o foo no user, no domain |
|
3388 | 3395 | | |
|
3389 | 3396 | o foo no person |
|
3390 | 3397 | | |
|
3391 | 3398 | o foo other 1 |
|
3392 | 3399 | | foo other 2 |
|
3393 | 3400 | | foo |
|
3394 | 3401 | | foo other 3 |
|
3395 | 3402 | o foo line 1 |
|
3396 | 3403 | foo line 2 |
|
3397 | 3404 | |
|
3398 | 3405 | Test startswith |
|
3399 | 3406 | $ hg log -Gv -R a --template "{startswith(desc)}" |
|
3400 | 3407 | hg: parse error: startswith expects two arguments |
|
3401 | 3408 | [255] |
|
3402 | 3409 | |
|
3403 | 3410 | $ hg log -Gv -R a --template "{startswith('line', desc)}" |
|
3404 | 3411 | @ |
|
3405 | 3412 | | |
|
3406 | 3413 | o |
|
3407 | 3414 | | |
|
3408 | 3415 | o |
|
3409 | 3416 | | |
|
3410 | 3417 | o |
|
3411 | 3418 | |
|
3412 | 3419 | o |
|
3413 | 3420 | |\ |
|
3414 | 3421 | | o |
|
3415 | 3422 | | | |
|
3416 | 3423 | o | |
|
3417 | 3424 | |/ |
|
3418 | 3425 | o |
|
3419 | 3426 | | |
|
3420 | 3427 | o |
|
3421 | 3428 | | |
|
3422 | 3429 | o |
|
3423 | 3430 | | |
|
3424 | 3431 | o line 1 |
|
3425 | 3432 | line 2 |
|
3426 | 3433 | |
|
3427 | 3434 | Test bad template with better error message |
|
3428 | 3435 | |
|
3429 | 3436 | $ hg log -Gv -R a --template '{desc|user()}' |
|
3430 | 3437 | hg: parse error: expected a symbol, got 'func' |
|
3431 | 3438 | [255] |
|
3432 | 3439 | |
|
3433 | 3440 | Test word function (including index out of bounds graceful failure) |
|
3434 | 3441 | |
|
3435 | 3442 | $ hg log -Gv -R a --template "{word('1', desc)}" |
|
3436 | 3443 | @ add, |
|
3437 | 3444 | | |
|
3438 | 3445 | o |
|
3439 | 3446 | | |
|
3440 | 3447 | o |
|
3441 | 3448 | | |
|
3442 | 3449 | o |
|
3443 | 3450 | |
|
3444 | 3451 | o |
|
3445 | 3452 | |\ |
|
3446 | 3453 | | o head |
|
3447 | 3454 | | | |
|
3448 | 3455 | o | branch |
|
3449 | 3456 | |/ |
|
3450 | 3457 | o user, |
|
3451 | 3458 | | |
|
3452 | 3459 | o person |
|
3453 | 3460 | | |
|
3454 | 3461 | o 1 |
|
3455 | 3462 | | |
|
3456 | 3463 | o 1 |
|
3457 | 3464 | |
|
3458 | 3465 | |
|
3459 | 3466 | Test word third parameter used as splitter |
|
3460 | 3467 | |
|
3461 | 3468 | $ hg log -Gv -R a --template "{word('0', desc, 'o')}" |
|
3462 | 3469 | @ M |
|
3463 | 3470 | | |
|
3464 | 3471 | o future |
|
3465 | 3472 | | |
|
3466 | 3473 | o third |
|
3467 | 3474 | | |
|
3468 | 3475 | o sec |
|
3469 | 3476 | |
|
3470 | 3477 | o merge |
|
3471 | 3478 | |\ |
|
3472 | 3479 | | o new head |
|
3473 | 3480 | | | |
|
3474 | 3481 | o | new branch |
|
3475 | 3482 | |/ |
|
3476 | 3483 | o n |
|
3477 | 3484 | | |
|
3478 | 3485 | o n |
|
3479 | 3486 | | |
|
3480 | 3487 | o |
|
3481 | 3488 | | |
|
3482 | 3489 | o line 1 |
|
3483 | 3490 | line 2 |
|
3484 | 3491 | |
|
3485 | 3492 | Test word error messages for not enough and too many arguments |
|
3486 | 3493 | |
|
3487 | 3494 | $ hg log -Gv -R a --template "{word('0')}" |
|
3488 | 3495 | hg: parse error: word expects two or three arguments, got 1 |
|
3489 | 3496 | [255] |
|
3490 | 3497 | |
|
3491 | 3498 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" |
|
3492 | 3499 | hg: parse error: word expects two or three arguments, got 7 |
|
3493 | 3500 | [255] |
|
3494 | 3501 | |
|
3495 | 3502 | Test word for integer literal |
|
3496 | 3503 | |
|
3497 | 3504 | $ hg log -R a --template "{word(2, desc)}\n" -r0 |
|
3498 | 3505 | line |
|
3499 | 3506 | |
|
3500 | 3507 | Test word for invalid numbers |
|
3501 | 3508 | |
|
3502 | 3509 | $ hg log -Gv -R a --template "{word('a', desc)}" |
|
3503 | 3510 | hg: parse error: word expects an integer index |
|
3504 | 3511 | [255] |
|
3505 | 3512 | |
|
3506 | 3513 | Test word for out of range |
|
3507 | 3514 | |
|
3508 | 3515 | $ hg log -R a --template "{word(10000, desc)}" |
|
3509 | 3516 | $ hg log -R a --template "{word(-10000, desc)}" |
|
3510 | 3517 | |
|
3511 | 3518 | Test indent and not adding to empty lines |
|
3512 | 3519 | |
|
3513 | 3520 | $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a |
|
3514 | 3521 | ----- |
|
3515 | 3522 | > line 1 |
|
3516 | 3523 | >> line 2 |
|
3517 | 3524 | ----- |
|
3518 | 3525 | > other 1 |
|
3519 | 3526 | >> other 2 |
|
3520 | 3527 | |
|
3521 | 3528 | >> other 3 |
|
3522 | 3529 | |
|
3523 | 3530 | Test with non-strings like dates |
|
3524 | 3531 | |
|
3525 | 3532 | $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a |
|
3526 | 3533 | 1200000.00 |
|
3527 | 3534 | 1300000.00 |
|
3528 | 3535 | |
|
3529 | 3536 | Test broken string escapes: |
|
3530 | 3537 | |
|
3531 | 3538 | $ hg log -T "bogus\\" -R a |
|
3532 | 3539 | hg: parse error: trailing \ in string |
|
3533 | 3540 | [255] |
|
3534 | 3541 | $ hg log -T "\\xy" -R a |
|
3535 | 3542 | hg: parse error: invalid \x escape |
|
3536 | 3543 | [255] |
|
3537 | 3544 | |
|
3538 | 3545 | Set up repository for non-ascii encoding tests: |
|
3539 | 3546 | |
|
3540 | 3547 | $ hg init nonascii |
|
3541 | 3548 | $ cd nonascii |
|
3542 | 3549 | $ python <<EOF |
|
3543 | 3550 | > open('utf-8', 'w').write('\xc3\xa9') |
|
3544 | 3551 | > EOF |
|
3545 | 3552 | $ HGENCODING=utf-8 hg branch -q `cat utf-8` |
|
3546 | 3553 | $ HGENCODING=utf-8 hg ci -qAm 'non-ascii branch' utf-8 |
|
3547 | 3554 | |
|
3548 | 3555 | json filter should try round-trip conversion to utf-8: |
|
3549 | 3556 | |
|
3550 | 3557 | $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0 |
|
3551 | 3558 | "\u00e9" |
|
3552 | 3559 | |
|
3553 | 3560 | json filter should not abort if it can't decode bytes: |
|
3554 | 3561 | (not sure the current behavior is right; we might want to use utf-8b encoding?) |
|
3555 | 3562 | |
|
3556 | 3563 | $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1 |
|
3557 | 3564 | "\ufffd\ufffd" |
|
3558 | 3565 | |
|
3559 | 3566 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now