Show More
@@ -1,443 +1,443 b'' | |||
|
1 | 1 | # registrar.py - utilities to register function for specific purpose |
|
2 | 2 | # |
|
3 | 3 | # Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others |
|
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 . import ( |
|
11 | 11 | configitems, |
|
12 | 12 | error, |
|
13 | 13 | pycompat, |
|
14 | 14 | util, |
|
15 | 15 | ) |
|
16 | 16 | |
|
17 | 17 | # unlike the other registered items, config options are neither functions or |
|
18 | 18 | # classes. Registering the option is just small function call. |
|
19 | 19 | # |
|
20 | 20 | # We still add the official API to the registrar module for consistency with |
|
21 | 21 | # the other items extensions want might to register. |
|
22 | 22 | configitem = configitems.getitemregister |
|
23 | 23 | |
|
24 | 24 | class _funcregistrarbase(object): |
|
25 | 25 | """Base of decorator to register a function for specific purpose |
|
26 | 26 | |
|
27 | 27 | This decorator stores decorated functions into own dict 'table'. |
|
28 | 28 | |
|
29 | 29 | The least derived class can be defined by overriding 'formatdoc', |
|
30 | 30 | for example:: |
|
31 | 31 | |
|
32 | 32 | class keyword(_funcregistrarbase): |
|
33 | 33 | _docformat = ":%s: %s" |
|
34 | 34 | |
|
35 | 35 | This should be used as below: |
|
36 | 36 | |
|
37 | 37 | keyword = registrar.keyword() |
|
38 | 38 | |
|
39 | 39 | @keyword('bar') |
|
40 | 40 | def barfunc(*args, **kwargs): |
|
41 | 41 | '''Explanation of bar keyword .... |
|
42 | 42 | ''' |
|
43 | 43 | pass |
|
44 | 44 | |
|
45 | 45 | In this case: |
|
46 | 46 | |
|
47 | 47 | - 'barfunc' is stored as 'bar' in '_table' of an instance 'keyword' above |
|
48 | 48 | - 'barfunc.__doc__' becomes ":bar: Explanation of bar keyword" |
|
49 | 49 | """ |
|
50 | 50 | def __init__(self, table=None): |
|
51 | 51 | if table is None: |
|
52 | 52 | self._table = {} |
|
53 | 53 | else: |
|
54 | 54 | self._table = table |
|
55 | 55 | |
|
56 | 56 | def __call__(self, decl, *args, **kwargs): |
|
57 | 57 | return lambda func: self._doregister(func, decl, *args, **kwargs) |
|
58 | 58 | |
|
59 | 59 | def _doregister(self, func, decl, *args, **kwargs): |
|
60 | 60 | name = self._getname(decl) |
|
61 | 61 | |
|
62 | 62 | if name in self._table: |
|
63 | 63 | msg = 'duplicate registration for name: "%s"' % name |
|
64 | 64 | raise error.ProgrammingError(msg) |
|
65 | 65 | |
|
66 | 66 | if func.__doc__ and not util.safehasattr(func, '_origdoc'): |
|
67 | 67 | doc = pycompat.sysbytes(func.__doc__).strip() |
|
68 | 68 | func._origdoc = doc |
|
69 | 69 | func.__doc__ = pycompat.sysstr(self._formatdoc(decl, doc)) |
|
70 | 70 | |
|
71 | 71 | self._table[name] = func |
|
72 | 72 | self._extrasetup(name, func, *args, **kwargs) |
|
73 | 73 | |
|
74 | 74 | return func |
|
75 | 75 | |
|
76 | 76 | def _parsefuncdecl(self, decl): |
|
77 | 77 | """Parse function declaration and return the name of function in it |
|
78 | 78 | """ |
|
79 | 79 | i = decl.find('(') |
|
80 | 80 | if i >= 0: |
|
81 | 81 | return decl[:i] |
|
82 | 82 | else: |
|
83 | 83 | return decl |
|
84 | 84 | |
|
85 | 85 | def _getname(self, decl): |
|
86 | 86 | """Return the name of the registered function from decl |
|
87 | 87 | |
|
88 | 88 | Derived class should override this, if it allows more |
|
89 | 89 | descriptive 'decl' string than just a name. |
|
90 | 90 | """ |
|
91 | 91 | return decl |
|
92 | 92 | |
|
93 | 93 | _docformat = None |
|
94 | 94 | |
|
95 | 95 | def _formatdoc(self, decl, doc): |
|
96 | 96 | """Return formatted document of the registered function for help |
|
97 | 97 | |
|
98 | 98 | 'doc' is '__doc__.strip()' of the registered function. |
|
99 | 99 | """ |
|
100 | 100 | return self._docformat % (decl, doc) |
|
101 | 101 | |
|
102 | 102 | def _extrasetup(self, name, func): |
|
103 | 103 | """Execute exra setup for registered function, if needed |
|
104 | 104 | """ |
|
105 | 105 | |
|
106 | 106 | class command(_funcregistrarbase): |
|
107 | 107 | """Decorator to register a command function to table |
|
108 | 108 | |
|
109 | 109 | This class receives a command table as its argument. The table should |
|
110 | 110 | be a dict. |
|
111 | 111 | |
|
112 | 112 | The created object can be used as a decorator for adding commands to |
|
113 | 113 | that command table. This accepts multiple arguments to define a command. |
|
114 | 114 | |
|
115 | 115 | The first argument is the command name (as bytes). |
|
116 | 116 | |
|
117 | 117 | The `options` keyword argument is an iterable of tuples defining command |
|
118 | 118 | arguments. See ``mercurial.fancyopts.fancyopts()`` for the format of each |
|
119 | 119 | tuple. |
|
120 | 120 | |
|
121 | 121 | The `synopsis` argument defines a short, one line summary of how to use the |
|
122 | 122 | command. This shows up in the help output. |
|
123 | 123 | |
|
124 | 124 | There are three arguments that control what repository (if any) is found |
|
125 | 125 | and passed to the decorated function: `norepo`, `optionalrepo`, and |
|
126 | 126 | `inferrepo`. |
|
127 | 127 | |
|
128 | 128 | The `norepo` argument defines whether the command does not require a |
|
129 | 129 | local repository. Most commands operate against a repository, thus the |
|
130 | 130 | default is False. When True, no repository will be passed. |
|
131 | 131 | |
|
132 | 132 | The `optionalrepo` argument defines whether the command optionally requires |
|
133 | 133 | a local repository. If no repository can be found, None will be passed |
|
134 | 134 | to the decorated function. |
|
135 | 135 | |
|
136 | 136 | The `inferrepo` argument defines whether to try to find a repository from |
|
137 | 137 | the command line arguments. If True, arguments will be examined for |
|
138 | 138 | potential repository locations. See ``findrepo()``. If a repository is |
|
139 | 139 | found, it will be used and passed to the decorated function. |
|
140 | 140 | |
|
141 | 141 | There are three constants in the class which tells what type of the command |
|
142 | 142 | that is. That information will be helpful at various places. It will be also |
|
143 | 143 | be used to decide what level of access the command has on hidden commits. |
|
144 | 144 | The constants are: |
|
145 | 145 | |
|
146 | 146 | `unrecoverablewrite` is for those write commands which can't be recovered |
|
147 | 147 | like push. |
|
148 | 148 | `recoverablewrite` is for write commands which can be recovered like commit. |
|
149 | 149 | `readonly` is for commands which are read only. |
|
150 | 150 | |
|
151 | 151 | The signature of the decorated function looks like this: |
|
152 | 152 | def cmd(ui[, repo] [, <args>] [, <options>]) |
|
153 | 153 | |
|
154 | 154 | `repo` is required if `norepo` is False. |
|
155 | 155 | `<args>` are positional args (or `*args`) arguments, of non-option |
|
156 | 156 | arguments from the command line. |
|
157 | 157 | `<options>` are keyword arguments (or `**options`) of option arguments |
|
158 | 158 | from the command line. |
|
159 | 159 | |
|
160 | 160 | See the WritingExtensions and MercurialApi documentation for more exhaustive |
|
161 | 161 | descriptions and examples. |
|
162 | 162 | """ |
|
163 | 163 | |
|
164 | 164 | unrecoverablewrite = "unrecoverable" |
|
165 | 165 | recoverablewrite = "recoverable" |
|
166 | 166 | readonly = "readonly" |
|
167 | 167 | |
|
168 | 168 | possiblecmdtypes = {unrecoverablewrite, recoverablewrite, readonly} |
|
169 | 169 | |
|
170 | 170 | def _doregister(self, func, name, options=(), synopsis=None, |
|
171 | 171 | norepo=False, optionalrepo=False, inferrepo=False, |
|
172 | 172 | cmdtype=unrecoverablewrite): |
|
173 | 173 | |
|
174 | 174 | if cmdtype not in self.possiblecmdtypes: |
|
175 | 175 | raise error.ProgrammingError("unknown cmdtype value '%s' for " |
|
176 | 176 | "'%s' command" % (cmdtype, name)) |
|
177 | 177 | func.norepo = norepo |
|
178 | 178 | func.optionalrepo = optionalrepo |
|
179 | 179 | func.inferrepo = inferrepo |
|
180 | 180 | func.cmdtype = cmdtype |
|
181 | 181 | if synopsis: |
|
182 | 182 | self._table[name] = func, list(options), synopsis |
|
183 | 183 | else: |
|
184 | 184 | self._table[name] = func, list(options) |
|
185 | 185 | return func |
|
186 | 186 | |
|
187 | 187 | class revsetpredicate(_funcregistrarbase): |
|
188 | 188 | """Decorator to register revset predicate |
|
189 | 189 | |
|
190 | 190 | Usage:: |
|
191 | 191 | |
|
192 | 192 | revsetpredicate = registrar.revsetpredicate() |
|
193 | 193 | |
|
194 | 194 | @revsetpredicate('mypredicate(arg1, arg2[, arg3])') |
|
195 | 195 | def mypredicatefunc(repo, subset, x): |
|
196 | 196 | '''Explanation of this revset predicate .... |
|
197 | 197 | ''' |
|
198 | 198 | pass |
|
199 | 199 | |
|
200 | 200 | The first string argument is used also in online help. |
|
201 | 201 | |
|
202 | 202 | Optional argument 'safe' indicates whether a predicate is safe for |
|
203 | 203 | DoS attack (False by default). |
|
204 | 204 | |
|
205 | 205 | Optional argument 'takeorder' indicates whether a predicate function |
|
206 | 206 | takes ordering policy as the last argument. |
|
207 | 207 | |
|
208 | 208 | Optional argument 'weight' indicates the estimated run-time cost, useful |
|
209 | 209 | for static optimization, default is 1. Higher weight means more expensive. |
|
210 | 210 | Usually, revsets that are fast and return only one revision has a weight of |
|
211 | 211 | 0.5 (ex. a symbol); revsets with O(changelog) complexity and read only the |
|
212 | 212 | changelog have weight 10 (ex. author); revsets reading manifest deltas have |
|
213 | 213 | weight 30 (ex. adds); revset reading manifest contents have weight 100 |
|
214 | 214 | (ex. contains). Note: those values are flexible. If the revset has a |
|
215 | 215 | same big-O time complexity as 'contains', but with a smaller constant, it |
|
216 | 216 | might have a weight of 90. |
|
217 | 217 | |
|
218 | 218 | 'revsetpredicate' instance in example above can be used to |
|
219 | 219 | decorate multiple functions. |
|
220 | 220 | |
|
221 | 221 | Decorated functions are registered automatically at loading |
|
222 | 222 | extension, if an instance named as 'revsetpredicate' is used for |
|
223 | 223 | decorating in extension. |
|
224 | 224 | |
|
225 | 225 | Otherwise, explicit 'revset.loadpredicate()' is needed. |
|
226 | 226 | """ |
|
227 | 227 | _getname = _funcregistrarbase._parsefuncdecl |
|
228 | 228 | _docformat = "``%s``\n %s" |
|
229 | 229 | |
|
230 | 230 | def _extrasetup(self, name, func, safe=False, takeorder=False, weight=1): |
|
231 | 231 | func._safe = safe |
|
232 | 232 | func._takeorder = takeorder |
|
233 | 233 | func._weight = weight |
|
234 | 234 | |
|
235 | 235 | class filesetpredicate(_funcregistrarbase): |
|
236 | 236 | """Decorator to register fileset predicate |
|
237 | 237 | |
|
238 | 238 | Usage:: |
|
239 | 239 | |
|
240 | 240 | filesetpredicate = registrar.filesetpredicate() |
|
241 | 241 | |
|
242 | 242 | @filesetpredicate('mypredicate()') |
|
243 | 243 | def mypredicatefunc(mctx, x): |
|
244 | 244 | '''Explanation of this fileset predicate .... |
|
245 | 245 | ''' |
|
246 | 246 | pass |
|
247 | 247 | |
|
248 | 248 | The first string argument is used also in online help. |
|
249 | 249 | |
|
250 | 250 | Optional argument 'callstatus' indicates whether a predicate |
|
251 | 251 | implies 'matchctx.status()' at runtime or not (False, by |
|
252 | 252 | default). |
|
253 | 253 | |
|
254 | 254 | Optional argument 'callexisting' indicates whether a predicate |
|
255 | 255 | implies 'matchctx.existing()' at runtime or not (False, by |
|
256 | 256 | default). |
|
257 | 257 | |
|
258 | 258 | 'filesetpredicate' instance in example above can be used to |
|
259 | 259 | decorate multiple functions. |
|
260 | 260 | |
|
261 | 261 | Decorated functions are registered automatically at loading |
|
262 | 262 | extension, if an instance named as 'filesetpredicate' is used for |
|
263 | 263 | decorating in extension. |
|
264 | 264 | |
|
265 | 265 | Otherwise, explicit 'fileset.loadpredicate()' is needed. |
|
266 | 266 | """ |
|
267 | 267 | _getname = _funcregistrarbase._parsefuncdecl |
|
268 | 268 | _docformat = "``%s``\n %s" |
|
269 | 269 | |
|
270 | 270 | def _extrasetup(self, name, func, callstatus=False, callexisting=False): |
|
271 | 271 | func._callstatus = callstatus |
|
272 | 272 | func._callexisting = callexisting |
|
273 | 273 | |
|
274 | 274 | class _templateregistrarbase(_funcregistrarbase): |
|
275 | 275 | """Base of decorator to register functions as template specific one |
|
276 | 276 | """ |
|
277 | 277 | _docformat = ":%s: %s" |
|
278 | 278 | |
|
279 | 279 | class templatekeyword(_templateregistrarbase): |
|
280 | 280 | """Decorator to register template keyword |
|
281 | 281 | |
|
282 | 282 | Usage:: |
|
283 | 283 | |
|
284 | 284 | templatekeyword = registrar.templatekeyword() |
|
285 | 285 | |
|
286 | 286 | # new API (since Mercurial 4.6) |
|
287 | 287 | @templatekeyword('mykeyword', requires={'repo', 'ctx'}) |
|
288 | 288 | def mykeywordfunc(context, mapping): |
|
289 | 289 | '''Explanation of this template keyword .... |
|
290 | 290 | ''' |
|
291 | 291 | pass |
|
292 | 292 | |
|
293 | 293 | # old API |
|
294 | 294 | @templatekeyword('mykeyword') |
|
295 | 295 | def mykeywordfunc(repo, ctx, templ, cache, revcache, **args): |
|
296 | 296 | '''Explanation of this template keyword .... |
|
297 | 297 | ''' |
|
298 | 298 | pass |
|
299 | 299 | |
|
300 | 300 | The first string argument is used also in online help. |
|
301 | 301 | |
|
302 | 302 | Optional argument 'requires' should be a collection of resource names |
|
303 | 303 | which the template keyword depends on. This also serves as a flag to |
|
304 | 304 | switch to the new API. If 'requires' is unspecified, all template |
|
305 | 305 | keywords and resources are expanded to the function arguments. |
|
306 | 306 | |
|
307 | 307 | 'templatekeyword' instance in example above can be used to |
|
308 | 308 | decorate multiple functions. |
|
309 | 309 | |
|
310 | 310 | Decorated functions are registered automatically at loading |
|
311 | 311 | extension, if an instance named as 'templatekeyword' is used for |
|
312 | 312 | decorating in extension. |
|
313 | 313 | |
|
314 | 314 | Otherwise, explicit 'templatekw.loadkeyword()' is needed. |
|
315 | 315 | """ |
|
316 | 316 | |
|
317 | 317 | def _extrasetup(self, name, func, requires=None): |
|
318 | 318 | func._requires = requires |
|
319 | 319 | |
|
320 | 320 | class templatefilter(_templateregistrarbase): |
|
321 | 321 | """Decorator to register template filer |
|
322 | 322 | |
|
323 | 323 | Usage:: |
|
324 | 324 | |
|
325 | 325 | templatefilter = registrar.templatefilter() |
|
326 | 326 | |
|
327 | 327 | @templatefilter('myfilter', intype=bytes) |
|
328 | 328 | def myfilterfunc(text): |
|
329 | 329 | '''Explanation of this template filter .... |
|
330 | 330 | ''' |
|
331 | 331 | pass |
|
332 | 332 | |
|
333 | 333 | The first string argument is used also in online help. |
|
334 | 334 | |
|
335 | 335 | Optional argument 'intype' defines the type of the input argument, |
|
336 | which should be (bytes, int, or None for any.) | |
|
336 | which should be (bytes, int, templateutil.date, or None for any.) | |
|
337 | 337 | |
|
338 | 338 | 'templatefilter' instance in example above can be used to |
|
339 | 339 | decorate multiple functions. |
|
340 | 340 | |
|
341 | 341 | Decorated functions are registered automatically at loading |
|
342 | 342 | extension, if an instance named as 'templatefilter' is used for |
|
343 | 343 | decorating in extension. |
|
344 | 344 | |
|
345 | 345 | Otherwise, explicit 'templatefilters.loadkeyword()' is needed. |
|
346 | 346 | """ |
|
347 | 347 | |
|
348 | 348 | def _extrasetup(self, name, func, intype=None): |
|
349 | 349 | func._intype = intype |
|
350 | 350 | |
|
351 | 351 | class templatefunc(_templateregistrarbase): |
|
352 | 352 | """Decorator to register template function |
|
353 | 353 | |
|
354 | 354 | Usage:: |
|
355 | 355 | |
|
356 | 356 | templatefunc = registrar.templatefunc() |
|
357 | 357 | |
|
358 | 358 | @templatefunc('myfunc(arg1, arg2[, arg3])', argspec='arg1 arg2 arg3') |
|
359 | 359 | def myfuncfunc(context, mapping, args): |
|
360 | 360 | '''Explanation of this template function .... |
|
361 | 361 | ''' |
|
362 | 362 | pass |
|
363 | 363 | |
|
364 | 364 | The first string argument is used also in online help. |
|
365 | 365 | |
|
366 | 366 | If optional 'argspec' is defined, the function will receive 'args' as |
|
367 | 367 | a dict of named arguments. Otherwise 'args' is a list of positional |
|
368 | 368 | arguments. |
|
369 | 369 | |
|
370 | 370 | 'templatefunc' instance in example above can be used to |
|
371 | 371 | decorate multiple functions. |
|
372 | 372 | |
|
373 | 373 | Decorated functions are registered automatically at loading |
|
374 | 374 | extension, if an instance named as 'templatefunc' is used for |
|
375 | 375 | decorating in extension. |
|
376 | 376 | |
|
377 | 377 | Otherwise, explicit 'templatefuncs.loadfunction()' is needed. |
|
378 | 378 | """ |
|
379 | 379 | _getname = _funcregistrarbase._parsefuncdecl |
|
380 | 380 | |
|
381 | 381 | def _extrasetup(self, name, func, argspec=None): |
|
382 | 382 | func._argspec = argspec |
|
383 | 383 | |
|
384 | 384 | class internalmerge(_funcregistrarbase): |
|
385 | 385 | """Decorator to register in-process merge tool |
|
386 | 386 | |
|
387 | 387 | Usage:: |
|
388 | 388 | |
|
389 | 389 | internalmerge = registrar.internalmerge() |
|
390 | 390 | |
|
391 | 391 | @internalmerge('mymerge', internalmerge.mergeonly, |
|
392 | 392 | onfailure=None, precheck=None): |
|
393 | 393 | def mymergefunc(repo, mynode, orig, fcd, fco, fca, |
|
394 | 394 | toolconf, files, labels=None): |
|
395 | 395 | '''Explanation of this internal merge tool .... |
|
396 | 396 | ''' |
|
397 | 397 | return 1, False # means "conflicted", "no deletion needed" |
|
398 | 398 | |
|
399 | 399 | The first string argument is used to compose actual merge tool name, |
|
400 | 400 | ":name" and "internal:name" (the latter is historical one). |
|
401 | 401 | |
|
402 | 402 | The second argument is one of merge types below: |
|
403 | 403 | |
|
404 | 404 | ========== ======== ======== ========= |
|
405 | 405 | merge type precheck premerge fullmerge |
|
406 | 406 | ========== ======== ======== ========= |
|
407 | 407 | nomerge x x x |
|
408 | 408 | mergeonly o x o |
|
409 | 409 | fullmerge o o o |
|
410 | 410 | ========== ======== ======== ========= |
|
411 | 411 | |
|
412 | 412 | Optional argument 'onfailure' is the format of warning message |
|
413 | 413 | to be used at failure of merging (target filename is specified |
|
414 | 414 | at formatting). Or, None or so, if warning message should be |
|
415 | 415 | suppressed. |
|
416 | 416 | |
|
417 | 417 | Optional argument 'precheck' is the function to be used |
|
418 | 418 | before actual invocation of internal merge tool itself. |
|
419 | 419 | It takes as same arguments as internal merge tool does, other than |
|
420 | 420 | 'files' and 'labels'. If it returns false value, merging is aborted |
|
421 | 421 | immediately (and file is marked as "unresolved"). |
|
422 | 422 | |
|
423 | 423 | 'internalmerge' instance in example above can be used to |
|
424 | 424 | decorate multiple functions. |
|
425 | 425 | |
|
426 | 426 | Decorated functions are registered automatically at loading |
|
427 | 427 | extension, if an instance named as 'internalmerge' is used for |
|
428 | 428 | decorating in extension. |
|
429 | 429 | |
|
430 | 430 | Otherwise, explicit 'filemerge.loadinternalmerge()' is needed. |
|
431 | 431 | """ |
|
432 | 432 | _docformat = "``:%s``\n %s" |
|
433 | 433 | |
|
434 | 434 | # merge type definitions: |
|
435 | 435 | nomerge = None |
|
436 | 436 | mergeonly = 'mergeonly' # just the full merge, no premerge |
|
437 | 437 | fullmerge = 'fullmerge' # both premerge and merge |
|
438 | 438 | |
|
439 | 439 | def _extrasetup(self, name, func, mergetype, |
|
440 | 440 | onfailure=None, precheck=None): |
|
441 | 441 | func.mergetype = mergetype |
|
442 | 442 | func.onfailure = onfailure |
|
443 | 443 | func.precheck = precheck |
@@ -1,436 +1,436 b'' | |||
|
1 | 1 | # templatefilters.py - common template expansion filters |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2008 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 | import os |
|
11 | 11 | import re |
|
12 | 12 | import time |
|
13 | 13 | |
|
14 | 14 | from . import ( |
|
15 | 15 | encoding, |
|
16 | 16 | error, |
|
17 | 17 | node, |
|
18 | 18 | pycompat, |
|
19 | 19 | registrar, |
|
20 | 20 | templateutil, |
|
21 | 21 | url, |
|
22 | 22 | util, |
|
23 | 23 | ) |
|
24 | 24 | from .utils import ( |
|
25 | 25 | dateutil, |
|
26 | 26 | stringutil, |
|
27 | 27 | ) |
|
28 | 28 | |
|
29 | 29 | urlerr = util.urlerr |
|
30 | 30 | urlreq = util.urlreq |
|
31 | 31 | |
|
32 | 32 | if pycompat.ispy3: |
|
33 | 33 | long = int |
|
34 | 34 | |
|
35 | 35 | # filters are callables like: |
|
36 | 36 | # fn(obj) |
|
37 | 37 | # with: |
|
38 | 38 | # obj - object to be filtered (text, date, list and so on) |
|
39 | 39 | filters = {} |
|
40 | 40 | |
|
41 | 41 | templatefilter = registrar.templatefilter(filters) |
|
42 | 42 | |
|
43 | 43 | @templatefilter('addbreaks', intype=bytes) |
|
44 | 44 | def addbreaks(text): |
|
45 | 45 | """Any text. Add an XHTML "<br />" tag before the end of |
|
46 | 46 | every line except the last. |
|
47 | 47 | """ |
|
48 | 48 | return text.replace('\n', '<br/>\n') |
|
49 | 49 | |
|
50 | 50 | agescales = [("year", 3600 * 24 * 365, 'Y'), |
|
51 | 51 | ("month", 3600 * 24 * 30, 'M'), |
|
52 | 52 | ("week", 3600 * 24 * 7, 'W'), |
|
53 | 53 | ("day", 3600 * 24, 'd'), |
|
54 | 54 | ("hour", 3600, 'h'), |
|
55 | 55 | ("minute", 60, 'm'), |
|
56 | 56 | ("second", 1, 's')] |
|
57 | 57 | |
|
58 | @templatefilter('age') | |
|
58 | @templatefilter('age', intype=templateutil.date) | |
|
59 | 59 | def age(date, abbrev=False): |
|
60 | 60 | """Date. Returns a human-readable date/time difference between the |
|
61 | 61 | given date/time and the current date/time. |
|
62 | 62 | """ |
|
63 | 63 | |
|
64 | 64 | def plural(t, c): |
|
65 | 65 | if c == 1: |
|
66 | 66 | return t |
|
67 | 67 | return t + "s" |
|
68 | 68 | def fmt(t, c, a): |
|
69 | 69 | if abbrev: |
|
70 | 70 | return "%d%s" % (c, a) |
|
71 | 71 | return "%d %s" % (c, plural(t, c)) |
|
72 | 72 | |
|
73 | 73 | now = time.time() |
|
74 | 74 | then = date[0] |
|
75 | 75 | future = False |
|
76 | 76 | if then > now: |
|
77 | 77 | future = True |
|
78 | 78 | delta = max(1, int(then - now)) |
|
79 | 79 | if delta > agescales[0][1] * 30: |
|
80 | 80 | return 'in the distant future' |
|
81 | 81 | else: |
|
82 | 82 | delta = max(1, int(now - then)) |
|
83 | 83 | if delta > agescales[0][1] * 2: |
|
84 | 84 | return dateutil.shortdate(date) |
|
85 | 85 | |
|
86 | 86 | for t, s, a in agescales: |
|
87 | 87 | n = delta // s |
|
88 | 88 | if n >= 2 or s == 1: |
|
89 | 89 | if future: |
|
90 | 90 | return '%s from now' % fmt(t, n, a) |
|
91 | 91 | return '%s ago' % fmt(t, n, a) |
|
92 | 92 | |
|
93 | 93 | @templatefilter('basename', intype=bytes) |
|
94 | 94 | def basename(path): |
|
95 | 95 | """Any text. Treats the text as a path, and returns the last |
|
96 | 96 | component of the path after splitting by the path separator. |
|
97 | 97 | For example, "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "". |
|
98 | 98 | """ |
|
99 | 99 | return os.path.basename(path) |
|
100 | 100 | |
|
101 | 101 | @templatefilter('count') |
|
102 | 102 | def count(i): |
|
103 | 103 | """List or text. Returns the length as an integer.""" |
|
104 | 104 | return len(i) |
|
105 | 105 | |
|
106 | 106 | @templatefilter('dirname', intype=bytes) |
|
107 | 107 | def dirname(path): |
|
108 | 108 | """Any text. Treats the text as a path, and strips the last |
|
109 | 109 | component of the path after splitting by the path separator. |
|
110 | 110 | """ |
|
111 | 111 | return os.path.dirname(path) |
|
112 | 112 | |
|
113 | 113 | @templatefilter('domain', intype=bytes) |
|
114 | 114 | def domain(author): |
|
115 | 115 | """Any text. Finds the first string that looks like an email |
|
116 | 116 | address, and extracts just the domain component. Example: ``User |
|
117 | 117 | <user@example.com>`` becomes ``example.com``. |
|
118 | 118 | """ |
|
119 | 119 | f = author.find('@') |
|
120 | 120 | if f == -1: |
|
121 | 121 | return '' |
|
122 | 122 | author = author[f + 1:] |
|
123 | 123 | f = author.find('>') |
|
124 | 124 | if f >= 0: |
|
125 | 125 | author = author[:f] |
|
126 | 126 | return author |
|
127 | 127 | |
|
128 | 128 | @templatefilter('email', intype=bytes) |
|
129 | 129 | def email(text): |
|
130 | 130 | """Any text. Extracts the first string that looks like an email |
|
131 | 131 | address. Example: ``User <user@example.com>`` becomes |
|
132 | 132 | ``user@example.com``. |
|
133 | 133 | """ |
|
134 | 134 | return stringutil.email(text) |
|
135 | 135 | |
|
136 | 136 | @templatefilter('escape', intype=bytes) |
|
137 | 137 | def escape(text): |
|
138 | 138 | """Any text. Replaces the special XML/XHTML characters "&", "<" |
|
139 | 139 | and ">" with XML entities, and filters out NUL characters. |
|
140 | 140 | """ |
|
141 | 141 | return url.escape(text.replace('\0', ''), True) |
|
142 | 142 | |
|
143 | 143 | para_re = None |
|
144 | 144 | space_re = None |
|
145 | 145 | |
|
146 | 146 | def fill(text, width, initindent='', hangindent=''): |
|
147 | 147 | '''fill many paragraphs with optional indentation.''' |
|
148 | 148 | global para_re, space_re |
|
149 | 149 | if para_re is None: |
|
150 | 150 | para_re = re.compile('(\n\n|\n\\s*[-*]\\s*)', re.M) |
|
151 | 151 | space_re = re.compile(br' +') |
|
152 | 152 | |
|
153 | 153 | def findparas(): |
|
154 | 154 | start = 0 |
|
155 | 155 | while True: |
|
156 | 156 | m = para_re.search(text, start) |
|
157 | 157 | if not m: |
|
158 | 158 | uctext = encoding.unifromlocal(text[start:]) |
|
159 | 159 | w = len(uctext) |
|
160 | 160 | while 0 < w and uctext[w - 1].isspace(): |
|
161 | 161 | w -= 1 |
|
162 | 162 | yield (encoding.unitolocal(uctext[:w]), |
|
163 | 163 | encoding.unitolocal(uctext[w:])) |
|
164 | 164 | break |
|
165 | 165 | yield text[start:m.start(0)], m.group(1) |
|
166 | 166 | start = m.end(1) |
|
167 | 167 | |
|
168 | 168 | return "".join([stringutil.wrap(space_re.sub(' ', |
|
169 | 169 | stringutil.wrap(para, width)), |
|
170 | 170 | width, initindent, hangindent) + rest |
|
171 | 171 | for para, rest in findparas()]) |
|
172 | 172 | |
|
173 | 173 | @templatefilter('fill68', intype=bytes) |
|
174 | 174 | def fill68(text): |
|
175 | 175 | """Any text. Wraps the text to fit in 68 columns.""" |
|
176 | 176 | return fill(text, 68) |
|
177 | 177 | |
|
178 | 178 | @templatefilter('fill76', intype=bytes) |
|
179 | 179 | def fill76(text): |
|
180 | 180 | """Any text. Wraps the text to fit in 76 columns.""" |
|
181 | 181 | return fill(text, 76) |
|
182 | 182 | |
|
183 | 183 | @templatefilter('firstline', intype=bytes) |
|
184 | 184 | def firstline(text): |
|
185 | 185 | """Any text. Returns the first line of text.""" |
|
186 | 186 | try: |
|
187 | 187 | return text.splitlines(True)[0].rstrip('\r\n') |
|
188 | 188 | except IndexError: |
|
189 | 189 | return '' |
|
190 | 190 | |
|
191 | 191 | @templatefilter('hex', intype=bytes) |
|
192 | 192 | def hexfilter(text): |
|
193 | 193 | """Any text. Convert a binary Mercurial node identifier into |
|
194 | 194 | its long hexadecimal representation. |
|
195 | 195 | """ |
|
196 | 196 | return node.hex(text) |
|
197 | 197 | |
|
198 | @templatefilter('hgdate') | |
|
198 | @templatefilter('hgdate', intype=templateutil.date) | |
|
199 | 199 | def hgdate(text): |
|
200 | 200 | """Date. Returns the date as a pair of numbers: "1157407993 |
|
201 | 201 | 25200" (Unix timestamp, timezone offset). |
|
202 | 202 | """ |
|
203 | 203 | return "%d %d" % text |
|
204 | 204 | |
|
205 | @templatefilter('isodate') | |
|
205 | @templatefilter('isodate', intype=templateutil.date) | |
|
206 | 206 | def isodate(text): |
|
207 | 207 | """Date. Returns the date in ISO 8601 format: "2009-08-18 13:00 |
|
208 | 208 | +0200". |
|
209 | 209 | """ |
|
210 | 210 | return dateutil.datestr(text, '%Y-%m-%d %H:%M %1%2') |
|
211 | 211 | |
|
212 | @templatefilter('isodatesec') | |
|
212 | @templatefilter('isodatesec', intype=templateutil.date) | |
|
213 | 213 | def isodatesec(text): |
|
214 | 214 | """Date. Returns the date in ISO 8601 format, including |
|
215 | 215 | seconds: "2009-08-18 13:00:13 +0200". See also the rfc3339date |
|
216 | 216 | filter. |
|
217 | 217 | """ |
|
218 | 218 | return dateutil.datestr(text, '%Y-%m-%d %H:%M:%S %1%2') |
|
219 | 219 | |
|
220 | 220 | def indent(text, prefix): |
|
221 | 221 | '''indent each non-empty line of text after first with prefix.''' |
|
222 | 222 | lines = text.splitlines() |
|
223 | 223 | num_lines = len(lines) |
|
224 | 224 | endswithnewline = text[-1:] == '\n' |
|
225 | 225 | def indenter(): |
|
226 | 226 | for i in xrange(num_lines): |
|
227 | 227 | l = lines[i] |
|
228 | 228 | if i and l.strip(): |
|
229 | 229 | yield prefix |
|
230 | 230 | yield l |
|
231 | 231 | if i < num_lines - 1 or endswithnewline: |
|
232 | 232 | yield '\n' |
|
233 | 233 | return "".join(indenter()) |
|
234 | 234 | |
|
235 | 235 | @templatefilter('json') |
|
236 | 236 | def json(obj, paranoid=True): |
|
237 | 237 | if obj is None: |
|
238 | 238 | return 'null' |
|
239 | 239 | elif obj is False: |
|
240 | 240 | return 'false' |
|
241 | 241 | elif obj is True: |
|
242 | 242 | return 'true' |
|
243 | 243 | elif isinstance(obj, (int, long, float)): |
|
244 | 244 | return pycompat.bytestr(obj) |
|
245 | 245 | elif isinstance(obj, bytes): |
|
246 | 246 | return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid) |
|
247 | 247 | elif isinstance(obj, str): |
|
248 | 248 | # This branch is unreachable on Python 2, because bytes == str |
|
249 | 249 | # and we'll return in the next-earlier block in the elif |
|
250 | 250 | # ladder. On Python 3, this helps us catch bugs before they |
|
251 | 251 | # hurt someone. |
|
252 | 252 | raise error.ProgrammingError( |
|
253 | 253 | 'Mercurial only does output with bytes on Python 3: %r' % obj) |
|
254 | 254 | elif util.safehasattr(obj, 'keys'): |
|
255 | 255 | out = ['"%s": %s' % (encoding.jsonescape(k, paranoid=paranoid), |
|
256 | 256 | json(v, paranoid)) |
|
257 | 257 | for k, v in sorted(obj.iteritems())] |
|
258 | 258 | return '{' + ', '.join(out) + '}' |
|
259 | 259 | elif util.safehasattr(obj, '__iter__'): |
|
260 | 260 | out = [json(i, paranoid) for i in obj] |
|
261 | 261 | return '[' + ', '.join(out) + ']' |
|
262 | 262 | else: |
|
263 | 263 | raise TypeError('cannot encode type %s' % obj.__class__.__name__) |
|
264 | 264 | |
|
265 | 265 | @templatefilter('lower', intype=bytes) |
|
266 | 266 | def lower(text): |
|
267 | 267 | """Any text. Converts the text to lowercase.""" |
|
268 | 268 | return encoding.lower(text) |
|
269 | 269 | |
|
270 | 270 | @templatefilter('nonempty', intype=bytes) |
|
271 | 271 | def nonempty(text): |
|
272 | 272 | """Any text. Returns '(none)' if the string is empty.""" |
|
273 | 273 | return text or "(none)" |
|
274 | 274 | |
|
275 | 275 | @templatefilter('obfuscate', intype=bytes) |
|
276 | 276 | def obfuscate(text): |
|
277 | 277 | """Any text. Returns the input text rendered as a sequence of |
|
278 | 278 | XML entities. |
|
279 | 279 | """ |
|
280 | 280 | text = unicode(text, pycompat.sysstr(encoding.encoding), r'replace') |
|
281 | 281 | return ''.join(['&#%d;' % ord(c) for c in text]) |
|
282 | 282 | |
|
283 | 283 | @templatefilter('permissions', intype=bytes) |
|
284 | 284 | def permissions(flags): |
|
285 | 285 | if "l" in flags: |
|
286 | 286 | return "lrwxrwxrwx" |
|
287 | 287 | if "x" in flags: |
|
288 | 288 | return "-rwxr-xr-x" |
|
289 | 289 | return "-rw-r--r--" |
|
290 | 290 | |
|
291 | 291 | @templatefilter('person', intype=bytes) |
|
292 | 292 | def person(author): |
|
293 | 293 | """Any text. Returns the name before an email address, |
|
294 | 294 | interpreting it as per RFC 5322. |
|
295 | 295 | """ |
|
296 | 296 | return stringutil.person(author) |
|
297 | 297 | |
|
298 | 298 | @templatefilter('revescape', intype=bytes) |
|
299 | 299 | def revescape(text): |
|
300 | 300 | """Any text. Escapes all "special" characters, except @. |
|
301 | 301 | Forward slashes are escaped twice to prevent web servers from prematurely |
|
302 | 302 | unescaping them. For example, "@foo bar/baz" becomes "@foo%20bar%252Fbaz". |
|
303 | 303 | """ |
|
304 | 304 | return urlreq.quote(text, safe='/@').replace('/', '%252F') |
|
305 | 305 | |
|
306 | @templatefilter('rfc3339date') | |
|
306 | @templatefilter('rfc3339date', intype=templateutil.date) | |
|
307 | 307 | def rfc3339date(text): |
|
308 | 308 | """Date. Returns a date using the Internet date format |
|
309 | 309 | specified in RFC 3339: "2009-08-18T13:00:13+02:00". |
|
310 | 310 | """ |
|
311 | 311 | return dateutil.datestr(text, "%Y-%m-%dT%H:%M:%S%1:%2") |
|
312 | 312 | |
|
313 | @templatefilter('rfc822date') | |
|
313 | @templatefilter('rfc822date', intype=templateutil.date) | |
|
314 | 314 | def rfc822date(text): |
|
315 | 315 | """Date. Returns a date using the same format used in email |
|
316 | 316 | headers: "Tue, 18 Aug 2009 13:00:13 +0200". |
|
317 | 317 | """ |
|
318 | 318 | return dateutil.datestr(text, "%a, %d %b %Y %H:%M:%S %1%2") |
|
319 | 319 | |
|
320 | 320 | @templatefilter('short', intype=bytes) |
|
321 | 321 | def short(text): |
|
322 | 322 | """Changeset hash. Returns the short form of a changeset hash, |
|
323 | 323 | i.e. a 12 hexadecimal digit string. |
|
324 | 324 | """ |
|
325 | 325 | return text[:12] |
|
326 | 326 | |
|
327 | 327 | @templatefilter('shortbisect', intype=bytes) |
|
328 | 328 | def shortbisect(label): |
|
329 | 329 | """Any text. Treats `label` as a bisection status, and |
|
330 | 330 | returns a single-character representing the status (G: good, B: bad, |
|
331 | 331 | S: skipped, U: untested, I: ignored). Returns single space if `text` |
|
332 | 332 | is not a valid bisection status. |
|
333 | 333 | """ |
|
334 | 334 | if label: |
|
335 | 335 | return label[0:1].upper() |
|
336 | 336 | return ' ' |
|
337 | 337 | |
|
338 | @templatefilter('shortdate') | |
|
338 | @templatefilter('shortdate', intype=templateutil.date) | |
|
339 | 339 | def shortdate(text): |
|
340 | 340 | """Date. Returns a date like "2006-09-18".""" |
|
341 | 341 | return dateutil.shortdate(text) |
|
342 | 342 | |
|
343 | 343 | @templatefilter('slashpath', intype=bytes) |
|
344 | 344 | def slashpath(path): |
|
345 | 345 | """Any text. Replaces the native path separator with slash.""" |
|
346 | 346 | return util.pconvert(path) |
|
347 | 347 | |
|
348 | 348 | @templatefilter('splitlines', intype=bytes) |
|
349 | 349 | def splitlines(text): |
|
350 | 350 | """Any text. Split text into a list of lines.""" |
|
351 | 351 | return templateutil.hybridlist(text.splitlines(), name='line') |
|
352 | 352 | |
|
353 | 353 | @templatefilter('stringescape', intype=bytes) |
|
354 | 354 | def stringescape(text): |
|
355 | 355 | return stringutil.escapestr(text) |
|
356 | 356 | |
|
357 | 357 | @templatefilter('stringify', intype=bytes) |
|
358 | 358 | def stringify(thing): |
|
359 | 359 | """Any type. Turns the value into text by converting values into |
|
360 | 360 | text and concatenating them. |
|
361 | 361 | """ |
|
362 | 362 | return thing # coerced by the intype |
|
363 | 363 | |
|
364 | 364 | @templatefilter('stripdir', intype=bytes) |
|
365 | 365 | def stripdir(text): |
|
366 | 366 | """Treat the text as path and strip a directory level, if |
|
367 | 367 | possible. For example, "foo" and "foo/bar" becomes "foo". |
|
368 | 368 | """ |
|
369 | 369 | dir = os.path.dirname(text) |
|
370 | 370 | if dir == "": |
|
371 | 371 | return os.path.basename(text) |
|
372 | 372 | else: |
|
373 | 373 | return dir |
|
374 | 374 | |
|
375 | 375 | @templatefilter('tabindent', intype=bytes) |
|
376 | 376 | def tabindent(text): |
|
377 | 377 | """Any text. Returns the text, with every non-empty line |
|
378 | 378 | except the first starting with a tab character. |
|
379 | 379 | """ |
|
380 | 380 | return indent(text, '\t') |
|
381 | 381 | |
|
382 | 382 | @templatefilter('upper', intype=bytes) |
|
383 | 383 | def upper(text): |
|
384 | 384 | """Any text. Converts the text to uppercase.""" |
|
385 | 385 | return encoding.upper(text) |
|
386 | 386 | |
|
387 | 387 | @templatefilter('urlescape', intype=bytes) |
|
388 | 388 | def urlescape(text): |
|
389 | 389 | """Any text. Escapes all "special" characters. For example, |
|
390 | 390 | "foo bar" becomes "foo%20bar". |
|
391 | 391 | """ |
|
392 | 392 | return urlreq.quote(text) |
|
393 | 393 | |
|
394 | 394 | @templatefilter('user', intype=bytes) |
|
395 | 395 | def userfilter(text): |
|
396 | 396 | """Any text. Returns a short representation of a user name or email |
|
397 | 397 | address.""" |
|
398 | 398 | return stringutil.shortuser(text) |
|
399 | 399 | |
|
400 | 400 | @templatefilter('emailuser', intype=bytes) |
|
401 | 401 | def emailuser(text): |
|
402 | 402 | """Any text. Returns the user portion of an email address.""" |
|
403 | 403 | return stringutil.emailuser(text) |
|
404 | 404 | |
|
405 | 405 | @templatefilter('utf8', intype=bytes) |
|
406 | 406 | def utf8(text): |
|
407 | 407 | """Any text. Converts from the local character encoding to UTF-8.""" |
|
408 | 408 | return encoding.fromlocal(text) |
|
409 | 409 | |
|
410 | 410 | @templatefilter('xmlescape', intype=bytes) |
|
411 | 411 | def xmlescape(text): |
|
412 | 412 | text = (text |
|
413 | 413 | .replace('&', '&') |
|
414 | 414 | .replace('<', '<') |
|
415 | 415 | .replace('>', '>') |
|
416 | 416 | .replace('"', '"') |
|
417 | 417 | .replace("'", ''')) # ' invalid in HTML |
|
418 | 418 | return re.sub('[\x00-\x08\x0B\x0C\x0E-\x1F]', ' ', text) |
|
419 | 419 | |
|
420 | 420 | def websub(text, websubtable): |
|
421 | 421 | """:websub: Any text. Only applies to hgweb. Applies the regular |
|
422 | 422 | expression replacements defined in the websub section. |
|
423 | 423 | """ |
|
424 | 424 | if websubtable: |
|
425 | 425 | for regexp, format in websubtable: |
|
426 | 426 | text = regexp.sub(format, text) |
|
427 | 427 | return text |
|
428 | 428 | |
|
429 | 429 | def loadfilter(ui, extname, registrarobj): |
|
430 | 430 | """Load template filter from specified registrarobj |
|
431 | 431 | """ |
|
432 | 432 | for name, func in registrarobj._table.iteritems(): |
|
433 | 433 | filters[name] = func |
|
434 | 434 | |
|
435 | 435 | # tell hggettext to extract docstrings from these functions: |
|
436 | 436 | i18nfunctions = filters.values() |
@@ -1,499 +1,505 b'' | |||
|
1 | 1 | # templateutil.py - utility for template evaluation |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005, 2006 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 | import types |
|
11 | 11 | |
|
12 | 12 | from .i18n import _ |
|
13 | 13 | from . import ( |
|
14 | 14 | error, |
|
15 | 15 | pycompat, |
|
16 | 16 | util, |
|
17 | 17 | ) |
|
18 | 18 | from .utils import ( |
|
19 | 19 | dateutil, |
|
20 | 20 | stringutil, |
|
21 | 21 | ) |
|
22 | 22 | |
|
23 | 23 | class ResourceUnavailable(error.Abort): |
|
24 | 24 | pass |
|
25 | 25 | |
|
26 | 26 | class TemplateNotFound(error.Abort): |
|
27 | 27 | pass |
|
28 | 28 | |
|
29 | # stub for representing a date type; may be a real date type that can | |
|
30 | # provide a readable string value | |
|
31 | class date(object): | |
|
32 | pass | |
|
33 | ||
|
29 | 34 | class hybrid(object): |
|
30 | 35 | """Wrapper for list or dict to support legacy template |
|
31 | 36 | |
|
32 | 37 | This class allows us to handle both: |
|
33 | 38 | - "{files}" (legacy command-line-specific list hack) and |
|
34 | 39 | - "{files % '{file}\n'}" (hgweb-style with inlining and function support) |
|
35 | 40 | and to access raw values: |
|
36 | 41 | - "{ifcontains(file, files, ...)}", "{ifcontains(key, extras, ...)}" |
|
37 | 42 | - "{get(extras, key)}" |
|
38 | 43 | - "{files|json}" |
|
39 | 44 | """ |
|
40 | 45 | |
|
41 | 46 | def __init__(self, gen, values, makemap, joinfmt, keytype=None): |
|
42 | 47 | if gen is not None: |
|
43 | 48 | self.gen = gen # generator or function returning generator |
|
44 | 49 | self._values = values |
|
45 | 50 | self._makemap = makemap |
|
46 | 51 | self.joinfmt = joinfmt |
|
47 | 52 | self.keytype = keytype # hint for 'x in y' where type(x) is unresolved |
|
48 | 53 | def gen(self): |
|
49 | 54 | """Default generator to stringify this as {join(self, ' ')}""" |
|
50 | 55 | for i, x in enumerate(self._values): |
|
51 | 56 | if i > 0: |
|
52 | 57 | yield ' ' |
|
53 | 58 | yield self.joinfmt(x) |
|
54 | 59 | def itermaps(self): |
|
55 | 60 | makemap = self._makemap |
|
56 | 61 | for x in self._values: |
|
57 | 62 | yield makemap(x) |
|
58 | 63 | def __contains__(self, x): |
|
59 | 64 | return x in self._values |
|
60 | 65 | def __getitem__(self, key): |
|
61 | 66 | return self._values[key] |
|
62 | 67 | def __len__(self): |
|
63 | 68 | return len(self._values) |
|
64 | 69 | def __iter__(self): |
|
65 | 70 | return iter(self._values) |
|
66 | 71 | def __getattr__(self, name): |
|
67 | 72 | if name not in (r'get', r'items', r'iteritems', r'iterkeys', |
|
68 | 73 | r'itervalues', r'keys', r'values'): |
|
69 | 74 | raise AttributeError(name) |
|
70 | 75 | return getattr(self._values, name) |
|
71 | 76 | |
|
72 | 77 | class mappable(object): |
|
73 | 78 | """Wrapper for non-list/dict object to support map operation |
|
74 | 79 | |
|
75 | 80 | This class allows us to handle both: |
|
76 | 81 | - "{manifest}" |
|
77 | 82 | - "{manifest % '{rev}:{node}'}" |
|
78 | 83 | - "{manifest.rev}" |
|
79 | 84 | |
|
80 | 85 | Unlike a hybrid, this does not simulate the behavior of the underling |
|
81 | 86 | value. Use unwrapvalue(), unwrapastype(), or unwraphybrid() to obtain |
|
82 | 87 | the inner object. |
|
83 | 88 | """ |
|
84 | 89 | |
|
85 | 90 | def __init__(self, gen, key, value, makemap): |
|
86 | 91 | if gen is not None: |
|
87 | 92 | self.gen = gen # generator or function returning generator |
|
88 | 93 | self._key = key |
|
89 | 94 | self._value = value # may be generator of strings |
|
90 | 95 | self._makemap = makemap |
|
91 | 96 | |
|
92 | 97 | def gen(self): |
|
93 | 98 | yield pycompat.bytestr(self._value) |
|
94 | 99 | |
|
95 | 100 | def tomap(self): |
|
96 | 101 | return self._makemap(self._key) |
|
97 | 102 | |
|
98 | 103 | def itermaps(self): |
|
99 | 104 | yield self.tomap() |
|
100 | 105 | |
|
101 | 106 | def hybriddict(data, key='key', value='value', fmt=None, gen=None): |
|
102 | 107 | """Wrap data to support both dict-like and string-like operations""" |
|
103 | 108 | prefmt = pycompat.identity |
|
104 | 109 | if fmt is None: |
|
105 | 110 | fmt = '%s=%s' |
|
106 | 111 | prefmt = pycompat.bytestr |
|
107 | 112 | return hybrid(gen, data, lambda k: {key: k, value: data[k]}, |
|
108 | 113 | lambda k: fmt % (prefmt(k), prefmt(data[k]))) |
|
109 | 114 | |
|
110 | 115 | def hybridlist(data, name, fmt=None, gen=None): |
|
111 | 116 | """Wrap data to support both list-like and string-like operations""" |
|
112 | 117 | prefmt = pycompat.identity |
|
113 | 118 | if fmt is None: |
|
114 | 119 | fmt = '%s' |
|
115 | 120 | prefmt = pycompat.bytestr |
|
116 | 121 | return hybrid(gen, data, lambda x: {name: x}, lambda x: fmt % prefmt(x)) |
|
117 | 122 | |
|
118 | 123 | def unwraphybrid(thing): |
|
119 | 124 | """Return an object which can be stringified possibly by using a legacy |
|
120 | 125 | template""" |
|
121 | 126 | gen = getattr(thing, 'gen', None) |
|
122 | 127 | if gen is None: |
|
123 | 128 | return thing |
|
124 | 129 | if callable(gen): |
|
125 | 130 | return gen() |
|
126 | 131 | return gen |
|
127 | 132 | |
|
128 | 133 | def unwrapvalue(thing): |
|
129 | 134 | """Move the inner value object out of the wrapper""" |
|
130 | 135 | if not util.safehasattr(thing, '_value'): |
|
131 | 136 | return thing |
|
132 | 137 | return thing._value |
|
133 | 138 | |
|
134 | 139 | def wraphybridvalue(container, key, value): |
|
135 | 140 | """Wrap an element of hybrid container to be mappable |
|
136 | 141 | |
|
137 | 142 | The key is passed to the makemap function of the given container, which |
|
138 | 143 | should be an item generated by iter(container). |
|
139 | 144 | """ |
|
140 | 145 | makemap = getattr(container, '_makemap', None) |
|
141 | 146 | if makemap is None: |
|
142 | 147 | return value |
|
143 | 148 | if util.safehasattr(value, '_makemap'): |
|
144 | 149 | # a nested hybrid list/dict, which has its own way of map operation |
|
145 | 150 | return value |
|
146 | 151 | return mappable(None, key, value, makemap) |
|
147 | 152 | |
|
148 | 153 | def compatdict(context, mapping, name, data, key='key', value='value', |
|
149 | 154 | fmt=None, plural=None, separator=' '): |
|
150 | 155 | """Wrap data like hybriddict(), but also supports old-style list template |
|
151 | 156 | |
|
152 | 157 | This exists for backward compatibility with the old-style template. Use |
|
153 | 158 | hybriddict() for new template keywords. |
|
154 | 159 | """ |
|
155 | 160 | c = [{key: k, value: v} for k, v in data.iteritems()] |
|
156 | 161 | f = _showcompatlist(context, mapping, name, c, plural, separator) |
|
157 | 162 | return hybriddict(data, key=key, value=value, fmt=fmt, gen=f) |
|
158 | 163 | |
|
159 | 164 | def compatlist(context, mapping, name, data, element=None, fmt=None, |
|
160 | 165 | plural=None, separator=' '): |
|
161 | 166 | """Wrap data like hybridlist(), but also supports old-style list template |
|
162 | 167 | |
|
163 | 168 | This exists for backward compatibility with the old-style template. Use |
|
164 | 169 | hybridlist() for new template keywords. |
|
165 | 170 | """ |
|
166 | 171 | f = _showcompatlist(context, mapping, name, data, plural, separator) |
|
167 | 172 | return hybridlist(data, name=element or name, fmt=fmt, gen=f) |
|
168 | 173 | |
|
169 | 174 | def _showcompatlist(context, mapping, name, values, plural=None, separator=' '): |
|
170 | 175 | """Return a generator that renders old-style list template |
|
171 | 176 | |
|
172 | 177 | name is name of key in template map. |
|
173 | 178 | values is list of strings or dicts. |
|
174 | 179 | plural is plural of name, if not simply name + 's'. |
|
175 | 180 | separator is used to join values as a string |
|
176 | 181 | |
|
177 | 182 | expansion works like this, given name 'foo'. |
|
178 | 183 | |
|
179 | 184 | if values is empty, expand 'no_foos'. |
|
180 | 185 | |
|
181 | 186 | if 'foo' not in template map, return values as a string, |
|
182 | 187 | joined by 'separator'. |
|
183 | 188 | |
|
184 | 189 | expand 'start_foos'. |
|
185 | 190 | |
|
186 | 191 | for each value, expand 'foo'. if 'last_foo' in template |
|
187 | 192 | map, expand it instead of 'foo' for last key. |
|
188 | 193 | |
|
189 | 194 | expand 'end_foos'. |
|
190 | 195 | """ |
|
191 | 196 | if not plural: |
|
192 | 197 | plural = name + 's' |
|
193 | 198 | if not values: |
|
194 | 199 | noname = 'no_' + plural |
|
195 | 200 | if context.preload(noname): |
|
196 | 201 | yield context.process(noname, mapping) |
|
197 | 202 | return |
|
198 | 203 | if not context.preload(name): |
|
199 | 204 | if isinstance(values[0], bytes): |
|
200 | 205 | yield separator.join(values) |
|
201 | 206 | else: |
|
202 | 207 | for v in values: |
|
203 | 208 | r = dict(v) |
|
204 | 209 | r.update(mapping) |
|
205 | 210 | yield r |
|
206 | 211 | return |
|
207 | 212 | startname = 'start_' + plural |
|
208 | 213 | if context.preload(startname): |
|
209 | 214 | yield context.process(startname, mapping) |
|
210 | 215 | def one(v, tag=name): |
|
211 | 216 | vmapping = {} |
|
212 | 217 | try: |
|
213 | 218 | vmapping.update(v) |
|
214 | 219 | # Python 2 raises ValueError if the type of v is wrong. Python |
|
215 | 220 | # 3 raises TypeError. |
|
216 | 221 | except (AttributeError, TypeError, ValueError): |
|
217 | 222 | try: |
|
218 | 223 | # Python 2 raises ValueError trying to destructure an e.g. |
|
219 | 224 | # bytes. Python 3 raises TypeError. |
|
220 | 225 | for a, b in v: |
|
221 | 226 | vmapping[a] = b |
|
222 | 227 | except (TypeError, ValueError): |
|
223 | 228 | vmapping[name] = v |
|
224 | 229 | vmapping = context.overlaymap(mapping, vmapping) |
|
225 | 230 | return context.process(tag, vmapping) |
|
226 | 231 | lastname = 'last_' + name |
|
227 | 232 | if context.preload(lastname): |
|
228 | 233 | last = values.pop() |
|
229 | 234 | else: |
|
230 | 235 | last = None |
|
231 | 236 | for v in values: |
|
232 | 237 | yield one(v) |
|
233 | 238 | if last is not None: |
|
234 | 239 | yield one(last, tag=lastname) |
|
235 | 240 | endname = 'end_' + plural |
|
236 | 241 | if context.preload(endname): |
|
237 | 242 | yield context.process(endname, mapping) |
|
238 | 243 | |
|
239 | 244 | def flatten(thing): |
|
240 | 245 | """Yield a single stream from a possibly nested set of iterators""" |
|
241 | 246 | thing = unwraphybrid(thing) |
|
242 | 247 | if isinstance(thing, bytes): |
|
243 | 248 | yield thing |
|
244 | 249 | elif isinstance(thing, str): |
|
245 | 250 | # We can only hit this on Python 3, and it's here to guard |
|
246 | 251 | # against infinite recursion. |
|
247 | 252 | raise error.ProgrammingError('Mercurial IO including templates is done' |
|
248 | 253 | ' with bytes, not strings, got %r' % thing) |
|
249 | 254 | elif thing is None: |
|
250 | 255 | pass |
|
251 | 256 | elif not util.safehasattr(thing, '__iter__'): |
|
252 | 257 | yield pycompat.bytestr(thing) |
|
253 | 258 | else: |
|
254 | 259 | for i in thing: |
|
255 | 260 | i = unwraphybrid(i) |
|
256 | 261 | if isinstance(i, bytes): |
|
257 | 262 | yield i |
|
258 | 263 | elif i is None: |
|
259 | 264 | pass |
|
260 | 265 | elif not util.safehasattr(i, '__iter__'): |
|
261 | 266 | yield pycompat.bytestr(i) |
|
262 | 267 | else: |
|
263 | 268 | for j in flatten(i): |
|
264 | 269 | yield j |
|
265 | 270 | |
|
266 | 271 | def stringify(thing): |
|
267 | 272 | """Turn values into bytes by converting into text and concatenating them""" |
|
268 | 273 | if isinstance(thing, bytes): |
|
269 | 274 | return thing # retain localstr to be round-tripped |
|
270 | 275 | return b''.join(flatten(thing)) |
|
271 | 276 | |
|
272 | 277 | def findsymbolicname(arg): |
|
273 | 278 | """Find symbolic name for the given compiled expression; returns None |
|
274 | 279 | if nothing found reliably""" |
|
275 | 280 | while True: |
|
276 | 281 | func, data = arg |
|
277 | 282 | if func is runsymbol: |
|
278 | 283 | return data |
|
279 | 284 | elif func is runfilter: |
|
280 | 285 | arg = data[0] |
|
281 | 286 | else: |
|
282 | 287 | return None |
|
283 | 288 | |
|
284 | 289 | def evalrawexp(context, mapping, arg): |
|
285 | 290 | """Evaluate given argument as a bare template object which may require |
|
286 | 291 | further processing (such as folding generator of strings)""" |
|
287 | 292 | func, data = arg |
|
288 | 293 | return func(context, mapping, data) |
|
289 | 294 | |
|
290 | 295 | def evalfuncarg(context, mapping, arg): |
|
291 | 296 | """Evaluate given argument as value type""" |
|
292 | 297 | return _unwrapvalue(evalrawexp(context, mapping, arg)) |
|
293 | 298 | |
|
294 | 299 | # TODO: unify this with unwrapvalue() once the bug of templatefunc.join() |
|
295 | 300 | # is fixed. we can't do that right now because join() has to take a generator |
|
296 | 301 | # of byte strings as it is, not a lazy byte string. |
|
297 | 302 | def _unwrapvalue(thing): |
|
298 | 303 | thing = unwrapvalue(thing) |
|
299 | 304 | # evalrawexp() may return string, generator of strings or arbitrary object |
|
300 | 305 | # such as date tuple, but filter does not want generator. |
|
301 | 306 | if isinstance(thing, types.GeneratorType): |
|
302 | 307 | thing = stringify(thing) |
|
303 | 308 | return thing |
|
304 | 309 | |
|
305 | 310 | def evalboolean(context, mapping, arg): |
|
306 | 311 | """Evaluate given argument as boolean, but also takes boolean literals""" |
|
307 | 312 | func, data = arg |
|
308 | 313 | if func is runsymbol: |
|
309 | 314 | thing = func(context, mapping, data, default=None) |
|
310 | 315 | if thing is None: |
|
311 | 316 | # not a template keyword, takes as a boolean literal |
|
312 | 317 | thing = stringutil.parsebool(data) |
|
313 | 318 | else: |
|
314 | 319 | thing = func(context, mapping, data) |
|
315 | 320 | thing = unwrapvalue(thing) |
|
316 | 321 | if isinstance(thing, bool): |
|
317 | 322 | return thing |
|
318 | 323 | # other objects are evaluated as strings, which means 0 is True, but |
|
319 | 324 | # empty dict/list should be False as they are expected to be '' |
|
320 | 325 | return bool(stringify(thing)) |
|
321 | 326 | |
|
322 | 327 | def evaldate(context, mapping, arg, err=None): |
|
323 | 328 | """Evaluate given argument as a date tuple or a date string; returns |
|
324 | 329 | a (unixtime, offset) tuple""" |
|
325 | 330 | return unwrapdate(evalrawexp(context, mapping, arg), err) |
|
326 | 331 | |
|
327 | 332 | def unwrapdate(thing, err=None): |
|
328 | 333 | thing = _unwrapvalue(thing) |
|
329 | 334 | try: |
|
330 | 335 | return dateutil.parsedate(thing) |
|
331 | 336 | except AttributeError: |
|
332 | 337 | raise error.ParseError(err or _('not a date tuple nor a string')) |
|
333 | 338 | except error.ParseError: |
|
334 | 339 | if not err: |
|
335 | 340 | raise |
|
336 | 341 | raise error.ParseError(err) |
|
337 | 342 | |
|
338 | 343 | def evalinteger(context, mapping, arg, err=None): |
|
339 | 344 | return unwrapinteger(evalrawexp(context, mapping, arg), err) |
|
340 | 345 | |
|
341 | 346 | def unwrapinteger(thing, err=None): |
|
342 | 347 | thing = _unwrapvalue(thing) |
|
343 | 348 | try: |
|
344 | 349 | return int(thing) |
|
345 | 350 | except (TypeError, ValueError): |
|
346 | 351 | raise error.ParseError(err or _('not an integer')) |
|
347 | 352 | |
|
348 | 353 | def evalstring(context, mapping, arg): |
|
349 | 354 | return stringify(evalrawexp(context, mapping, arg)) |
|
350 | 355 | |
|
351 | 356 | def evalstringliteral(context, mapping, arg): |
|
352 | 357 | """Evaluate given argument as string template, but returns symbol name |
|
353 | 358 | if it is unknown""" |
|
354 | 359 | func, data = arg |
|
355 | 360 | if func is runsymbol: |
|
356 | 361 | thing = func(context, mapping, data, default=data) |
|
357 | 362 | else: |
|
358 | 363 | thing = func(context, mapping, data) |
|
359 | 364 | return stringify(thing) |
|
360 | 365 | |
|
361 | 366 | _unwrapfuncbytype = { |
|
362 | 367 | None: _unwrapvalue, |
|
363 | 368 | bytes: stringify, |
|
369 | date: unwrapdate, | |
|
364 | 370 | int: unwrapinteger, |
|
365 | 371 | } |
|
366 | 372 | |
|
367 | 373 | def unwrapastype(thing, typ): |
|
368 | 374 | """Move the inner value object out of the wrapper and coerce its type""" |
|
369 | 375 | try: |
|
370 | 376 | f = _unwrapfuncbytype[typ] |
|
371 | 377 | except KeyError: |
|
372 | 378 | raise error.ProgrammingError('invalid type specified: %r' % typ) |
|
373 | 379 | return f(thing) |
|
374 | 380 | |
|
375 | 381 | def runinteger(context, mapping, data): |
|
376 | 382 | return int(data) |
|
377 | 383 | |
|
378 | 384 | def runstring(context, mapping, data): |
|
379 | 385 | return data |
|
380 | 386 | |
|
381 | 387 | def _recursivesymbolblocker(key): |
|
382 | 388 | def showrecursion(**args): |
|
383 | 389 | raise error.Abort(_("recursive reference '%s' in template") % key) |
|
384 | 390 | return showrecursion |
|
385 | 391 | |
|
386 | 392 | def runsymbol(context, mapping, key, default=''): |
|
387 | 393 | v = context.symbol(mapping, key) |
|
388 | 394 | if v is None: |
|
389 | 395 | # put poison to cut recursion. we can't move this to parsing phase |
|
390 | 396 | # because "x = {x}" is allowed if "x" is a keyword. (issue4758) |
|
391 | 397 | safemapping = mapping.copy() |
|
392 | 398 | safemapping[key] = _recursivesymbolblocker(key) |
|
393 | 399 | try: |
|
394 | 400 | v = context.process(key, safemapping) |
|
395 | 401 | except TemplateNotFound: |
|
396 | 402 | v = default |
|
397 | 403 | if callable(v) and getattr(v, '_requires', None) is None: |
|
398 | 404 | # old templatekw: expand all keywords and resources |
|
399 | 405 | # (TODO: deprecate this after porting web template keywords to new API) |
|
400 | 406 | props = {k: context._resources.lookup(context, mapping, k) |
|
401 | 407 | for k in context._resources.knownkeys()} |
|
402 | 408 | # pass context to _showcompatlist() through templatekw._showlist() |
|
403 | 409 | props['templ'] = context |
|
404 | 410 | props.update(mapping) |
|
405 | 411 | return v(**pycompat.strkwargs(props)) |
|
406 | 412 | if callable(v): |
|
407 | 413 | # new templatekw |
|
408 | 414 | try: |
|
409 | 415 | return v(context, mapping) |
|
410 | 416 | except ResourceUnavailable: |
|
411 | 417 | # unsupported keyword is mapped to empty just like unknown keyword |
|
412 | 418 | return None |
|
413 | 419 | return v |
|
414 | 420 | |
|
415 | 421 | def runtemplate(context, mapping, template): |
|
416 | 422 | for arg in template: |
|
417 | 423 | yield evalrawexp(context, mapping, arg) |
|
418 | 424 | |
|
419 | 425 | def runfilter(context, mapping, data): |
|
420 | 426 | arg, filt = data |
|
421 | 427 | thing = evalrawexp(context, mapping, arg) |
|
422 | 428 | try: |
|
423 | 429 | thing = unwrapastype(thing, getattr(filt, '_intype', None)) |
|
424 | 430 | return filt(thing) |
|
425 | 431 | except (ValueError, AttributeError, TypeError): |
|
426 | 432 | raise error.Abort(_formatfiltererror(arg, filt)) |
|
427 | 433 | except error.ParseError as e: |
|
428 | 434 | raise error.ParseError(bytes(e), hint=_formatfiltererror(arg, filt)) |
|
429 | 435 | |
|
430 | 436 | def _formatfiltererror(arg, filt): |
|
431 | 437 | fn = pycompat.sysbytes(filt.__name__) |
|
432 | 438 | sym = findsymbolicname(arg) |
|
433 | 439 | if not sym: |
|
434 | 440 | return _("incompatible use of template filter '%s'") % fn |
|
435 | 441 | return (_("template filter '%s' is not compatible with keyword '%s'") |
|
436 | 442 | % (fn, sym)) |
|
437 | 443 | |
|
438 | 444 | def runmap(context, mapping, data): |
|
439 | 445 | darg, targ = data |
|
440 | 446 | d = evalrawexp(context, mapping, darg) |
|
441 | 447 | if util.safehasattr(d, 'itermaps'): |
|
442 | 448 | diter = d.itermaps() |
|
443 | 449 | else: |
|
444 | 450 | try: |
|
445 | 451 | diter = iter(d) |
|
446 | 452 | except TypeError: |
|
447 | 453 | sym = findsymbolicname(darg) |
|
448 | 454 | if sym: |
|
449 | 455 | raise error.ParseError(_("keyword '%s' is not iterable") % sym) |
|
450 | 456 | else: |
|
451 | 457 | raise error.ParseError(_("%r is not iterable") % d) |
|
452 | 458 | |
|
453 | 459 | for i, v in enumerate(diter): |
|
454 | 460 | if isinstance(v, dict): |
|
455 | 461 | lm = context.overlaymap(mapping, v) |
|
456 | 462 | lm['index'] = i |
|
457 | 463 | yield evalrawexp(context, lm, targ) |
|
458 | 464 | else: |
|
459 | 465 | # v is not an iterable of dicts, this happen when 'key' |
|
460 | 466 | # has been fully expanded already and format is useless. |
|
461 | 467 | # If so, return the expanded value. |
|
462 | 468 | yield v |
|
463 | 469 | |
|
464 | 470 | def runmember(context, mapping, data): |
|
465 | 471 | darg, memb = data |
|
466 | 472 | d = evalrawexp(context, mapping, darg) |
|
467 | 473 | if util.safehasattr(d, 'tomap'): |
|
468 | 474 | lm = context.overlaymap(mapping, d.tomap()) |
|
469 | 475 | return runsymbol(context, lm, memb) |
|
470 | 476 | if util.safehasattr(d, 'get'): |
|
471 | 477 | return getdictitem(d, memb) |
|
472 | 478 | |
|
473 | 479 | sym = findsymbolicname(darg) |
|
474 | 480 | if sym: |
|
475 | 481 | raise error.ParseError(_("keyword '%s' has no member") % sym) |
|
476 | 482 | else: |
|
477 | 483 | raise error.ParseError(_("%r has no member") % pycompat.bytestr(d)) |
|
478 | 484 | |
|
479 | 485 | def runnegate(context, mapping, data): |
|
480 | 486 | data = evalinteger(context, mapping, data, |
|
481 | 487 | _('negation needs an integer argument')) |
|
482 | 488 | return -data |
|
483 | 489 | |
|
484 | 490 | def runarithmetic(context, mapping, data): |
|
485 | 491 | func, left, right = data |
|
486 | 492 | left = evalinteger(context, mapping, left, |
|
487 | 493 | _('arithmetic only defined on integers')) |
|
488 | 494 | right = evalinteger(context, mapping, right, |
|
489 | 495 | _('arithmetic only defined on integers')) |
|
490 | 496 | try: |
|
491 | 497 | return func(left, right) |
|
492 | 498 | except ZeroDivisionError: |
|
493 | 499 | raise error.Abort(_('division by zero is not defined')) |
|
494 | 500 | |
|
495 | 501 | def getdictitem(dictarg, key): |
|
496 | 502 | val = dictarg.get(key) |
|
497 | 503 | if val is None: |
|
498 | 504 | return |
|
499 | 505 | return wraphybridvalue(dictarg, key, val) |
@@ -1,4843 +1,4846 b'' | |||
|
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 | Test arithmetic operators have the right precedence: |
|
33 | 33 | |
|
34 | 34 | $ hg log -l 1 -T '{date(date, "%Y") + 5 * 10} {date(date, "%Y") - 2 * 3}\n' |
|
35 | 35 | 2020 1964 |
|
36 | 36 | $ hg log -l 1 -T '{date(date, "%Y") * 5 + 10} {date(date, "%Y") * 3 - 2}\n' |
|
37 | 37 | 9860 5908 |
|
38 | 38 | |
|
39 | 39 | Test division: |
|
40 | 40 | |
|
41 | 41 | $ hg debugtemplate -r0 -v '{5 / 2} {mod(5, 2)}\n' |
|
42 | 42 | (template |
|
43 | 43 | (/ |
|
44 | 44 | (integer '5') |
|
45 | 45 | (integer '2')) |
|
46 | 46 | (string ' ') |
|
47 | 47 | (func |
|
48 | 48 | (symbol 'mod') |
|
49 | 49 | (list |
|
50 | 50 | (integer '5') |
|
51 | 51 | (integer '2'))) |
|
52 | 52 | (string '\n')) |
|
53 | 53 | 2 1 |
|
54 | 54 | $ hg debugtemplate -r0 -v '{5 / -2} {mod(5, -2)}\n' |
|
55 | 55 | (template |
|
56 | 56 | (/ |
|
57 | 57 | (integer '5') |
|
58 | 58 | (negate |
|
59 | 59 | (integer '2'))) |
|
60 | 60 | (string ' ') |
|
61 | 61 | (func |
|
62 | 62 | (symbol 'mod') |
|
63 | 63 | (list |
|
64 | 64 | (integer '5') |
|
65 | 65 | (negate |
|
66 | 66 | (integer '2')))) |
|
67 | 67 | (string '\n')) |
|
68 | 68 | -3 -1 |
|
69 | 69 | $ hg debugtemplate -r0 -v '{-5 / 2} {mod(-5, 2)}\n' |
|
70 | 70 | (template |
|
71 | 71 | (/ |
|
72 | 72 | (negate |
|
73 | 73 | (integer '5')) |
|
74 | 74 | (integer '2')) |
|
75 | 75 | (string ' ') |
|
76 | 76 | (func |
|
77 | 77 | (symbol 'mod') |
|
78 | 78 | (list |
|
79 | 79 | (negate |
|
80 | 80 | (integer '5')) |
|
81 | 81 | (integer '2'))) |
|
82 | 82 | (string '\n')) |
|
83 | 83 | -3 1 |
|
84 | 84 | $ hg debugtemplate -r0 -v '{-5 / -2} {mod(-5, -2)}\n' |
|
85 | 85 | (template |
|
86 | 86 | (/ |
|
87 | 87 | (negate |
|
88 | 88 | (integer '5')) |
|
89 | 89 | (negate |
|
90 | 90 | (integer '2'))) |
|
91 | 91 | (string ' ') |
|
92 | 92 | (func |
|
93 | 93 | (symbol 'mod') |
|
94 | 94 | (list |
|
95 | 95 | (negate |
|
96 | 96 | (integer '5')) |
|
97 | 97 | (negate |
|
98 | 98 | (integer '2')))) |
|
99 | 99 | (string '\n')) |
|
100 | 100 | 2 -1 |
|
101 | 101 | |
|
102 | 102 | Filters bind closer than arithmetic: |
|
103 | 103 | |
|
104 | 104 | $ hg debugtemplate -r0 -v '{revset(".")|count - 1}\n' |
|
105 | 105 | (template |
|
106 | 106 | (- |
|
107 | 107 | (| |
|
108 | 108 | (func |
|
109 | 109 | (symbol 'revset') |
|
110 | 110 | (string '.')) |
|
111 | 111 | (symbol 'count')) |
|
112 | 112 | (integer '1')) |
|
113 | 113 | (string '\n')) |
|
114 | 114 | 0 |
|
115 | 115 | |
|
116 | 116 | But negate binds closer still: |
|
117 | 117 | |
|
118 | 118 | $ hg debugtemplate -r0 -v '{1-3|stringify}\n' |
|
119 | 119 | (template |
|
120 | 120 | (- |
|
121 | 121 | (integer '1') |
|
122 | 122 | (| |
|
123 | 123 | (integer '3') |
|
124 | 124 | (symbol 'stringify'))) |
|
125 | 125 | (string '\n')) |
|
126 | 126 | hg: parse error: arithmetic only defined on integers |
|
127 | 127 | [255] |
|
128 | 128 | $ hg debugtemplate -r0 -v '{-3|stringify}\n' |
|
129 | 129 | (template |
|
130 | 130 | (| |
|
131 | 131 | (negate |
|
132 | 132 | (integer '3')) |
|
133 | 133 | (symbol 'stringify')) |
|
134 | 134 | (string '\n')) |
|
135 | 135 | -3 |
|
136 | 136 | |
|
137 | 137 | Filters bind as close as map operator: |
|
138 | 138 | |
|
139 | 139 | $ hg debugtemplate -r0 -v '{desc|splitlines % "{line}\n"}' |
|
140 | 140 | (template |
|
141 | 141 | (% |
|
142 | 142 | (| |
|
143 | 143 | (symbol 'desc') |
|
144 | 144 | (symbol 'splitlines')) |
|
145 | 145 | (template |
|
146 | 146 | (symbol 'line') |
|
147 | 147 | (string '\n')))) |
|
148 | 148 | line 1 |
|
149 | 149 | line 2 |
|
150 | 150 | |
|
151 | 151 | Keyword arguments: |
|
152 | 152 | |
|
153 | 153 | $ hg debugtemplate -r0 -v '{foo=bar|baz}' |
|
154 | 154 | (template |
|
155 | 155 | (keyvalue |
|
156 | 156 | (symbol 'foo') |
|
157 | 157 | (| |
|
158 | 158 | (symbol 'bar') |
|
159 | 159 | (symbol 'baz')))) |
|
160 | 160 | hg: parse error: can't use a key-value pair in this context |
|
161 | 161 | [255] |
|
162 | 162 | |
|
163 | 163 | $ hg debugtemplate '{pad("foo", width=10, left=true)}\n' |
|
164 | 164 | foo |
|
165 | 165 | |
|
166 | 166 | Call function which takes named arguments by filter syntax: |
|
167 | 167 | |
|
168 | 168 | $ hg debugtemplate '{" "|separate}' |
|
169 | 169 | $ hg debugtemplate '{("not", "an", "argument", "list")|separate}' |
|
170 | 170 | hg: parse error: unknown method 'list' |
|
171 | 171 | [255] |
|
172 | 172 | |
|
173 | 173 | Second branch starting at nullrev: |
|
174 | 174 | |
|
175 | 175 | $ hg update null |
|
176 | 176 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
177 | 177 | $ echo second > second |
|
178 | 178 | $ hg add second |
|
179 | 179 | $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' |
|
180 | 180 | created new head |
|
181 | 181 | |
|
182 | 182 | $ echo third > third |
|
183 | 183 | $ hg add third |
|
184 | 184 | $ hg mv second fourth |
|
185 | 185 | $ hg commit -m third -d "2020-01-01 10:01" |
|
186 | 186 | |
|
187 | 187 | $ hg log --template '{join(file_copies, ",\n")}\n' -r . |
|
188 | 188 | fourth (second) |
|
189 | 189 | $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r . |
|
190 | 190 | second -> fourth |
|
191 | 191 | $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7 |
|
192 | 192 | 8 t |
|
193 | 193 | 7 f |
|
194 | 194 | |
|
195 | 195 | Working-directory revision has special identifiers, though they are still |
|
196 | 196 | experimental: |
|
197 | 197 | |
|
198 | 198 | $ hg log -r 'wdir()' -T '{rev}:{node}\n' |
|
199 | 199 | 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
200 | 200 | |
|
201 | 201 | Some keywords are invalid for working-directory revision, but they should |
|
202 | 202 | never cause crash: |
|
203 | 203 | |
|
204 | 204 | $ hg log -r 'wdir()' -T '{manifest}\n' |
|
205 | 205 | |
|
206 | 206 | |
|
207 | 207 | Internal resources shouldn't be exposed (issue5699): |
|
208 | 208 | |
|
209 | 209 | $ hg log -r. -T '{cache}{ctx}{repo}{revcache}{templ}{ui}' |
|
210 | 210 | |
|
211 | 211 | Never crash on internal resource not available: |
|
212 | 212 | |
|
213 | 213 | $ hg --cwd .. debugtemplate '{"c0bebeef"|shortest}\n' |
|
214 | 214 | abort: template resource not available: ctx |
|
215 | 215 | [255] |
|
216 | 216 | |
|
217 | 217 | $ hg config -T '{author}' |
|
218 | 218 | |
|
219 | 219 | Quoting for ui.logtemplate |
|
220 | 220 | |
|
221 | 221 | $ hg tip --config "ui.logtemplate={rev}\n" |
|
222 | 222 | 8 |
|
223 | 223 | $ hg tip --config "ui.logtemplate='{rev}\n'" |
|
224 | 224 | 8 |
|
225 | 225 | $ hg tip --config 'ui.logtemplate="{rev}\n"' |
|
226 | 226 | 8 |
|
227 | 227 | $ hg tip --config 'ui.logtemplate=n{rev}\n' |
|
228 | 228 | n8 |
|
229 | 229 | |
|
230 | 230 | Make sure user/global hgrc does not affect tests |
|
231 | 231 | |
|
232 | 232 | $ echo '[ui]' > .hg/hgrc |
|
233 | 233 | $ echo 'logtemplate =' >> .hg/hgrc |
|
234 | 234 | $ echo 'style =' >> .hg/hgrc |
|
235 | 235 | |
|
236 | 236 | Add some simple styles to settings |
|
237 | 237 | |
|
238 | 238 | $ cat <<'EOF' >> .hg/hgrc |
|
239 | 239 | > [templates] |
|
240 | 240 | > simple = "{rev}\n" |
|
241 | 241 | > simple2 = {rev}\n |
|
242 | 242 | > rev = "should not precede {rev} keyword\n" |
|
243 | 243 | > EOF |
|
244 | 244 | |
|
245 | 245 | $ hg log -l1 -Tsimple |
|
246 | 246 | 8 |
|
247 | 247 | $ hg log -l1 -Tsimple2 |
|
248 | 248 | 8 |
|
249 | 249 | $ hg log -l1 -Trev |
|
250 | 250 | should not precede 8 keyword |
|
251 | 251 | $ hg log -l1 -T '{simple}' |
|
252 | 252 | 8 |
|
253 | 253 | |
|
254 | 254 | Map file shouldn't see user templates: |
|
255 | 255 | |
|
256 | 256 | $ cat <<EOF > tmpl |
|
257 | 257 | > changeset = 'nothing expanded:{simple}\n' |
|
258 | 258 | > EOF |
|
259 | 259 | $ hg log -l1 --style ./tmpl |
|
260 | 260 | nothing expanded: |
|
261 | 261 | |
|
262 | 262 | Test templates and style maps in files: |
|
263 | 263 | |
|
264 | 264 | $ echo "{rev}" > tmpl |
|
265 | 265 | $ hg log -l1 -T./tmpl |
|
266 | 266 | 8 |
|
267 | 267 | $ hg log -l1 -Tblah/blah |
|
268 | 268 | blah/blah (no-eol) |
|
269 | 269 | |
|
270 | 270 | $ printf 'changeset = "{rev}\\n"\n' > map-simple |
|
271 | 271 | $ hg log -l1 -T./map-simple |
|
272 | 272 | 8 |
|
273 | 273 | |
|
274 | 274 | a map file may have [templates] and [templatealias] sections: |
|
275 | 275 | |
|
276 | 276 | $ cat <<'EOF' > map-simple |
|
277 | 277 | > [templates] |
|
278 | 278 | > changeset = "{a}\n" |
|
279 | 279 | > [templatealias] |
|
280 | 280 | > a = rev |
|
281 | 281 | > EOF |
|
282 | 282 | $ hg log -l1 -T./map-simple |
|
283 | 283 | 8 |
|
284 | 284 | |
|
285 | 285 | so it can be included in hgrc |
|
286 | 286 | |
|
287 | 287 | $ cat <<'EOF' > myhgrc |
|
288 | 288 | > %include map-simple |
|
289 | 289 | > [templates] |
|
290 | 290 | > foo = "{changeset}" |
|
291 | 291 | > EOF |
|
292 | 292 | $ HGRCPATH=./myhgrc hg log -l1 -Tfoo |
|
293 | 293 | 8 |
|
294 | 294 | $ HGRCPATH=./myhgrc hg log -l1 -T'{a}\n' |
|
295 | 295 | 8 |
|
296 | 296 | |
|
297 | 297 | Test template map inheritance |
|
298 | 298 | |
|
299 | 299 | $ echo "__base__ = map-cmdline.default" > map-simple |
|
300 | 300 | $ printf 'cset = "changeset: ***{rev}***\\n"\n' >> map-simple |
|
301 | 301 | $ hg log -l1 -T./map-simple |
|
302 | 302 | changeset: ***8*** |
|
303 | 303 | tag: tip |
|
304 | 304 | user: test |
|
305 | 305 | date: Wed Jan 01 10:01:00 2020 +0000 |
|
306 | 306 | summary: third |
|
307 | 307 | |
|
308 | 308 | |
|
309 | 309 | Test docheader, docfooter and separator in template map |
|
310 | 310 | |
|
311 | 311 | $ cat <<'EOF' > map-myjson |
|
312 | 312 | > docheader = '\{\n' |
|
313 | 313 | > docfooter = '\n}\n' |
|
314 | 314 | > separator = ',\n' |
|
315 | 315 | > changeset = ' {dict(rev, node|short)|json}' |
|
316 | 316 | > EOF |
|
317 | 317 | $ hg log -l2 -T./map-myjson |
|
318 | 318 | { |
|
319 | 319 | {"node": "95c24699272e", "rev": 8}, |
|
320 | 320 | {"node": "29114dbae42b", "rev": 7} |
|
321 | 321 | } |
|
322 | 322 | |
|
323 | 323 | Test docheader, docfooter and separator in [templates] section |
|
324 | 324 | |
|
325 | 325 | $ cat <<'EOF' >> .hg/hgrc |
|
326 | 326 | > [templates] |
|
327 | 327 | > myjson = ' {dict(rev, node|short)|json}' |
|
328 | 328 | > myjson:docheader = '\{\n' |
|
329 | 329 | > myjson:docfooter = '\n}\n' |
|
330 | 330 | > myjson:separator = ',\n' |
|
331 | 331 | > :docheader = 'should not be selected as a docheader for literal templates\n' |
|
332 | 332 | > EOF |
|
333 | 333 | $ hg log -l2 -Tmyjson |
|
334 | 334 | { |
|
335 | 335 | {"node": "95c24699272e", "rev": 8}, |
|
336 | 336 | {"node": "29114dbae42b", "rev": 7} |
|
337 | 337 | } |
|
338 | 338 | $ hg log -l1 -T'{rev}\n' |
|
339 | 339 | 8 |
|
340 | 340 | |
|
341 | 341 | Template should precede style option |
|
342 | 342 | |
|
343 | 343 | $ hg log -l1 --style default -T '{rev}\n' |
|
344 | 344 | 8 |
|
345 | 345 | |
|
346 | 346 | Add a commit with empty description, to ensure that the templates |
|
347 | 347 | below will omit the description line. |
|
348 | 348 | |
|
349 | 349 | $ echo c >> c |
|
350 | 350 | $ hg add c |
|
351 | 351 | $ hg commit -qm ' ' |
|
352 | 352 | |
|
353 | 353 | Default style is like normal output. Phases style should be the same |
|
354 | 354 | as default style, except for extra phase lines. |
|
355 | 355 | |
|
356 | 356 | $ hg log > log.out |
|
357 | 357 | $ hg log --style default > style.out |
|
358 | 358 | $ cmp log.out style.out || diff -u log.out style.out |
|
359 | 359 | $ hg log -T phases > phases.out |
|
360 | 360 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
361 | 361 | +phase: draft |
|
362 | 362 | +phase: draft |
|
363 | 363 | +phase: draft |
|
364 | 364 | +phase: draft |
|
365 | 365 | +phase: draft |
|
366 | 366 | +phase: draft |
|
367 | 367 | +phase: draft |
|
368 | 368 | +phase: draft |
|
369 | 369 | +phase: draft |
|
370 | 370 | +phase: draft |
|
371 | 371 | |
|
372 | 372 | $ hg log -v > log.out |
|
373 | 373 | $ hg log -v --style default > style.out |
|
374 | 374 | $ cmp log.out style.out || diff -u log.out style.out |
|
375 | 375 | $ hg log -v -T phases > phases.out |
|
376 | 376 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
377 | 377 | +phase: draft |
|
378 | 378 | +phase: draft |
|
379 | 379 | +phase: draft |
|
380 | 380 | +phase: draft |
|
381 | 381 | +phase: draft |
|
382 | 382 | +phase: draft |
|
383 | 383 | +phase: draft |
|
384 | 384 | +phase: draft |
|
385 | 385 | +phase: draft |
|
386 | 386 | +phase: draft |
|
387 | 387 | |
|
388 | 388 | $ hg log -q > log.out |
|
389 | 389 | $ hg log -q --style default > style.out |
|
390 | 390 | $ cmp log.out style.out || diff -u log.out style.out |
|
391 | 391 | $ hg log -q -T phases > phases.out |
|
392 | 392 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
393 | 393 | |
|
394 | 394 | $ hg log --debug > log.out |
|
395 | 395 | $ hg log --debug --style default > style.out |
|
396 | 396 | $ cmp log.out style.out || diff -u log.out style.out |
|
397 | 397 | $ hg log --debug -T phases > phases.out |
|
398 | 398 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
399 | 399 | |
|
400 | 400 | Default style of working-directory revision should also be the same (but |
|
401 | 401 | date may change while running tests): |
|
402 | 402 | |
|
403 | 403 | $ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out |
|
404 | 404 | $ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out |
|
405 | 405 | $ cmp log.out style.out || diff -u log.out style.out |
|
406 | 406 | |
|
407 | 407 | $ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out |
|
408 | 408 | $ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out |
|
409 | 409 | $ cmp log.out style.out || diff -u log.out style.out |
|
410 | 410 | |
|
411 | 411 | $ hg log -r 'wdir()' -q > log.out |
|
412 | 412 | $ hg log -r 'wdir()' -q --style default > style.out |
|
413 | 413 | $ cmp log.out style.out || diff -u log.out style.out |
|
414 | 414 | |
|
415 | 415 | $ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out |
|
416 | 416 | $ hg log -r 'wdir()' --debug --style default \ |
|
417 | 417 | > | sed 's|^date:.*|date:|' > style.out |
|
418 | 418 | $ cmp log.out style.out || diff -u log.out style.out |
|
419 | 419 | |
|
420 | 420 | Default style should also preserve color information (issue2866): |
|
421 | 421 | |
|
422 | 422 | $ cp $HGRCPATH $HGRCPATH-bak |
|
423 | 423 | $ cat <<EOF >> $HGRCPATH |
|
424 | 424 | > [extensions] |
|
425 | 425 | > color= |
|
426 | 426 | > EOF |
|
427 | 427 | |
|
428 | 428 | $ hg --color=debug log > log.out |
|
429 | 429 | $ hg --color=debug log --style default > style.out |
|
430 | 430 | $ cmp log.out style.out || diff -u log.out style.out |
|
431 | 431 | $ hg --color=debug log -T phases > phases.out |
|
432 | 432 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
433 | 433 | +[log.phase|phase: draft] |
|
434 | 434 | +[log.phase|phase: draft] |
|
435 | 435 | +[log.phase|phase: draft] |
|
436 | 436 | +[log.phase|phase: draft] |
|
437 | 437 | +[log.phase|phase: draft] |
|
438 | 438 | +[log.phase|phase: draft] |
|
439 | 439 | +[log.phase|phase: draft] |
|
440 | 440 | +[log.phase|phase: draft] |
|
441 | 441 | +[log.phase|phase: draft] |
|
442 | 442 | +[log.phase|phase: draft] |
|
443 | 443 | |
|
444 | 444 | $ hg --color=debug -v log > log.out |
|
445 | 445 | $ hg --color=debug -v log --style default > style.out |
|
446 | 446 | $ cmp log.out style.out || diff -u log.out style.out |
|
447 | 447 | $ hg --color=debug -v log -T phases > phases.out |
|
448 | 448 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
449 | 449 | +[log.phase|phase: draft] |
|
450 | 450 | +[log.phase|phase: draft] |
|
451 | 451 | +[log.phase|phase: draft] |
|
452 | 452 | +[log.phase|phase: draft] |
|
453 | 453 | +[log.phase|phase: draft] |
|
454 | 454 | +[log.phase|phase: draft] |
|
455 | 455 | +[log.phase|phase: draft] |
|
456 | 456 | +[log.phase|phase: draft] |
|
457 | 457 | +[log.phase|phase: draft] |
|
458 | 458 | +[log.phase|phase: draft] |
|
459 | 459 | |
|
460 | 460 | $ hg --color=debug -q log > log.out |
|
461 | 461 | $ hg --color=debug -q log --style default > style.out |
|
462 | 462 | $ cmp log.out style.out || diff -u log.out style.out |
|
463 | 463 | $ hg --color=debug -q log -T phases > phases.out |
|
464 | 464 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
465 | 465 | |
|
466 | 466 | $ hg --color=debug --debug log > log.out |
|
467 | 467 | $ hg --color=debug --debug log --style default > style.out |
|
468 | 468 | $ cmp log.out style.out || diff -u log.out style.out |
|
469 | 469 | $ hg --color=debug --debug log -T phases > phases.out |
|
470 | 470 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
471 | 471 | |
|
472 | 472 | $ mv $HGRCPATH-bak $HGRCPATH |
|
473 | 473 | |
|
474 | 474 | Remove commit with empty commit message, so as to not pollute further |
|
475 | 475 | tests. |
|
476 | 476 | |
|
477 | 477 | $ hg --config extensions.strip= strip -q . |
|
478 | 478 | |
|
479 | 479 | Revision with no copies (used to print a traceback): |
|
480 | 480 | |
|
481 | 481 | $ hg tip -v --template '\n' |
|
482 | 482 | |
|
483 | 483 | |
|
484 | 484 | Compact style works: |
|
485 | 485 | |
|
486 | 486 | $ hg log -Tcompact |
|
487 | 487 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
488 | 488 | third |
|
489 | 489 | |
|
490 | 490 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user |
|
491 | 491 | second |
|
492 | 492 | |
|
493 | 493 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
494 | 494 | merge |
|
495 | 495 | |
|
496 | 496 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
497 | 497 | new head |
|
498 | 498 | |
|
499 | 499 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
500 | 500 | new branch |
|
501 | 501 | |
|
502 | 502 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
503 | 503 | no user, no domain |
|
504 | 504 | |
|
505 | 505 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other |
|
506 | 506 | no person |
|
507 | 507 | |
|
508 | 508 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other |
|
509 | 509 | other 1 |
|
510 | 510 | |
|
511 | 511 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
512 | 512 | line 1 |
|
513 | 513 | |
|
514 | 514 | |
|
515 | 515 | $ hg log -v --style compact |
|
516 | 516 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
517 | 517 | third |
|
518 | 518 | |
|
519 | 519 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
520 | 520 | second |
|
521 | 521 | |
|
522 | 522 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
523 | 523 | merge |
|
524 | 524 | |
|
525 | 525 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
526 | 526 | new head |
|
527 | 527 | |
|
528 | 528 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
529 | 529 | new branch |
|
530 | 530 | |
|
531 | 531 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
532 | 532 | no user, no domain |
|
533 | 533 | |
|
534 | 534 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
535 | 535 | no person |
|
536 | 536 | |
|
537 | 537 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
538 | 538 | other 1 |
|
539 | 539 | other 2 |
|
540 | 540 | |
|
541 | 541 | other 3 |
|
542 | 542 | |
|
543 | 543 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
544 | 544 | line 1 |
|
545 | 545 | line 2 |
|
546 | 546 | |
|
547 | 547 | |
|
548 | 548 | $ hg log --debug --style compact |
|
549 | 549 | 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test |
|
550 | 550 | third |
|
551 | 551 | |
|
552 | 552 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
553 | 553 | second |
|
554 | 554 | |
|
555 | 555 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
556 | 556 | merge |
|
557 | 557 | |
|
558 | 558 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
559 | 559 | new head |
|
560 | 560 | |
|
561 | 561 | 4:3,-1 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
562 | 562 | new branch |
|
563 | 563 | |
|
564 | 564 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
565 | 565 | no user, no domain |
|
566 | 566 | |
|
567 | 567 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
568 | 568 | no person |
|
569 | 569 | |
|
570 | 570 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
571 | 571 | other 1 |
|
572 | 572 | other 2 |
|
573 | 573 | |
|
574 | 574 | other 3 |
|
575 | 575 | |
|
576 | 576 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
577 | 577 | line 1 |
|
578 | 578 | line 2 |
|
579 | 579 | |
|
580 | 580 | |
|
581 | 581 | Test xml styles: |
|
582 | 582 | |
|
583 | 583 | $ hg log --style xml -r 'not all()' |
|
584 | 584 | <?xml version="1.0"?> |
|
585 | 585 | <log> |
|
586 | 586 | </log> |
|
587 | 587 | |
|
588 | 588 | $ hg log --style xml |
|
589 | 589 | <?xml version="1.0"?> |
|
590 | 590 | <log> |
|
591 | 591 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
592 | 592 | <tag>tip</tag> |
|
593 | 593 | <author email="test">test</author> |
|
594 | 594 | <date>2020-01-01T10:01:00+00:00</date> |
|
595 | 595 | <msg xml:space="preserve">third</msg> |
|
596 | 596 | </logentry> |
|
597 | 597 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
598 | 598 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
599 | 599 | <author email="user@hostname">User Name</author> |
|
600 | 600 | <date>1970-01-12T13:46:40+00:00</date> |
|
601 | 601 | <msg xml:space="preserve">second</msg> |
|
602 | 602 | </logentry> |
|
603 | 603 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
604 | 604 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
605 | 605 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
606 | 606 | <author email="person">person</author> |
|
607 | 607 | <date>1970-01-18T08:40:01+00:00</date> |
|
608 | 608 | <msg xml:space="preserve">merge</msg> |
|
609 | 609 | </logentry> |
|
610 | 610 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
611 | 611 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
612 | 612 | <author email="person">person</author> |
|
613 | 613 | <date>1970-01-18T08:40:00+00:00</date> |
|
614 | 614 | <msg xml:space="preserve">new head</msg> |
|
615 | 615 | </logentry> |
|
616 | 616 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
617 | 617 | <branch>foo</branch> |
|
618 | 618 | <author email="person">person</author> |
|
619 | 619 | <date>1970-01-17T04:53:20+00:00</date> |
|
620 | 620 | <msg xml:space="preserve">new branch</msg> |
|
621 | 621 | </logentry> |
|
622 | 622 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
623 | 623 | <author email="person">person</author> |
|
624 | 624 | <date>1970-01-16T01:06:40+00:00</date> |
|
625 | 625 | <msg xml:space="preserve">no user, no domain</msg> |
|
626 | 626 | </logentry> |
|
627 | 627 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
628 | 628 | <author email="other@place">other</author> |
|
629 | 629 | <date>1970-01-14T21:20:00+00:00</date> |
|
630 | 630 | <msg xml:space="preserve">no person</msg> |
|
631 | 631 | </logentry> |
|
632 | 632 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
633 | 633 | <author email="other@place">A. N. Other</author> |
|
634 | 634 | <date>1970-01-13T17:33:20+00:00</date> |
|
635 | 635 | <msg xml:space="preserve">other 1 |
|
636 | 636 | other 2 |
|
637 | 637 | |
|
638 | 638 | other 3</msg> |
|
639 | 639 | </logentry> |
|
640 | 640 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
641 | 641 | <author email="user@hostname">User Name</author> |
|
642 | 642 | <date>1970-01-12T13:46:40+00:00</date> |
|
643 | 643 | <msg xml:space="preserve">line 1 |
|
644 | 644 | line 2</msg> |
|
645 | 645 | </logentry> |
|
646 | 646 | </log> |
|
647 | 647 | |
|
648 | 648 | $ hg log -v --style xml |
|
649 | 649 | <?xml version="1.0"?> |
|
650 | 650 | <log> |
|
651 | 651 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
652 | 652 | <tag>tip</tag> |
|
653 | 653 | <author email="test">test</author> |
|
654 | 654 | <date>2020-01-01T10:01:00+00:00</date> |
|
655 | 655 | <msg xml:space="preserve">third</msg> |
|
656 | 656 | <paths> |
|
657 | 657 | <path action="A">fourth</path> |
|
658 | 658 | <path action="A">third</path> |
|
659 | 659 | <path action="R">second</path> |
|
660 | 660 | </paths> |
|
661 | 661 | <copies> |
|
662 | 662 | <copy source="second">fourth</copy> |
|
663 | 663 | </copies> |
|
664 | 664 | </logentry> |
|
665 | 665 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
666 | 666 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
667 | 667 | <author email="user@hostname">User Name</author> |
|
668 | 668 | <date>1970-01-12T13:46:40+00:00</date> |
|
669 | 669 | <msg xml:space="preserve">second</msg> |
|
670 | 670 | <paths> |
|
671 | 671 | <path action="A">second</path> |
|
672 | 672 | </paths> |
|
673 | 673 | </logentry> |
|
674 | 674 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
675 | 675 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
676 | 676 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
677 | 677 | <author email="person">person</author> |
|
678 | 678 | <date>1970-01-18T08:40:01+00:00</date> |
|
679 | 679 | <msg xml:space="preserve">merge</msg> |
|
680 | 680 | <paths> |
|
681 | 681 | </paths> |
|
682 | 682 | </logentry> |
|
683 | 683 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
684 | 684 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
685 | 685 | <author email="person">person</author> |
|
686 | 686 | <date>1970-01-18T08:40:00+00:00</date> |
|
687 | 687 | <msg xml:space="preserve">new head</msg> |
|
688 | 688 | <paths> |
|
689 | 689 | <path action="A">d</path> |
|
690 | 690 | </paths> |
|
691 | 691 | </logentry> |
|
692 | 692 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
693 | 693 | <branch>foo</branch> |
|
694 | 694 | <author email="person">person</author> |
|
695 | 695 | <date>1970-01-17T04:53:20+00:00</date> |
|
696 | 696 | <msg xml:space="preserve">new branch</msg> |
|
697 | 697 | <paths> |
|
698 | 698 | </paths> |
|
699 | 699 | </logentry> |
|
700 | 700 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
701 | 701 | <author email="person">person</author> |
|
702 | 702 | <date>1970-01-16T01:06:40+00:00</date> |
|
703 | 703 | <msg xml:space="preserve">no user, no domain</msg> |
|
704 | 704 | <paths> |
|
705 | 705 | <path action="M">c</path> |
|
706 | 706 | </paths> |
|
707 | 707 | </logentry> |
|
708 | 708 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
709 | 709 | <author email="other@place">other</author> |
|
710 | 710 | <date>1970-01-14T21:20:00+00:00</date> |
|
711 | 711 | <msg xml:space="preserve">no person</msg> |
|
712 | 712 | <paths> |
|
713 | 713 | <path action="A">c</path> |
|
714 | 714 | </paths> |
|
715 | 715 | </logentry> |
|
716 | 716 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
717 | 717 | <author email="other@place">A. N. Other</author> |
|
718 | 718 | <date>1970-01-13T17:33:20+00:00</date> |
|
719 | 719 | <msg xml:space="preserve">other 1 |
|
720 | 720 | other 2 |
|
721 | 721 | |
|
722 | 722 | other 3</msg> |
|
723 | 723 | <paths> |
|
724 | 724 | <path action="A">b</path> |
|
725 | 725 | </paths> |
|
726 | 726 | </logentry> |
|
727 | 727 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
728 | 728 | <author email="user@hostname">User Name</author> |
|
729 | 729 | <date>1970-01-12T13:46:40+00:00</date> |
|
730 | 730 | <msg xml:space="preserve">line 1 |
|
731 | 731 | line 2</msg> |
|
732 | 732 | <paths> |
|
733 | 733 | <path action="A">a</path> |
|
734 | 734 | </paths> |
|
735 | 735 | </logentry> |
|
736 | 736 | </log> |
|
737 | 737 | |
|
738 | 738 | $ hg log --debug --style xml |
|
739 | 739 | <?xml version="1.0"?> |
|
740 | 740 | <log> |
|
741 | 741 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
742 | 742 | <tag>tip</tag> |
|
743 | 743 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> |
|
744 | 744 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
745 | 745 | <author email="test">test</author> |
|
746 | 746 | <date>2020-01-01T10:01:00+00:00</date> |
|
747 | 747 | <msg xml:space="preserve">third</msg> |
|
748 | 748 | <paths> |
|
749 | 749 | <path action="A">fourth</path> |
|
750 | 750 | <path action="A">third</path> |
|
751 | 751 | <path action="R">second</path> |
|
752 | 752 | </paths> |
|
753 | 753 | <copies> |
|
754 | 754 | <copy source="second">fourth</copy> |
|
755 | 755 | </copies> |
|
756 | 756 | <extra key="branch">default</extra> |
|
757 | 757 | </logentry> |
|
758 | 758 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
759 | 759 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
760 | 760 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
761 | 761 | <author email="user@hostname">User Name</author> |
|
762 | 762 | <date>1970-01-12T13:46:40+00:00</date> |
|
763 | 763 | <msg xml:space="preserve">second</msg> |
|
764 | 764 | <paths> |
|
765 | 765 | <path action="A">second</path> |
|
766 | 766 | </paths> |
|
767 | 767 | <extra key="branch">default</extra> |
|
768 | 768 | </logentry> |
|
769 | 769 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
770 | 770 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
771 | 771 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
772 | 772 | <author email="person">person</author> |
|
773 | 773 | <date>1970-01-18T08:40:01+00:00</date> |
|
774 | 774 | <msg xml:space="preserve">merge</msg> |
|
775 | 775 | <paths> |
|
776 | 776 | </paths> |
|
777 | 777 | <extra key="branch">default</extra> |
|
778 | 778 | </logentry> |
|
779 | 779 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
780 | 780 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
781 | 781 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
782 | 782 | <author email="person">person</author> |
|
783 | 783 | <date>1970-01-18T08:40:00+00:00</date> |
|
784 | 784 | <msg xml:space="preserve">new head</msg> |
|
785 | 785 | <paths> |
|
786 | 786 | <path action="A">d</path> |
|
787 | 787 | </paths> |
|
788 | 788 | <extra key="branch">default</extra> |
|
789 | 789 | </logentry> |
|
790 | 790 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
791 | 791 | <branch>foo</branch> |
|
792 | 792 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
793 | 793 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
794 | 794 | <author email="person">person</author> |
|
795 | 795 | <date>1970-01-17T04:53:20+00:00</date> |
|
796 | 796 | <msg xml:space="preserve">new branch</msg> |
|
797 | 797 | <paths> |
|
798 | 798 | </paths> |
|
799 | 799 | <extra key="branch">foo</extra> |
|
800 | 800 | </logentry> |
|
801 | 801 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
802 | 802 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> |
|
803 | 803 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
804 | 804 | <author email="person">person</author> |
|
805 | 805 | <date>1970-01-16T01:06:40+00:00</date> |
|
806 | 806 | <msg xml:space="preserve">no user, no domain</msg> |
|
807 | 807 | <paths> |
|
808 | 808 | <path action="M">c</path> |
|
809 | 809 | </paths> |
|
810 | 810 | <extra key="branch">default</extra> |
|
811 | 811 | </logentry> |
|
812 | 812 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
813 | 813 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> |
|
814 | 814 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
815 | 815 | <author email="other@place">other</author> |
|
816 | 816 | <date>1970-01-14T21:20:00+00:00</date> |
|
817 | 817 | <msg xml:space="preserve">no person</msg> |
|
818 | 818 | <paths> |
|
819 | 819 | <path action="A">c</path> |
|
820 | 820 | </paths> |
|
821 | 821 | <extra key="branch">default</extra> |
|
822 | 822 | </logentry> |
|
823 | 823 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
824 | 824 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> |
|
825 | 825 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
826 | 826 | <author email="other@place">A. N. Other</author> |
|
827 | 827 | <date>1970-01-13T17:33:20+00:00</date> |
|
828 | 828 | <msg xml:space="preserve">other 1 |
|
829 | 829 | other 2 |
|
830 | 830 | |
|
831 | 831 | other 3</msg> |
|
832 | 832 | <paths> |
|
833 | 833 | <path action="A">b</path> |
|
834 | 834 | </paths> |
|
835 | 835 | <extra key="branch">default</extra> |
|
836 | 836 | </logentry> |
|
837 | 837 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
838 | 838 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
839 | 839 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
840 | 840 | <author email="user@hostname">User Name</author> |
|
841 | 841 | <date>1970-01-12T13:46:40+00:00</date> |
|
842 | 842 | <msg xml:space="preserve">line 1 |
|
843 | 843 | line 2</msg> |
|
844 | 844 | <paths> |
|
845 | 845 | <path action="A">a</path> |
|
846 | 846 | </paths> |
|
847 | 847 | <extra key="branch">default</extra> |
|
848 | 848 | </logentry> |
|
849 | 849 | </log> |
|
850 | 850 | |
|
851 | 851 | |
|
852 | 852 | Test JSON style: |
|
853 | 853 | |
|
854 | 854 | $ hg log -k nosuch -Tjson |
|
855 | 855 | [] |
|
856 | 856 | |
|
857 | 857 | $ hg log -qr . -Tjson |
|
858 | 858 | [ |
|
859 | 859 | { |
|
860 | 860 | "rev": 8, |
|
861 | 861 | "node": "95c24699272ef57d062b8bccc32c878bf841784a" |
|
862 | 862 | } |
|
863 | 863 | ] |
|
864 | 864 | |
|
865 | 865 | $ hg log -vpr . -Tjson --stat |
|
866 | 866 | [ |
|
867 | 867 | { |
|
868 | 868 | "rev": 8, |
|
869 | 869 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
870 | 870 | "branch": "default", |
|
871 | 871 | "phase": "draft", |
|
872 | 872 | "user": "test", |
|
873 | 873 | "date": [1577872860, 0], |
|
874 | 874 | "desc": "third", |
|
875 | 875 | "bookmarks": [], |
|
876 | 876 | "tags": ["tip"], |
|
877 | 877 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
878 | 878 | "files": ["fourth", "second", "third"], |
|
879 | 879 | "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", |
|
880 | 880 | "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" |
|
881 | 881 | } |
|
882 | 882 | ] |
|
883 | 883 | |
|
884 | 884 | honor --git but not format-breaking diffopts |
|
885 | 885 | $ hg --config diff.noprefix=True log --git -vpr . -Tjson |
|
886 | 886 | [ |
|
887 | 887 | { |
|
888 | 888 | "rev": 8, |
|
889 | 889 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
890 | 890 | "branch": "default", |
|
891 | 891 | "phase": "draft", |
|
892 | 892 | "user": "test", |
|
893 | 893 | "date": [1577872860, 0], |
|
894 | 894 | "desc": "third", |
|
895 | 895 | "bookmarks": [], |
|
896 | 896 | "tags": ["tip"], |
|
897 | 897 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
898 | 898 | "files": ["fourth", "second", "third"], |
|
899 | 899 | "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" |
|
900 | 900 | } |
|
901 | 901 | ] |
|
902 | 902 | |
|
903 | 903 | $ hg log -T json |
|
904 | 904 | [ |
|
905 | 905 | { |
|
906 | 906 | "rev": 8, |
|
907 | 907 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
908 | 908 | "branch": "default", |
|
909 | 909 | "phase": "draft", |
|
910 | 910 | "user": "test", |
|
911 | 911 | "date": [1577872860, 0], |
|
912 | 912 | "desc": "third", |
|
913 | 913 | "bookmarks": [], |
|
914 | 914 | "tags": ["tip"], |
|
915 | 915 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"] |
|
916 | 916 | }, |
|
917 | 917 | { |
|
918 | 918 | "rev": 7, |
|
919 | 919 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
920 | 920 | "branch": "default", |
|
921 | 921 | "phase": "draft", |
|
922 | 922 | "user": "User Name <user@hostname>", |
|
923 | 923 | "date": [1000000, 0], |
|
924 | 924 | "desc": "second", |
|
925 | 925 | "bookmarks": [], |
|
926 | 926 | "tags": [], |
|
927 | 927 | "parents": ["0000000000000000000000000000000000000000"] |
|
928 | 928 | }, |
|
929 | 929 | { |
|
930 | 930 | "rev": 6, |
|
931 | 931 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
932 | 932 | "branch": "default", |
|
933 | 933 | "phase": "draft", |
|
934 | 934 | "user": "person", |
|
935 | 935 | "date": [1500001, 0], |
|
936 | 936 | "desc": "merge", |
|
937 | 937 | "bookmarks": [], |
|
938 | 938 | "tags": [], |
|
939 | 939 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"] |
|
940 | 940 | }, |
|
941 | 941 | { |
|
942 | 942 | "rev": 5, |
|
943 | 943 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
944 | 944 | "branch": "default", |
|
945 | 945 | "phase": "draft", |
|
946 | 946 | "user": "person", |
|
947 | 947 | "date": [1500000, 0], |
|
948 | 948 | "desc": "new head", |
|
949 | 949 | "bookmarks": [], |
|
950 | 950 | "tags": [], |
|
951 | 951 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
952 | 952 | }, |
|
953 | 953 | { |
|
954 | 954 | "rev": 4, |
|
955 | 955 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
956 | 956 | "branch": "foo", |
|
957 | 957 | "phase": "draft", |
|
958 | 958 | "user": "person", |
|
959 | 959 | "date": [1400000, 0], |
|
960 | 960 | "desc": "new branch", |
|
961 | 961 | "bookmarks": [], |
|
962 | 962 | "tags": [], |
|
963 | 963 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
964 | 964 | }, |
|
965 | 965 | { |
|
966 | 966 | "rev": 3, |
|
967 | 967 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
968 | 968 | "branch": "default", |
|
969 | 969 | "phase": "draft", |
|
970 | 970 | "user": "person", |
|
971 | 971 | "date": [1300000, 0], |
|
972 | 972 | "desc": "no user, no domain", |
|
973 | 973 | "bookmarks": [], |
|
974 | 974 | "tags": [], |
|
975 | 975 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"] |
|
976 | 976 | }, |
|
977 | 977 | { |
|
978 | 978 | "rev": 2, |
|
979 | 979 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
980 | 980 | "branch": "default", |
|
981 | 981 | "phase": "draft", |
|
982 | 982 | "user": "other@place", |
|
983 | 983 | "date": [1200000, 0], |
|
984 | 984 | "desc": "no person", |
|
985 | 985 | "bookmarks": [], |
|
986 | 986 | "tags": [], |
|
987 | 987 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"] |
|
988 | 988 | }, |
|
989 | 989 | { |
|
990 | 990 | "rev": 1, |
|
991 | 991 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
992 | 992 | "branch": "default", |
|
993 | 993 | "phase": "draft", |
|
994 | 994 | "user": "A. N. Other <other@place>", |
|
995 | 995 | "date": [1100000, 0], |
|
996 | 996 | "desc": "other 1\nother 2\n\nother 3", |
|
997 | 997 | "bookmarks": [], |
|
998 | 998 | "tags": [], |
|
999 | 999 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"] |
|
1000 | 1000 | }, |
|
1001 | 1001 | { |
|
1002 | 1002 | "rev": 0, |
|
1003 | 1003 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
1004 | 1004 | "branch": "default", |
|
1005 | 1005 | "phase": "draft", |
|
1006 | 1006 | "user": "User Name <user@hostname>", |
|
1007 | 1007 | "date": [1000000, 0], |
|
1008 | 1008 | "desc": "line 1\nline 2", |
|
1009 | 1009 | "bookmarks": [], |
|
1010 | 1010 | "tags": [], |
|
1011 | 1011 | "parents": ["0000000000000000000000000000000000000000"] |
|
1012 | 1012 | } |
|
1013 | 1013 | ] |
|
1014 | 1014 | |
|
1015 | 1015 | $ hg heads -v -Tjson |
|
1016 | 1016 | [ |
|
1017 | 1017 | { |
|
1018 | 1018 | "rev": 8, |
|
1019 | 1019 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
1020 | 1020 | "branch": "default", |
|
1021 | 1021 | "phase": "draft", |
|
1022 | 1022 | "user": "test", |
|
1023 | 1023 | "date": [1577872860, 0], |
|
1024 | 1024 | "desc": "third", |
|
1025 | 1025 | "bookmarks": [], |
|
1026 | 1026 | "tags": ["tip"], |
|
1027 | 1027 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
1028 | 1028 | "files": ["fourth", "second", "third"] |
|
1029 | 1029 | }, |
|
1030 | 1030 | { |
|
1031 | 1031 | "rev": 6, |
|
1032 | 1032 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
1033 | 1033 | "branch": "default", |
|
1034 | 1034 | "phase": "draft", |
|
1035 | 1035 | "user": "person", |
|
1036 | 1036 | "date": [1500001, 0], |
|
1037 | 1037 | "desc": "merge", |
|
1038 | 1038 | "bookmarks": [], |
|
1039 | 1039 | "tags": [], |
|
1040 | 1040 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
1041 | 1041 | "files": [] |
|
1042 | 1042 | }, |
|
1043 | 1043 | { |
|
1044 | 1044 | "rev": 4, |
|
1045 | 1045 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
1046 | 1046 | "branch": "foo", |
|
1047 | 1047 | "phase": "draft", |
|
1048 | 1048 | "user": "person", |
|
1049 | 1049 | "date": [1400000, 0], |
|
1050 | 1050 | "desc": "new branch", |
|
1051 | 1051 | "bookmarks": [], |
|
1052 | 1052 | "tags": [], |
|
1053 | 1053 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
1054 | 1054 | "files": [] |
|
1055 | 1055 | } |
|
1056 | 1056 | ] |
|
1057 | 1057 | |
|
1058 | 1058 | $ hg log --debug -Tjson |
|
1059 | 1059 | [ |
|
1060 | 1060 | { |
|
1061 | 1061 | "rev": 8, |
|
1062 | 1062 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
1063 | 1063 | "branch": "default", |
|
1064 | 1064 | "phase": "draft", |
|
1065 | 1065 | "user": "test", |
|
1066 | 1066 | "date": [1577872860, 0], |
|
1067 | 1067 | "desc": "third", |
|
1068 | 1068 | "bookmarks": [], |
|
1069 | 1069 | "tags": ["tip"], |
|
1070 | 1070 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
1071 | 1071 | "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64", |
|
1072 | 1072 | "extra": {"branch": "default"}, |
|
1073 | 1073 | "modified": [], |
|
1074 | 1074 | "added": ["fourth", "third"], |
|
1075 | 1075 | "removed": ["second"] |
|
1076 | 1076 | }, |
|
1077 | 1077 | { |
|
1078 | 1078 | "rev": 7, |
|
1079 | 1079 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
1080 | 1080 | "branch": "default", |
|
1081 | 1081 | "phase": "draft", |
|
1082 | 1082 | "user": "User Name <user@hostname>", |
|
1083 | 1083 | "date": [1000000, 0], |
|
1084 | 1084 | "desc": "second", |
|
1085 | 1085 | "bookmarks": [], |
|
1086 | 1086 | "tags": [], |
|
1087 | 1087 | "parents": ["0000000000000000000000000000000000000000"], |
|
1088 | 1088 | "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf", |
|
1089 | 1089 | "extra": {"branch": "default"}, |
|
1090 | 1090 | "modified": [], |
|
1091 | 1091 | "added": ["second"], |
|
1092 | 1092 | "removed": [] |
|
1093 | 1093 | }, |
|
1094 | 1094 | { |
|
1095 | 1095 | "rev": 6, |
|
1096 | 1096 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
1097 | 1097 | "branch": "default", |
|
1098 | 1098 | "phase": "draft", |
|
1099 | 1099 | "user": "person", |
|
1100 | 1100 | "date": [1500001, 0], |
|
1101 | 1101 | "desc": "merge", |
|
1102 | 1102 | "bookmarks": [], |
|
1103 | 1103 | "tags": [], |
|
1104 | 1104 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
1105 | 1105 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
1106 | 1106 | "extra": {"branch": "default"}, |
|
1107 | 1107 | "modified": [], |
|
1108 | 1108 | "added": [], |
|
1109 | 1109 | "removed": [] |
|
1110 | 1110 | }, |
|
1111 | 1111 | { |
|
1112 | 1112 | "rev": 5, |
|
1113 | 1113 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
1114 | 1114 | "branch": "default", |
|
1115 | 1115 | "phase": "draft", |
|
1116 | 1116 | "user": "person", |
|
1117 | 1117 | "date": [1500000, 0], |
|
1118 | 1118 | "desc": "new head", |
|
1119 | 1119 | "bookmarks": [], |
|
1120 | 1120 | "tags": [], |
|
1121 | 1121 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
1122 | 1122 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
1123 | 1123 | "extra": {"branch": "default"}, |
|
1124 | 1124 | "modified": [], |
|
1125 | 1125 | "added": ["d"], |
|
1126 | 1126 | "removed": [] |
|
1127 | 1127 | }, |
|
1128 | 1128 | { |
|
1129 | 1129 | "rev": 4, |
|
1130 | 1130 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
1131 | 1131 | "branch": "foo", |
|
1132 | 1132 | "phase": "draft", |
|
1133 | 1133 | "user": "person", |
|
1134 | 1134 | "date": [1400000, 0], |
|
1135 | 1135 | "desc": "new branch", |
|
1136 | 1136 | "bookmarks": [], |
|
1137 | 1137 | "tags": [], |
|
1138 | 1138 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
1139 | 1139 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
1140 | 1140 | "extra": {"branch": "foo"}, |
|
1141 | 1141 | "modified": [], |
|
1142 | 1142 | "added": [], |
|
1143 | 1143 | "removed": [] |
|
1144 | 1144 | }, |
|
1145 | 1145 | { |
|
1146 | 1146 | "rev": 3, |
|
1147 | 1147 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
1148 | 1148 | "branch": "default", |
|
1149 | 1149 | "phase": "draft", |
|
1150 | 1150 | "user": "person", |
|
1151 | 1151 | "date": [1300000, 0], |
|
1152 | 1152 | "desc": "no user, no domain", |
|
1153 | 1153 | "bookmarks": [], |
|
1154 | 1154 | "tags": [], |
|
1155 | 1155 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"], |
|
1156 | 1156 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
1157 | 1157 | "extra": {"branch": "default"}, |
|
1158 | 1158 | "modified": ["c"], |
|
1159 | 1159 | "added": [], |
|
1160 | 1160 | "removed": [] |
|
1161 | 1161 | }, |
|
1162 | 1162 | { |
|
1163 | 1163 | "rev": 2, |
|
1164 | 1164 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
1165 | 1165 | "branch": "default", |
|
1166 | 1166 | "phase": "draft", |
|
1167 | 1167 | "user": "other@place", |
|
1168 | 1168 | "date": [1200000, 0], |
|
1169 | 1169 | "desc": "no person", |
|
1170 | 1170 | "bookmarks": [], |
|
1171 | 1171 | "tags": [], |
|
1172 | 1172 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"], |
|
1173 | 1173 | "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1", |
|
1174 | 1174 | "extra": {"branch": "default"}, |
|
1175 | 1175 | "modified": [], |
|
1176 | 1176 | "added": ["c"], |
|
1177 | 1177 | "removed": [] |
|
1178 | 1178 | }, |
|
1179 | 1179 | { |
|
1180 | 1180 | "rev": 1, |
|
1181 | 1181 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
1182 | 1182 | "branch": "default", |
|
1183 | 1183 | "phase": "draft", |
|
1184 | 1184 | "user": "A. N. Other <other@place>", |
|
1185 | 1185 | "date": [1100000, 0], |
|
1186 | 1186 | "desc": "other 1\nother 2\n\nother 3", |
|
1187 | 1187 | "bookmarks": [], |
|
1188 | 1188 | "tags": [], |
|
1189 | 1189 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"], |
|
1190 | 1190 | "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55", |
|
1191 | 1191 | "extra": {"branch": "default"}, |
|
1192 | 1192 | "modified": [], |
|
1193 | 1193 | "added": ["b"], |
|
1194 | 1194 | "removed": [] |
|
1195 | 1195 | }, |
|
1196 | 1196 | { |
|
1197 | 1197 | "rev": 0, |
|
1198 | 1198 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
1199 | 1199 | "branch": "default", |
|
1200 | 1200 | "phase": "draft", |
|
1201 | 1201 | "user": "User Name <user@hostname>", |
|
1202 | 1202 | "date": [1000000, 0], |
|
1203 | 1203 | "desc": "line 1\nline 2", |
|
1204 | 1204 | "bookmarks": [], |
|
1205 | 1205 | "tags": [], |
|
1206 | 1206 | "parents": ["0000000000000000000000000000000000000000"], |
|
1207 | 1207 | "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0", |
|
1208 | 1208 | "extra": {"branch": "default"}, |
|
1209 | 1209 | "modified": [], |
|
1210 | 1210 | "added": ["a"], |
|
1211 | 1211 | "removed": [] |
|
1212 | 1212 | } |
|
1213 | 1213 | ] |
|
1214 | 1214 | |
|
1215 | 1215 | Error if style not readable: |
|
1216 | 1216 | |
|
1217 | 1217 | #if unix-permissions no-root |
|
1218 | 1218 | $ touch q |
|
1219 | 1219 | $ chmod 0 q |
|
1220 | 1220 | $ hg log --style ./q |
|
1221 | 1221 | abort: Permission denied: ./q |
|
1222 | 1222 | [255] |
|
1223 | 1223 | #endif |
|
1224 | 1224 | |
|
1225 | 1225 | Error if no style: |
|
1226 | 1226 | |
|
1227 | 1227 | $ hg log --style notexist |
|
1228 | 1228 | abort: style 'notexist' not found |
|
1229 | 1229 | (available styles: bisect, changelog, compact, default, phases, show, status, xml) |
|
1230 | 1230 | [255] |
|
1231 | 1231 | |
|
1232 | 1232 | $ hg log -T list |
|
1233 | 1233 | available styles: bisect, changelog, compact, default, phases, show, status, xml |
|
1234 | 1234 | abort: specify a template |
|
1235 | 1235 | [255] |
|
1236 | 1236 | |
|
1237 | 1237 | Error if style missing key: |
|
1238 | 1238 | |
|
1239 | 1239 | $ echo 'q = q' > t |
|
1240 | 1240 | $ hg log --style ./t |
|
1241 | 1241 | abort: "changeset" not in template map |
|
1242 | 1242 | [255] |
|
1243 | 1243 | |
|
1244 | 1244 | Error if style missing value: |
|
1245 | 1245 | |
|
1246 | 1246 | $ echo 'changeset =' > t |
|
1247 | 1247 | $ hg log --style t |
|
1248 | 1248 | hg: parse error at t:1: missing value |
|
1249 | 1249 | [255] |
|
1250 | 1250 | |
|
1251 | 1251 | Error if include fails: |
|
1252 | 1252 | |
|
1253 | 1253 | $ echo 'changeset = q' >> t |
|
1254 | 1254 | #if unix-permissions no-root |
|
1255 | 1255 | $ hg log --style ./t |
|
1256 | 1256 | abort: template file ./q: Permission denied |
|
1257 | 1257 | [255] |
|
1258 | 1258 | $ rm -f q |
|
1259 | 1259 | #endif |
|
1260 | 1260 | |
|
1261 | 1261 | Include works: |
|
1262 | 1262 | |
|
1263 | 1263 | $ echo '{rev}' > q |
|
1264 | 1264 | $ hg log --style ./t |
|
1265 | 1265 | 8 |
|
1266 | 1266 | 7 |
|
1267 | 1267 | 6 |
|
1268 | 1268 | 5 |
|
1269 | 1269 | 4 |
|
1270 | 1270 | 3 |
|
1271 | 1271 | 2 |
|
1272 | 1272 | 1 |
|
1273 | 1273 | 0 |
|
1274 | 1274 | |
|
1275 | 1275 | Check that recursive reference does not fall into RuntimeError (issue4758): |
|
1276 | 1276 | |
|
1277 | 1277 | common mistake: |
|
1278 | 1278 | |
|
1279 | 1279 | $ cat << EOF > issue4758 |
|
1280 | 1280 | > changeset = '{changeset}\n' |
|
1281 | 1281 | > EOF |
|
1282 | 1282 | $ hg log --style ./issue4758 |
|
1283 | 1283 | abort: recursive reference 'changeset' in template |
|
1284 | 1284 | [255] |
|
1285 | 1285 | |
|
1286 | 1286 | circular reference: |
|
1287 | 1287 | |
|
1288 | 1288 | $ cat << EOF > issue4758 |
|
1289 | 1289 | > changeset = '{foo}' |
|
1290 | 1290 | > foo = '{changeset}' |
|
1291 | 1291 | > EOF |
|
1292 | 1292 | $ hg log --style ./issue4758 |
|
1293 | 1293 | abort: recursive reference 'foo' in template |
|
1294 | 1294 | [255] |
|
1295 | 1295 | |
|
1296 | 1296 | buildmap() -> gettemplate(), where no thunk was made: |
|
1297 | 1297 | |
|
1298 | 1298 | $ cat << EOF > issue4758 |
|
1299 | 1299 | > changeset = '{files % changeset}\n' |
|
1300 | 1300 | > EOF |
|
1301 | 1301 | $ hg log --style ./issue4758 |
|
1302 | 1302 | abort: recursive reference 'changeset' in template |
|
1303 | 1303 | [255] |
|
1304 | 1304 | |
|
1305 | 1305 | not a recursion if a keyword of the same name exists: |
|
1306 | 1306 | |
|
1307 | 1307 | $ cat << EOF > issue4758 |
|
1308 | 1308 | > changeset = '{tags % rev}' |
|
1309 | 1309 | > rev = '{rev} {tag}\n' |
|
1310 | 1310 | > EOF |
|
1311 | 1311 | $ hg log --style ./issue4758 -r tip |
|
1312 | 1312 | 8 tip |
|
1313 | 1313 | |
|
1314 | 1314 | Check that {phase} works correctly on parents: |
|
1315 | 1315 | |
|
1316 | 1316 | $ cat << EOF > parentphase |
|
1317 | 1317 | > changeset_debug = '{rev} ({phase}):{parents}\n' |
|
1318 | 1318 | > parent = ' {rev} ({phase})' |
|
1319 | 1319 | > EOF |
|
1320 | 1320 | $ hg phase -r 5 --public |
|
1321 | 1321 | $ hg phase -r 7 --secret --force |
|
1322 | 1322 | $ hg log --debug -G --style ./parentphase |
|
1323 | 1323 | @ 8 (secret): 7 (secret) -1 (public) |
|
1324 | 1324 | | |
|
1325 | 1325 | o 7 (secret): -1 (public) -1 (public) |
|
1326 | 1326 | |
|
1327 | 1327 | o 6 (draft): 5 (public) 4 (draft) |
|
1328 | 1328 | |\ |
|
1329 | 1329 | | o 5 (public): 3 (public) -1 (public) |
|
1330 | 1330 | | | |
|
1331 | 1331 | o | 4 (draft): 3 (public) -1 (public) |
|
1332 | 1332 | |/ |
|
1333 | 1333 | o 3 (public): 2 (public) -1 (public) |
|
1334 | 1334 | | |
|
1335 | 1335 | o 2 (public): 1 (public) -1 (public) |
|
1336 | 1336 | | |
|
1337 | 1337 | o 1 (public): 0 (public) -1 (public) |
|
1338 | 1338 | | |
|
1339 | 1339 | o 0 (public): -1 (public) -1 (public) |
|
1340 | 1340 | |
|
1341 | 1341 | |
|
1342 | 1342 | Missing non-standard names give no error (backward compatibility): |
|
1343 | 1343 | |
|
1344 | 1344 | $ echo "changeset = '{c}'" > t |
|
1345 | 1345 | $ hg log --style ./t |
|
1346 | 1346 | |
|
1347 | 1347 | Defining non-standard name works: |
|
1348 | 1348 | |
|
1349 | 1349 | $ cat <<EOF > t |
|
1350 | 1350 | > changeset = '{c}' |
|
1351 | 1351 | > c = q |
|
1352 | 1352 | > EOF |
|
1353 | 1353 | $ hg log --style ./t |
|
1354 | 1354 | 8 |
|
1355 | 1355 | 7 |
|
1356 | 1356 | 6 |
|
1357 | 1357 | 5 |
|
1358 | 1358 | 4 |
|
1359 | 1359 | 3 |
|
1360 | 1360 | 2 |
|
1361 | 1361 | 1 |
|
1362 | 1362 | 0 |
|
1363 | 1363 | |
|
1364 | 1364 | ui.style works: |
|
1365 | 1365 | |
|
1366 | 1366 | $ echo '[ui]' > .hg/hgrc |
|
1367 | 1367 | $ echo 'style = t' >> .hg/hgrc |
|
1368 | 1368 | $ hg log |
|
1369 | 1369 | 8 |
|
1370 | 1370 | 7 |
|
1371 | 1371 | 6 |
|
1372 | 1372 | 5 |
|
1373 | 1373 | 4 |
|
1374 | 1374 | 3 |
|
1375 | 1375 | 2 |
|
1376 | 1376 | 1 |
|
1377 | 1377 | 0 |
|
1378 | 1378 | |
|
1379 | 1379 | |
|
1380 | 1380 | Issue338: |
|
1381 | 1381 | |
|
1382 | 1382 | $ hg log --style=changelog > changelog |
|
1383 | 1383 | |
|
1384 | 1384 | $ cat changelog |
|
1385 | 1385 | 2020-01-01 test <test> |
|
1386 | 1386 | |
|
1387 | 1387 | * fourth, second, third: |
|
1388 | 1388 | third |
|
1389 | 1389 | [95c24699272e] [tip] |
|
1390 | 1390 | |
|
1391 | 1391 | 1970-01-12 User Name <user@hostname> |
|
1392 | 1392 | |
|
1393 | 1393 | * second: |
|
1394 | 1394 | second |
|
1395 | 1395 | [29114dbae42b] |
|
1396 | 1396 | |
|
1397 | 1397 | 1970-01-18 person <person> |
|
1398 | 1398 | |
|
1399 | 1399 | * merge |
|
1400 | 1400 | [d41e714fe50d] |
|
1401 | 1401 | |
|
1402 | 1402 | * d: |
|
1403 | 1403 | new head |
|
1404 | 1404 | [13207e5a10d9] |
|
1405 | 1405 | |
|
1406 | 1406 | 1970-01-17 person <person> |
|
1407 | 1407 | |
|
1408 | 1408 | * new branch |
|
1409 | 1409 | [bbe44766e73d] <foo> |
|
1410 | 1410 | |
|
1411 | 1411 | 1970-01-16 person <person> |
|
1412 | 1412 | |
|
1413 | 1413 | * c: |
|
1414 | 1414 | no user, no domain |
|
1415 | 1415 | [10e46f2dcbf4] |
|
1416 | 1416 | |
|
1417 | 1417 | 1970-01-14 other <other@place> |
|
1418 | 1418 | |
|
1419 | 1419 | * c: |
|
1420 | 1420 | no person |
|
1421 | 1421 | [97054abb4ab8] |
|
1422 | 1422 | |
|
1423 | 1423 | 1970-01-13 A. N. Other <other@place> |
|
1424 | 1424 | |
|
1425 | 1425 | * b: |
|
1426 | 1426 | other 1 other 2 |
|
1427 | 1427 | |
|
1428 | 1428 | other 3 |
|
1429 | 1429 | [b608e9d1a3f0] |
|
1430 | 1430 | |
|
1431 | 1431 | 1970-01-12 User Name <user@hostname> |
|
1432 | 1432 | |
|
1433 | 1433 | * a: |
|
1434 | 1434 | line 1 line 2 |
|
1435 | 1435 | [1e4e1b8f71e0] |
|
1436 | 1436 | |
|
1437 | 1437 | |
|
1438 | 1438 | Issue2130: xml output for 'hg heads' is malformed |
|
1439 | 1439 | |
|
1440 | 1440 | $ hg heads --style changelog |
|
1441 | 1441 | 2020-01-01 test <test> |
|
1442 | 1442 | |
|
1443 | 1443 | * fourth, second, third: |
|
1444 | 1444 | third |
|
1445 | 1445 | [95c24699272e] [tip] |
|
1446 | 1446 | |
|
1447 | 1447 | 1970-01-18 person <person> |
|
1448 | 1448 | |
|
1449 | 1449 | * merge |
|
1450 | 1450 | [d41e714fe50d] |
|
1451 | 1451 | |
|
1452 | 1452 | 1970-01-17 person <person> |
|
1453 | 1453 | |
|
1454 | 1454 | * new branch |
|
1455 | 1455 | [bbe44766e73d] <foo> |
|
1456 | 1456 | |
|
1457 | 1457 | |
|
1458 | 1458 | Keys work: |
|
1459 | 1459 | |
|
1460 | 1460 | $ for key in author branch branches date desc file_adds file_dels file_mods \ |
|
1461 | 1461 | > file_copies file_copies_switch files \ |
|
1462 | 1462 | > manifest node parents rev tags diffstat extras \ |
|
1463 | 1463 | > p1rev p2rev p1node p2node; do |
|
1464 | 1464 | > for mode in '' --verbose --debug; do |
|
1465 | 1465 | > hg log $mode --template "$key$mode: {$key}\n" |
|
1466 | 1466 | > done |
|
1467 | 1467 | > done |
|
1468 | 1468 | author: test |
|
1469 | 1469 | author: User Name <user@hostname> |
|
1470 | 1470 | author: person |
|
1471 | 1471 | author: person |
|
1472 | 1472 | author: person |
|
1473 | 1473 | author: person |
|
1474 | 1474 | author: other@place |
|
1475 | 1475 | author: A. N. Other <other@place> |
|
1476 | 1476 | author: User Name <user@hostname> |
|
1477 | 1477 | author--verbose: test |
|
1478 | 1478 | author--verbose: User Name <user@hostname> |
|
1479 | 1479 | author--verbose: person |
|
1480 | 1480 | author--verbose: person |
|
1481 | 1481 | author--verbose: person |
|
1482 | 1482 | author--verbose: person |
|
1483 | 1483 | author--verbose: other@place |
|
1484 | 1484 | author--verbose: A. N. Other <other@place> |
|
1485 | 1485 | author--verbose: User Name <user@hostname> |
|
1486 | 1486 | author--debug: test |
|
1487 | 1487 | author--debug: User Name <user@hostname> |
|
1488 | 1488 | author--debug: person |
|
1489 | 1489 | author--debug: person |
|
1490 | 1490 | author--debug: person |
|
1491 | 1491 | author--debug: person |
|
1492 | 1492 | author--debug: other@place |
|
1493 | 1493 | author--debug: A. N. Other <other@place> |
|
1494 | 1494 | author--debug: User Name <user@hostname> |
|
1495 | 1495 | branch: default |
|
1496 | 1496 | branch: default |
|
1497 | 1497 | branch: default |
|
1498 | 1498 | branch: default |
|
1499 | 1499 | branch: foo |
|
1500 | 1500 | branch: default |
|
1501 | 1501 | branch: default |
|
1502 | 1502 | branch: default |
|
1503 | 1503 | branch: default |
|
1504 | 1504 | branch--verbose: default |
|
1505 | 1505 | branch--verbose: default |
|
1506 | 1506 | branch--verbose: default |
|
1507 | 1507 | branch--verbose: default |
|
1508 | 1508 | branch--verbose: foo |
|
1509 | 1509 | branch--verbose: default |
|
1510 | 1510 | branch--verbose: default |
|
1511 | 1511 | branch--verbose: default |
|
1512 | 1512 | branch--verbose: default |
|
1513 | 1513 | branch--debug: default |
|
1514 | 1514 | branch--debug: default |
|
1515 | 1515 | branch--debug: default |
|
1516 | 1516 | branch--debug: default |
|
1517 | 1517 | branch--debug: foo |
|
1518 | 1518 | branch--debug: default |
|
1519 | 1519 | branch--debug: default |
|
1520 | 1520 | branch--debug: default |
|
1521 | 1521 | branch--debug: default |
|
1522 | 1522 | branches: |
|
1523 | 1523 | branches: |
|
1524 | 1524 | branches: |
|
1525 | 1525 | branches: |
|
1526 | 1526 | branches: foo |
|
1527 | 1527 | branches: |
|
1528 | 1528 | branches: |
|
1529 | 1529 | branches: |
|
1530 | 1530 | branches: |
|
1531 | 1531 | branches--verbose: |
|
1532 | 1532 | branches--verbose: |
|
1533 | 1533 | branches--verbose: |
|
1534 | 1534 | branches--verbose: |
|
1535 | 1535 | branches--verbose: foo |
|
1536 | 1536 | branches--verbose: |
|
1537 | 1537 | branches--verbose: |
|
1538 | 1538 | branches--verbose: |
|
1539 | 1539 | branches--verbose: |
|
1540 | 1540 | branches--debug: |
|
1541 | 1541 | branches--debug: |
|
1542 | 1542 | branches--debug: |
|
1543 | 1543 | branches--debug: |
|
1544 | 1544 | branches--debug: foo |
|
1545 | 1545 | branches--debug: |
|
1546 | 1546 | branches--debug: |
|
1547 | 1547 | branches--debug: |
|
1548 | 1548 | branches--debug: |
|
1549 | 1549 | date: 1577872860.00 |
|
1550 | 1550 | date: 1000000.00 |
|
1551 | 1551 | date: 1500001.00 |
|
1552 | 1552 | date: 1500000.00 |
|
1553 | 1553 | date: 1400000.00 |
|
1554 | 1554 | date: 1300000.00 |
|
1555 | 1555 | date: 1200000.00 |
|
1556 | 1556 | date: 1100000.00 |
|
1557 | 1557 | date: 1000000.00 |
|
1558 | 1558 | date--verbose: 1577872860.00 |
|
1559 | 1559 | date--verbose: 1000000.00 |
|
1560 | 1560 | date--verbose: 1500001.00 |
|
1561 | 1561 | date--verbose: 1500000.00 |
|
1562 | 1562 | date--verbose: 1400000.00 |
|
1563 | 1563 | date--verbose: 1300000.00 |
|
1564 | 1564 | date--verbose: 1200000.00 |
|
1565 | 1565 | date--verbose: 1100000.00 |
|
1566 | 1566 | date--verbose: 1000000.00 |
|
1567 | 1567 | date--debug: 1577872860.00 |
|
1568 | 1568 | date--debug: 1000000.00 |
|
1569 | 1569 | date--debug: 1500001.00 |
|
1570 | 1570 | date--debug: 1500000.00 |
|
1571 | 1571 | date--debug: 1400000.00 |
|
1572 | 1572 | date--debug: 1300000.00 |
|
1573 | 1573 | date--debug: 1200000.00 |
|
1574 | 1574 | date--debug: 1100000.00 |
|
1575 | 1575 | date--debug: 1000000.00 |
|
1576 | 1576 | desc: third |
|
1577 | 1577 | desc: second |
|
1578 | 1578 | desc: merge |
|
1579 | 1579 | desc: new head |
|
1580 | 1580 | desc: new branch |
|
1581 | 1581 | desc: no user, no domain |
|
1582 | 1582 | desc: no person |
|
1583 | 1583 | desc: other 1 |
|
1584 | 1584 | other 2 |
|
1585 | 1585 | |
|
1586 | 1586 | other 3 |
|
1587 | 1587 | desc: line 1 |
|
1588 | 1588 | line 2 |
|
1589 | 1589 | desc--verbose: third |
|
1590 | 1590 | desc--verbose: second |
|
1591 | 1591 | desc--verbose: merge |
|
1592 | 1592 | desc--verbose: new head |
|
1593 | 1593 | desc--verbose: new branch |
|
1594 | 1594 | desc--verbose: no user, no domain |
|
1595 | 1595 | desc--verbose: no person |
|
1596 | 1596 | desc--verbose: other 1 |
|
1597 | 1597 | other 2 |
|
1598 | 1598 | |
|
1599 | 1599 | other 3 |
|
1600 | 1600 | desc--verbose: line 1 |
|
1601 | 1601 | line 2 |
|
1602 | 1602 | desc--debug: third |
|
1603 | 1603 | desc--debug: second |
|
1604 | 1604 | desc--debug: merge |
|
1605 | 1605 | desc--debug: new head |
|
1606 | 1606 | desc--debug: new branch |
|
1607 | 1607 | desc--debug: no user, no domain |
|
1608 | 1608 | desc--debug: no person |
|
1609 | 1609 | desc--debug: other 1 |
|
1610 | 1610 | other 2 |
|
1611 | 1611 | |
|
1612 | 1612 | other 3 |
|
1613 | 1613 | desc--debug: line 1 |
|
1614 | 1614 | line 2 |
|
1615 | 1615 | file_adds: fourth third |
|
1616 | 1616 | file_adds: second |
|
1617 | 1617 | file_adds: |
|
1618 | 1618 | file_adds: d |
|
1619 | 1619 | file_adds: |
|
1620 | 1620 | file_adds: |
|
1621 | 1621 | file_adds: c |
|
1622 | 1622 | file_adds: b |
|
1623 | 1623 | file_adds: a |
|
1624 | 1624 | file_adds--verbose: fourth third |
|
1625 | 1625 | file_adds--verbose: second |
|
1626 | 1626 | file_adds--verbose: |
|
1627 | 1627 | file_adds--verbose: d |
|
1628 | 1628 | file_adds--verbose: |
|
1629 | 1629 | file_adds--verbose: |
|
1630 | 1630 | file_adds--verbose: c |
|
1631 | 1631 | file_adds--verbose: b |
|
1632 | 1632 | file_adds--verbose: a |
|
1633 | 1633 | file_adds--debug: fourth third |
|
1634 | 1634 | file_adds--debug: second |
|
1635 | 1635 | file_adds--debug: |
|
1636 | 1636 | file_adds--debug: d |
|
1637 | 1637 | file_adds--debug: |
|
1638 | 1638 | file_adds--debug: |
|
1639 | 1639 | file_adds--debug: c |
|
1640 | 1640 | file_adds--debug: b |
|
1641 | 1641 | file_adds--debug: a |
|
1642 | 1642 | file_dels: second |
|
1643 | 1643 | file_dels: |
|
1644 | 1644 | file_dels: |
|
1645 | 1645 | file_dels: |
|
1646 | 1646 | file_dels: |
|
1647 | 1647 | file_dels: |
|
1648 | 1648 | file_dels: |
|
1649 | 1649 | file_dels: |
|
1650 | 1650 | file_dels: |
|
1651 | 1651 | file_dels--verbose: second |
|
1652 | 1652 | file_dels--verbose: |
|
1653 | 1653 | file_dels--verbose: |
|
1654 | 1654 | file_dels--verbose: |
|
1655 | 1655 | file_dels--verbose: |
|
1656 | 1656 | file_dels--verbose: |
|
1657 | 1657 | file_dels--verbose: |
|
1658 | 1658 | file_dels--verbose: |
|
1659 | 1659 | file_dels--verbose: |
|
1660 | 1660 | file_dels--debug: second |
|
1661 | 1661 | file_dels--debug: |
|
1662 | 1662 | file_dels--debug: |
|
1663 | 1663 | file_dels--debug: |
|
1664 | 1664 | file_dels--debug: |
|
1665 | 1665 | file_dels--debug: |
|
1666 | 1666 | file_dels--debug: |
|
1667 | 1667 | file_dels--debug: |
|
1668 | 1668 | file_dels--debug: |
|
1669 | 1669 | file_mods: |
|
1670 | 1670 | file_mods: |
|
1671 | 1671 | file_mods: |
|
1672 | 1672 | file_mods: |
|
1673 | 1673 | file_mods: |
|
1674 | 1674 | file_mods: c |
|
1675 | 1675 | file_mods: |
|
1676 | 1676 | file_mods: |
|
1677 | 1677 | file_mods: |
|
1678 | 1678 | file_mods--verbose: |
|
1679 | 1679 | file_mods--verbose: |
|
1680 | 1680 | file_mods--verbose: |
|
1681 | 1681 | file_mods--verbose: |
|
1682 | 1682 | file_mods--verbose: |
|
1683 | 1683 | file_mods--verbose: c |
|
1684 | 1684 | file_mods--verbose: |
|
1685 | 1685 | file_mods--verbose: |
|
1686 | 1686 | file_mods--verbose: |
|
1687 | 1687 | file_mods--debug: |
|
1688 | 1688 | file_mods--debug: |
|
1689 | 1689 | file_mods--debug: |
|
1690 | 1690 | file_mods--debug: |
|
1691 | 1691 | file_mods--debug: |
|
1692 | 1692 | file_mods--debug: c |
|
1693 | 1693 | file_mods--debug: |
|
1694 | 1694 | file_mods--debug: |
|
1695 | 1695 | file_mods--debug: |
|
1696 | 1696 | file_copies: fourth (second) |
|
1697 | 1697 | file_copies: |
|
1698 | 1698 | file_copies: |
|
1699 | 1699 | file_copies: |
|
1700 | 1700 | file_copies: |
|
1701 | 1701 | file_copies: |
|
1702 | 1702 | file_copies: |
|
1703 | 1703 | file_copies: |
|
1704 | 1704 | file_copies: |
|
1705 | 1705 | file_copies--verbose: fourth (second) |
|
1706 | 1706 | file_copies--verbose: |
|
1707 | 1707 | file_copies--verbose: |
|
1708 | 1708 | file_copies--verbose: |
|
1709 | 1709 | file_copies--verbose: |
|
1710 | 1710 | file_copies--verbose: |
|
1711 | 1711 | file_copies--verbose: |
|
1712 | 1712 | file_copies--verbose: |
|
1713 | 1713 | file_copies--verbose: |
|
1714 | 1714 | file_copies--debug: fourth (second) |
|
1715 | 1715 | file_copies--debug: |
|
1716 | 1716 | file_copies--debug: |
|
1717 | 1717 | file_copies--debug: |
|
1718 | 1718 | file_copies--debug: |
|
1719 | 1719 | file_copies--debug: |
|
1720 | 1720 | file_copies--debug: |
|
1721 | 1721 | file_copies--debug: |
|
1722 | 1722 | file_copies--debug: |
|
1723 | 1723 | file_copies_switch: |
|
1724 | 1724 | file_copies_switch: |
|
1725 | 1725 | file_copies_switch: |
|
1726 | 1726 | file_copies_switch: |
|
1727 | 1727 | file_copies_switch: |
|
1728 | 1728 | file_copies_switch: |
|
1729 | 1729 | file_copies_switch: |
|
1730 | 1730 | file_copies_switch: |
|
1731 | 1731 | file_copies_switch: |
|
1732 | 1732 | file_copies_switch--verbose: |
|
1733 | 1733 | file_copies_switch--verbose: |
|
1734 | 1734 | file_copies_switch--verbose: |
|
1735 | 1735 | file_copies_switch--verbose: |
|
1736 | 1736 | file_copies_switch--verbose: |
|
1737 | 1737 | file_copies_switch--verbose: |
|
1738 | 1738 | file_copies_switch--verbose: |
|
1739 | 1739 | file_copies_switch--verbose: |
|
1740 | 1740 | file_copies_switch--verbose: |
|
1741 | 1741 | file_copies_switch--debug: |
|
1742 | 1742 | file_copies_switch--debug: |
|
1743 | 1743 | file_copies_switch--debug: |
|
1744 | 1744 | file_copies_switch--debug: |
|
1745 | 1745 | file_copies_switch--debug: |
|
1746 | 1746 | file_copies_switch--debug: |
|
1747 | 1747 | file_copies_switch--debug: |
|
1748 | 1748 | file_copies_switch--debug: |
|
1749 | 1749 | file_copies_switch--debug: |
|
1750 | 1750 | files: fourth second third |
|
1751 | 1751 | files: second |
|
1752 | 1752 | files: |
|
1753 | 1753 | files: d |
|
1754 | 1754 | files: |
|
1755 | 1755 | files: c |
|
1756 | 1756 | files: c |
|
1757 | 1757 | files: b |
|
1758 | 1758 | files: a |
|
1759 | 1759 | files--verbose: fourth second third |
|
1760 | 1760 | files--verbose: second |
|
1761 | 1761 | files--verbose: |
|
1762 | 1762 | files--verbose: d |
|
1763 | 1763 | files--verbose: |
|
1764 | 1764 | files--verbose: c |
|
1765 | 1765 | files--verbose: c |
|
1766 | 1766 | files--verbose: b |
|
1767 | 1767 | files--verbose: a |
|
1768 | 1768 | files--debug: fourth second third |
|
1769 | 1769 | files--debug: second |
|
1770 | 1770 | files--debug: |
|
1771 | 1771 | files--debug: d |
|
1772 | 1772 | files--debug: |
|
1773 | 1773 | files--debug: c |
|
1774 | 1774 | files--debug: c |
|
1775 | 1775 | files--debug: b |
|
1776 | 1776 | files--debug: a |
|
1777 | 1777 | manifest: 6:94961b75a2da |
|
1778 | 1778 | manifest: 5:f2dbc354b94e |
|
1779 | 1779 | manifest: 4:4dc3def4f9b4 |
|
1780 | 1780 | manifest: 4:4dc3def4f9b4 |
|
1781 | 1781 | manifest: 3:cb5a1327723b |
|
1782 | 1782 | manifest: 3:cb5a1327723b |
|
1783 | 1783 | manifest: 2:6e0e82995c35 |
|
1784 | 1784 | manifest: 1:4e8d705b1e53 |
|
1785 | 1785 | manifest: 0:a0c8bcbbb45c |
|
1786 | 1786 | manifest--verbose: 6:94961b75a2da |
|
1787 | 1787 | manifest--verbose: 5:f2dbc354b94e |
|
1788 | 1788 | manifest--verbose: 4:4dc3def4f9b4 |
|
1789 | 1789 | manifest--verbose: 4:4dc3def4f9b4 |
|
1790 | 1790 | manifest--verbose: 3:cb5a1327723b |
|
1791 | 1791 | manifest--verbose: 3:cb5a1327723b |
|
1792 | 1792 | manifest--verbose: 2:6e0e82995c35 |
|
1793 | 1793 | manifest--verbose: 1:4e8d705b1e53 |
|
1794 | 1794 | manifest--verbose: 0:a0c8bcbbb45c |
|
1795 | 1795 | manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64 |
|
1796 | 1796 | manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf |
|
1797 | 1797 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1798 | 1798 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1799 | 1799 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1800 | 1800 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1801 | 1801 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
1802 | 1802 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
1803 | 1803 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
1804 | 1804 | node: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1805 | 1805 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1806 | 1806 | node: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1807 | 1807 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1808 | 1808 | node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1809 | 1809 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1810 | 1810 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
1811 | 1811 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1812 | 1812 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1813 | 1813 | node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1814 | 1814 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1815 | 1815 | node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1816 | 1816 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1817 | 1817 | node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1818 | 1818 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1819 | 1819 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
1820 | 1820 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1821 | 1821 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1822 | 1822 | node--debug: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1823 | 1823 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1824 | 1824 | node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1825 | 1825 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1826 | 1826 | node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1827 | 1827 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1828 | 1828 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
1829 | 1829 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1830 | 1830 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1831 | 1831 | parents: |
|
1832 | 1832 | parents: -1:000000000000 |
|
1833 | 1833 | parents: 5:13207e5a10d9 4:bbe44766e73d |
|
1834 | 1834 | parents: 3:10e46f2dcbf4 |
|
1835 | 1835 | parents: |
|
1836 | 1836 | parents: |
|
1837 | 1837 | parents: |
|
1838 | 1838 | parents: |
|
1839 | 1839 | parents: |
|
1840 | 1840 | parents--verbose: |
|
1841 | 1841 | parents--verbose: -1:000000000000 |
|
1842 | 1842 | parents--verbose: 5:13207e5a10d9 4:bbe44766e73d |
|
1843 | 1843 | parents--verbose: 3:10e46f2dcbf4 |
|
1844 | 1844 | parents--verbose: |
|
1845 | 1845 | parents--verbose: |
|
1846 | 1846 | parents--verbose: |
|
1847 | 1847 | parents--verbose: |
|
1848 | 1848 | parents--verbose: |
|
1849 | 1849 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 |
|
1850 | 1850 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1851 | 1851 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1852 | 1852 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1853 | 1853 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1854 | 1854 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 |
|
1855 | 1855 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
1856 | 1856 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
1857 | 1857 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1858 | 1858 | rev: 8 |
|
1859 | 1859 | rev: 7 |
|
1860 | 1860 | rev: 6 |
|
1861 | 1861 | rev: 5 |
|
1862 | 1862 | rev: 4 |
|
1863 | 1863 | rev: 3 |
|
1864 | 1864 | rev: 2 |
|
1865 | 1865 | rev: 1 |
|
1866 | 1866 | rev: 0 |
|
1867 | 1867 | rev--verbose: 8 |
|
1868 | 1868 | rev--verbose: 7 |
|
1869 | 1869 | rev--verbose: 6 |
|
1870 | 1870 | rev--verbose: 5 |
|
1871 | 1871 | rev--verbose: 4 |
|
1872 | 1872 | rev--verbose: 3 |
|
1873 | 1873 | rev--verbose: 2 |
|
1874 | 1874 | rev--verbose: 1 |
|
1875 | 1875 | rev--verbose: 0 |
|
1876 | 1876 | rev--debug: 8 |
|
1877 | 1877 | rev--debug: 7 |
|
1878 | 1878 | rev--debug: 6 |
|
1879 | 1879 | rev--debug: 5 |
|
1880 | 1880 | rev--debug: 4 |
|
1881 | 1881 | rev--debug: 3 |
|
1882 | 1882 | rev--debug: 2 |
|
1883 | 1883 | rev--debug: 1 |
|
1884 | 1884 | rev--debug: 0 |
|
1885 | 1885 | tags: tip |
|
1886 | 1886 | tags: |
|
1887 | 1887 | tags: |
|
1888 | 1888 | tags: |
|
1889 | 1889 | tags: |
|
1890 | 1890 | tags: |
|
1891 | 1891 | tags: |
|
1892 | 1892 | tags: |
|
1893 | 1893 | tags: |
|
1894 | 1894 | tags--verbose: tip |
|
1895 | 1895 | tags--verbose: |
|
1896 | 1896 | tags--verbose: |
|
1897 | 1897 | tags--verbose: |
|
1898 | 1898 | tags--verbose: |
|
1899 | 1899 | tags--verbose: |
|
1900 | 1900 | tags--verbose: |
|
1901 | 1901 | tags--verbose: |
|
1902 | 1902 | tags--verbose: |
|
1903 | 1903 | tags--debug: tip |
|
1904 | 1904 | tags--debug: |
|
1905 | 1905 | tags--debug: |
|
1906 | 1906 | tags--debug: |
|
1907 | 1907 | tags--debug: |
|
1908 | 1908 | tags--debug: |
|
1909 | 1909 | tags--debug: |
|
1910 | 1910 | tags--debug: |
|
1911 | 1911 | tags--debug: |
|
1912 | 1912 | diffstat: 3: +2/-1 |
|
1913 | 1913 | diffstat: 1: +1/-0 |
|
1914 | 1914 | diffstat: 0: +0/-0 |
|
1915 | 1915 | diffstat: 1: +1/-0 |
|
1916 | 1916 | diffstat: 0: +0/-0 |
|
1917 | 1917 | diffstat: 1: +1/-0 |
|
1918 | 1918 | diffstat: 1: +4/-0 |
|
1919 | 1919 | diffstat: 1: +2/-0 |
|
1920 | 1920 | diffstat: 1: +1/-0 |
|
1921 | 1921 | diffstat--verbose: 3: +2/-1 |
|
1922 | 1922 | diffstat--verbose: 1: +1/-0 |
|
1923 | 1923 | diffstat--verbose: 0: +0/-0 |
|
1924 | 1924 | diffstat--verbose: 1: +1/-0 |
|
1925 | 1925 | diffstat--verbose: 0: +0/-0 |
|
1926 | 1926 | diffstat--verbose: 1: +1/-0 |
|
1927 | 1927 | diffstat--verbose: 1: +4/-0 |
|
1928 | 1928 | diffstat--verbose: 1: +2/-0 |
|
1929 | 1929 | diffstat--verbose: 1: +1/-0 |
|
1930 | 1930 | diffstat--debug: 3: +2/-1 |
|
1931 | 1931 | diffstat--debug: 1: +1/-0 |
|
1932 | 1932 | diffstat--debug: 0: +0/-0 |
|
1933 | 1933 | diffstat--debug: 1: +1/-0 |
|
1934 | 1934 | diffstat--debug: 0: +0/-0 |
|
1935 | 1935 | diffstat--debug: 1: +1/-0 |
|
1936 | 1936 | diffstat--debug: 1: +4/-0 |
|
1937 | 1937 | diffstat--debug: 1: +2/-0 |
|
1938 | 1938 | diffstat--debug: 1: +1/-0 |
|
1939 | 1939 | extras: branch=default |
|
1940 | 1940 | extras: branch=default |
|
1941 | 1941 | extras: branch=default |
|
1942 | 1942 | extras: branch=default |
|
1943 | 1943 | extras: branch=foo |
|
1944 | 1944 | extras: branch=default |
|
1945 | 1945 | extras: branch=default |
|
1946 | 1946 | extras: branch=default |
|
1947 | 1947 | extras: branch=default |
|
1948 | 1948 | extras--verbose: branch=default |
|
1949 | 1949 | extras--verbose: branch=default |
|
1950 | 1950 | extras--verbose: branch=default |
|
1951 | 1951 | extras--verbose: branch=default |
|
1952 | 1952 | extras--verbose: branch=foo |
|
1953 | 1953 | extras--verbose: branch=default |
|
1954 | 1954 | extras--verbose: branch=default |
|
1955 | 1955 | extras--verbose: branch=default |
|
1956 | 1956 | extras--verbose: branch=default |
|
1957 | 1957 | extras--debug: branch=default |
|
1958 | 1958 | extras--debug: branch=default |
|
1959 | 1959 | extras--debug: branch=default |
|
1960 | 1960 | extras--debug: branch=default |
|
1961 | 1961 | extras--debug: branch=foo |
|
1962 | 1962 | extras--debug: branch=default |
|
1963 | 1963 | extras--debug: branch=default |
|
1964 | 1964 | extras--debug: branch=default |
|
1965 | 1965 | extras--debug: branch=default |
|
1966 | 1966 | p1rev: 7 |
|
1967 | 1967 | p1rev: -1 |
|
1968 | 1968 | p1rev: 5 |
|
1969 | 1969 | p1rev: 3 |
|
1970 | 1970 | p1rev: 3 |
|
1971 | 1971 | p1rev: 2 |
|
1972 | 1972 | p1rev: 1 |
|
1973 | 1973 | p1rev: 0 |
|
1974 | 1974 | p1rev: -1 |
|
1975 | 1975 | p1rev--verbose: 7 |
|
1976 | 1976 | p1rev--verbose: -1 |
|
1977 | 1977 | p1rev--verbose: 5 |
|
1978 | 1978 | p1rev--verbose: 3 |
|
1979 | 1979 | p1rev--verbose: 3 |
|
1980 | 1980 | p1rev--verbose: 2 |
|
1981 | 1981 | p1rev--verbose: 1 |
|
1982 | 1982 | p1rev--verbose: 0 |
|
1983 | 1983 | p1rev--verbose: -1 |
|
1984 | 1984 | p1rev--debug: 7 |
|
1985 | 1985 | p1rev--debug: -1 |
|
1986 | 1986 | p1rev--debug: 5 |
|
1987 | 1987 | p1rev--debug: 3 |
|
1988 | 1988 | p1rev--debug: 3 |
|
1989 | 1989 | p1rev--debug: 2 |
|
1990 | 1990 | p1rev--debug: 1 |
|
1991 | 1991 | p1rev--debug: 0 |
|
1992 | 1992 | p1rev--debug: -1 |
|
1993 | 1993 | p2rev: -1 |
|
1994 | 1994 | p2rev: -1 |
|
1995 | 1995 | p2rev: 4 |
|
1996 | 1996 | p2rev: -1 |
|
1997 | 1997 | p2rev: -1 |
|
1998 | 1998 | p2rev: -1 |
|
1999 | 1999 | p2rev: -1 |
|
2000 | 2000 | p2rev: -1 |
|
2001 | 2001 | p2rev: -1 |
|
2002 | 2002 | p2rev--verbose: -1 |
|
2003 | 2003 | p2rev--verbose: -1 |
|
2004 | 2004 | p2rev--verbose: 4 |
|
2005 | 2005 | p2rev--verbose: -1 |
|
2006 | 2006 | p2rev--verbose: -1 |
|
2007 | 2007 | p2rev--verbose: -1 |
|
2008 | 2008 | p2rev--verbose: -1 |
|
2009 | 2009 | p2rev--verbose: -1 |
|
2010 | 2010 | p2rev--verbose: -1 |
|
2011 | 2011 | p2rev--debug: -1 |
|
2012 | 2012 | p2rev--debug: -1 |
|
2013 | 2013 | p2rev--debug: 4 |
|
2014 | 2014 | p2rev--debug: -1 |
|
2015 | 2015 | p2rev--debug: -1 |
|
2016 | 2016 | p2rev--debug: -1 |
|
2017 | 2017 | p2rev--debug: -1 |
|
2018 | 2018 | p2rev--debug: -1 |
|
2019 | 2019 | p2rev--debug: -1 |
|
2020 | 2020 | p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
2021 | 2021 | p1node: 0000000000000000000000000000000000000000 |
|
2022 | 2022 | p1node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
2023 | 2023 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2024 | 2024 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2025 | 2025 | p1node: 97054abb4ab824450e9164180baf491ae0078465 |
|
2026 | 2026 | p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2027 | 2027 | p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2028 | 2028 | p1node: 0000000000000000000000000000000000000000 |
|
2029 | 2029 | p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
2030 | 2030 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
2031 | 2031 | p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
2032 | 2032 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2033 | 2033 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2034 | 2034 | p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
2035 | 2035 | p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2036 | 2036 | p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2037 | 2037 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
2038 | 2038 | p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
2039 | 2039 | p1node--debug: 0000000000000000000000000000000000000000 |
|
2040 | 2040 | p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
2041 | 2041 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2042 | 2042 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2043 | 2043 | p1node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
2044 | 2044 | p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2045 | 2045 | p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2046 | 2046 | p1node--debug: 0000000000000000000000000000000000000000 |
|
2047 | 2047 | p2node: 0000000000000000000000000000000000000000 |
|
2048 | 2048 | p2node: 0000000000000000000000000000000000000000 |
|
2049 | 2049 | p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2050 | 2050 | p2node: 0000000000000000000000000000000000000000 |
|
2051 | 2051 | p2node: 0000000000000000000000000000000000000000 |
|
2052 | 2052 | p2node: 0000000000000000000000000000000000000000 |
|
2053 | 2053 | p2node: 0000000000000000000000000000000000000000 |
|
2054 | 2054 | p2node: 0000000000000000000000000000000000000000 |
|
2055 | 2055 | p2node: 0000000000000000000000000000000000000000 |
|
2056 | 2056 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2057 | 2057 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2058 | 2058 | p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2059 | 2059 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2060 | 2060 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2061 | 2061 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2062 | 2062 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2063 | 2063 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2064 | 2064 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
2065 | 2065 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2066 | 2066 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2067 | 2067 | p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2068 | 2068 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2069 | 2069 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2070 | 2070 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2071 | 2071 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2072 | 2072 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2073 | 2073 | p2node--debug: 0000000000000000000000000000000000000000 |
|
2074 | 2074 | |
|
2075 | 2075 | Filters work: |
|
2076 | 2076 | |
|
2077 | 2077 | $ hg log --template '{author|domain}\n' |
|
2078 | 2078 | |
|
2079 | 2079 | hostname |
|
2080 | 2080 | |
|
2081 | 2081 | |
|
2082 | 2082 | |
|
2083 | 2083 | |
|
2084 | 2084 | place |
|
2085 | 2085 | place |
|
2086 | 2086 | hostname |
|
2087 | 2087 | |
|
2088 | 2088 | $ hg log --template '{author|person}\n' |
|
2089 | 2089 | test |
|
2090 | 2090 | User Name |
|
2091 | 2091 | person |
|
2092 | 2092 | person |
|
2093 | 2093 | person |
|
2094 | 2094 | person |
|
2095 | 2095 | other |
|
2096 | 2096 | A. N. Other |
|
2097 | 2097 | User Name |
|
2098 | 2098 | |
|
2099 | 2099 | $ hg log --template '{author|user}\n' |
|
2100 | 2100 | test |
|
2101 | 2101 | user |
|
2102 | 2102 | person |
|
2103 | 2103 | person |
|
2104 | 2104 | person |
|
2105 | 2105 | person |
|
2106 | 2106 | other |
|
2107 | 2107 | other |
|
2108 | 2108 | user |
|
2109 | 2109 | |
|
2110 | 2110 | $ hg log --template '{date|date}\n' |
|
2111 | 2111 | Wed Jan 01 10:01:00 2020 +0000 |
|
2112 | 2112 | Mon Jan 12 13:46:40 1970 +0000 |
|
2113 | 2113 | Sun Jan 18 08:40:01 1970 +0000 |
|
2114 | 2114 | Sun Jan 18 08:40:00 1970 +0000 |
|
2115 | 2115 | Sat Jan 17 04:53:20 1970 +0000 |
|
2116 | 2116 | Fri Jan 16 01:06:40 1970 +0000 |
|
2117 | 2117 | Wed Jan 14 21:20:00 1970 +0000 |
|
2118 | 2118 | Tue Jan 13 17:33:20 1970 +0000 |
|
2119 | 2119 | Mon Jan 12 13:46:40 1970 +0000 |
|
2120 | 2120 | |
|
2121 | 2121 | $ hg log --template '{date|isodate}\n' |
|
2122 | 2122 | 2020-01-01 10:01 +0000 |
|
2123 | 2123 | 1970-01-12 13:46 +0000 |
|
2124 | 2124 | 1970-01-18 08:40 +0000 |
|
2125 | 2125 | 1970-01-18 08:40 +0000 |
|
2126 | 2126 | 1970-01-17 04:53 +0000 |
|
2127 | 2127 | 1970-01-16 01:06 +0000 |
|
2128 | 2128 | 1970-01-14 21:20 +0000 |
|
2129 | 2129 | 1970-01-13 17:33 +0000 |
|
2130 | 2130 | 1970-01-12 13:46 +0000 |
|
2131 | 2131 | |
|
2132 | 2132 | $ hg log --template '{date|isodatesec}\n' |
|
2133 | 2133 | 2020-01-01 10:01:00 +0000 |
|
2134 | 2134 | 1970-01-12 13:46:40 +0000 |
|
2135 | 2135 | 1970-01-18 08:40:01 +0000 |
|
2136 | 2136 | 1970-01-18 08:40:00 +0000 |
|
2137 | 2137 | 1970-01-17 04:53:20 +0000 |
|
2138 | 2138 | 1970-01-16 01:06:40 +0000 |
|
2139 | 2139 | 1970-01-14 21:20:00 +0000 |
|
2140 | 2140 | 1970-01-13 17:33:20 +0000 |
|
2141 | 2141 | 1970-01-12 13:46:40 +0000 |
|
2142 | 2142 | |
|
2143 | 2143 | $ hg log --template '{date|rfc822date}\n' |
|
2144 | 2144 | Wed, 01 Jan 2020 10:01:00 +0000 |
|
2145 | 2145 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
2146 | 2146 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
2147 | 2147 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
2148 | 2148 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
2149 | 2149 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
2150 | 2150 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
2151 | 2151 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
2152 | 2152 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
2153 | 2153 | |
|
2154 | 2154 | $ hg log --template '{desc|firstline}\n' |
|
2155 | 2155 | third |
|
2156 | 2156 | second |
|
2157 | 2157 | merge |
|
2158 | 2158 | new head |
|
2159 | 2159 | new branch |
|
2160 | 2160 | no user, no domain |
|
2161 | 2161 | no person |
|
2162 | 2162 | other 1 |
|
2163 | 2163 | line 1 |
|
2164 | 2164 | |
|
2165 | 2165 | $ hg log --template '{node|short}\n' |
|
2166 | 2166 | 95c24699272e |
|
2167 | 2167 | 29114dbae42b |
|
2168 | 2168 | d41e714fe50d |
|
2169 | 2169 | 13207e5a10d9 |
|
2170 | 2170 | bbe44766e73d |
|
2171 | 2171 | 10e46f2dcbf4 |
|
2172 | 2172 | 97054abb4ab8 |
|
2173 | 2173 | b608e9d1a3f0 |
|
2174 | 2174 | 1e4e1b8f71e0 |
|
2175 | 2175 | |
|
2176 | 2176 | $ hg log --template '<changeset author="{author|xmlescape}"/>\n' |
|
2177 | 2177 | <changeset author="test"/> |
|
2178 | 2178 | <changeset author="User Name <user@hostname>"/> |
|
2179 | 2179 | <changeset author="person"/> |
|
2180 | 2180 | <changeset author="person"/> |
|
2181 | 2181 | <changeset author="person"/> |
|
2182 | 2182 | <changeset author="person"/> |
|
2183 | 2183 | <changeset author="other@place"/> |
|
2184 | 2184 | <changeset author="A. N. Other <other@place>"/> |
|
2185 | 2185 | <changeset author="User Name <user@hostname>"/> |
|
2186 | 2186 | |
|
2187 | 2187 | $ hg log --template '{rev}: {children}\n' |
|
2188 | 2188 | 8: |
|
2189 | 2189 | 7: 8:95c24699272e |
|
2190 | 2190 | 6: |
|
2191 | 2191 | 5: 6:d41e714fe50d |
|
2192 | 2192 | 4: 6:d41e714fe50d |
|
2193 | 2193 | 3: 4:bbe44766e73d 5:13207e5a10d9 |
|
2194 | 2194 | 2: 3:10e46f2dcbf4 |
|
2195 | 2195 | 1: 2:97054abb4ab8 |
|
2196 | 2196 | 0: 1:b608e9d1a3f0 |
|
2197 | 2197 | |
|
2198 | 2198 | Formatnode filter works: |
|
2199 | 2199 | |
|
2200 | 2200 | $ hg -q log -r 0 --template '{node|formatnode}\n' |
|
2201 | 2201 | 1e4e1b8f71e0 |
|
2202 | 2202 | |
|
2203 | 2203 | $ hg log -r 0 --template '{node|formatnode}\n' |
|
2204 | 2204 | 1e4e1b8f71e0 |
|
2205 | 2205 | |
|
2206 | 2206 | $ hg -v log -r 0 --template '{node|formatnode}\n' |
|
2207 | 2207 | 1e4e1b8f71e0 |
|
2208 | 2208 | |
|
2209 | 2209 | $ hg --debug log -r 0 --template '{node|formatnode}\n' |
|
2210 | 2210 | 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2211 | 2211 | |
|
2212 | 2212 | Age filter: |
|
2213 | 2213 | |
|
2214 | 2214 | $ hg init unstable-hash |
|
2215 | 2215 | $ cd unstable-hash |
|
2216 | 2216 | $ hg log --template '{date|age}\n' > /dev/null || exit 1 |
|
2217 | 2217 | |
|
2218 | 2218 | >>> from __future__ import absolute_import |
|
2219 | 2219 | >>> import datetime |
|
2220 | 2220 | >>> fp = open('a', 'wb') |
|
2221 | 2221 | >>> n = datetime.datetime.now() + datetime.timedelta(366 * 7) |
|
2222 | 2222 | >>> fp.write(b'%d-%d-%d 00:00' % (n.year, n.month, n.day)) and None |
|
2223 | 2223 | >>> fp.close() |
|
2224 | 2224 | $ hg add a |
|
2225 | 2225 | $ hg commit -m future -d "`cat a`" |
|
2226 | 2226 | |
|
2227 | 2227 | $ hg log -l1 --template '{date|age}\n' |
|
2228 | 2228 | 7 years from now |
|
2229 | 2229 | |
|
2230 | 2230 | $ cd .. |
|
2231 | 2231 | $ rm -rf unstable-hash |
|
2232 | 2232 | |
|
2233 | 2233 | Filename filters: |
|
2234 | 2234 | |
|
2235 | 2235 | $ hg debugtemplate '{"foo/bar"|basename}|{"foo/"|basename}|{"foo"|basename}|\n' |
|
2236 | 2236 | bar||foo| |
|
2237 | 2237 | $ hg debugtemplate '{"foo/bar"|dirname}|{"foo/"|dirname}|{"foo"|dirname}|\n' |
|
2238 | 2238 | foo|foo|| |
|
2239 | 2239 | $ hg debugtemplate '{"foo/bar"|stripdir}|{"foo/"|stripdir}|{"foo"|stripdir}|\n' |
|
2240 | 2240 | foo|foo|foo| |
|
2241 | 2241 | |
|
2242 | 2242 | Add a dummy commit to make up for the instability of the above: |
|
2243 | 2243 | |
|
2244 | 2244 | $ echo a > a |
|
2245 | 2245 | $ hg add a |
|
2246 | 2246 | $ hg ci -m future |
|
2247 | 2247 | |
|
2248 | 2248 | Count filter: |
|
2249 | 2249 | |
|
2250 | 2250 | $ hg log -l1 --template '{node|count} {node|short|count}\n' |
|
2251 | 2251 | 40 12 |
|
2252 | 2252 | |
|
2253 | 2253 | $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n' |
|
2254 | 2254 | 0 1 4 |
|
2255 | 2255 | |
|
2256 | 2256 | $ hg log -G --template '{rev}: children: {children|count}, \ |
|
2257 | 2257 | > tags: {tags|count}, file_adds: {file_adds|count}, \ |
|
2258 | 2258 | > ancestors: {revset("ancestors(%s)", rev)|count}' |
|
2259 | 2259 | @ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3 |
|
2260 | 2260 | | |
|
2261 | 2261 | o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2 |
|
2262 | 2262 | | |
|
2263 | 2263 | o 7: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2264 | 2264 | |
|
2265 | 2265 | o 6: children: 0, tags: 0, file_adds: 0, ancestors: 7 |
|
2266 | 2266 | |\ |
|
2267 | 2267 | | o 5: children: 1, tags: 0, file_adds: 1, ancestors: 5 |
|
2268 | 2268 | | | |
|
2269 | 2269 | o | 4: children: 1, tags: 0, file_adds: 0, ancestors: 5 |
|
2270 | 2270 | |/ |
|
2271 | 2271 | o 3: children: 2, tags: 0, file_adds: 0, ancestors: 4 |
|
2272 | 2272 | | |
|
2273 | 2273 | o 2: children: 1, tags: 0, file_adds: 1, ancestors: 3 |
|
2274 | 2274 | | |
|
2275 | 2275 | o 1: children: 1, tags: 0, file_adds: 1, ancestors: 2 |
|
2276 | 2276 | | |
|
2277 | 2277 | o 0: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2278 | 2278 | |
|
2279 | 2279 | |
|
2280 | 2280 | Upper/lower filters: |
|
2281 | 2281 | |
|
2282 | 2282 | $ hg log -r0 --template '{branch|upper}\n' |
|
2283 | 2283 | DEFAULT |
|
2284 | 2284 | $ hg log -r0 --template '{author|lower}\n' |
|
2285 | 2285 | user name <user@hostname> |
|
2286 | 2286 | $ hg log -r0 --template '{date|upper}\n' |
|
2287 | 2287 | 1000000.00 |
|
2288 | 2288 | |
|
2289 | 2289 | Add a commit that does all possible modifications at once |
|
2290 | 2290 | |
|
2291 | 2291 | $ echo modify >> third |
|
2292 | 2292 | $ touch b |
|
2293 | 2293 | $ hg add b |
|
2294 | 2294 | $ hg mv fourth fifth |
|
2295 | 2295 | $ hg rm a |
|
2296 | 2296 | $ hg ci -m "Modify, add, remove, rename" |
|
2297 | 2297 | |
|
2298 | 2298 | Check the status template |
|
2299 | 2299 | |
|
2300 | 2300 | $ cat <<EOF >> $HGRCPATH |
|
2301 | 2301 | > [extensions] |
|
2302 | 2302 | > color= |
|
2303 | 2303 | > EOF |
|
2304 | 2304 | |
|
2305 | 2305 | $ hg log -T status -r 10 |
|
2306 | 2306 | changeset: 10:0f9759ec227a |
|
2307 | 2307 | tag: tip |
|
2308 | 2308 | user: test |
|
2309 | 2309 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2310 | 2310 | summary: Modify, add, remove, rename |
|
2311 | 2311 | files: |
|
2312 | 2312 | M third |
|
2313 | 2313 | A b |
|
2314 | 2314 | A fifth |
|
2315 | 2315 | R a |
|
2316 | 2316 | R fourth |
|
2317 | 2317 | |
|
2318 | 2318 | $ hg log -T status -C -r 10 |
|
2319 | 2319 | changeset: 10:0f9759ec227a |
|
2320 | 2320 | tag: tip |
|
2321 | 2321 | user: test |
|
2322 | 2322 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2323 | 2323 | summary: Modify, add, remove, rename |
|
2324 | 2324 | files: |
|
2325 | 2325 | M third |
|
2326 | 2326 | A b |
|
2327 | 2327 | A fifth |
|
2328 | 2328 | fourth |
|
2329 | 2329 | R a |
|
2330 | 2330 | R fourth |
|
2331 | 2331 | |
|
2332 | 2332 | $ hg log -T status -C -r 10 -v |
|
2333 | 2333 | changeset: 10:0f9759ec227a |
|
2334 | 2334 | tag: tip |
|
2335 | 2335 | user: test |
|
2336 | 2336 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2337 | 2337 | description: |
|
2338 | 2338 | Modify, add, remove, rename |
|
2339 | 2339 | |
|
2340 | 2340 | files: |
|
2341 | 2341 | M third |
|
2342 | 2342 | A b |
|
2343 | 2343 | A fifth |
|
2344 | 2344 | fourth |
|
2345 | 2345 | R a |
|
2346 | 2346 | R fourth |
|
2347 | 2347 | |
|
2348 | 2348 | $ hg log -T status -C -r 10 --debug |
|
2349 | 2349 | changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c |
|
2350 | 2350 | tag: tip |
|
2351 | 2351 | phase: secret |
|
2352 | 2352 | parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066 |
|
2353 | 2353 | parent: -1:0000000000000000000000000000000000000000 |
|
2354 | 2354 | manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567 |
|
2355 | 2355 | user: test |
|
2356 | 2356 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2357 | 2357 | extra: branch=default |
|
2358 | 2358 | description: |
|
2359 | 2359 | Modify, add, remove, rename |
|
2360 | 2360 | |
|
2361 | 2361 | files: |
|
2362 | 2362 | M third |
|
2363 | 2363 | A b |
|
2364 | 2364 | A fifth |
|
2365 | 2365 | fourth |
|
2366 | 2366 | R a |
|
2367 | 2367 | R fourth |
|
2368 | 2368 | |
|
2369 | 2369 | $ hg log -T status -C -r 10 --quiet |
|
2370 | 2370 | 10:0f9759ec227a |
|
2371 | 2371 | $ hg --color=debug log -T status -r 10 |
|
2372 | 2372 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2373 | 2373 | [log.tag|tag: tip] |
|
2374 | 2374 | [log.user|user: test] |
|
2375 | 2375 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2376 | 2376 | [log.summary|summary: Modify, add, remove, rename] |
|
2377 | 2377 | [ui.note log.files|files:] |
|
2378 | 2378 | [status.modified|M third] |
|
2379 | 2379 | [status.added|A b] |
|
2380 | 2380 | [status.added|A fifth] |
|
2381 | 2381 | [status.removed|R a] |
|
2382 | 2382 | [status.removed|R fourth] |
|
2383 | 2383 | |
|
2384 | 2384 | $ hg --color=debug log -T status -C -r 10 |
|
2385 | 2385 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2386 | 2386 | [log.tag|tag: tip] |
|
2387 | 2387 | [log.user|user: test] |
|
2388 | 2388 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2389 | 2389 | [log.summary|summary: Modify, add, remove, rename] |
|
2390 | 2390 | [ui.note log.files|files:] |
|
2391 | 2391 | [status.modified|M third] |
|
2392 | 2392 | [status.added|A b] |
|
2393 | 2393 | [status.added|A fifth] |
|
2394 | 2394 | [status.copied| fourth] |
|
2395 | 2395 | [status.removed|R a] |
|
2396 | 2396 | [status.removed|R fourth] |
|
2397 | 2397 | |
|
2398 | 2398 | $ hg --color=debug log -T status -C -r 10 -v |
|
2399 | 2399 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2400 | 2400 | [log.tag|tag: tip] |
|
2401 | 2401 | [log.user|user: test] |
|
2402 | 2402 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2403 | 2403 | [ui.note log.description|description:] |
|
2404 | 2404 | [ui.note log.description|Modify, add, remove, rename] |
|
2405 | 2405 | |
|
2406 | 2406 | [ui.note log.files|files:] |
|
2407 | 2407 | [status.modified|M third] |
|
2408 | 2408 | [status.added|A b] |
|
2409 | 2409 | [status.added|A fifth] |
|
2410 | 2410 | [status.copied| fourth] |
|
2411 | 2411 | [status.removed|R a] |
|
2412 | 2412 | [status.removed|R fourth] |
|
2413 | 2413 | |
|
2414 | 2414 | $ hg --color=debug log -T status -C -r 10 --debug |
|
2415 | 2415 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c] |
|
2416 | 2416 | [log.tag|tag: tip] |
|
2417 | 2417 | [log.phase|phase: secret] |
|
2418 | 2418 | [log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066] |
|
2419 | 2419 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2420 | 2420 | [ui.debug log.manifest|manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567] |
|
2421 | 2421 | [log.user|user: test] |
|
2422 | 2422 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2423 | 2423 | [ui.debug log.extra|extra: branch=default] |
|
2424 | 2424 | [ui.note log.description|description:] |
|
2425 | 2425 | [ui.note log.description|Modify, add, remove, rename] |
|
2426 | 2426 | |
|
2427 | 2427 | [ui.note log.files|files:] |
|
2428 | 2428 | [status.modified|M third] |
|
2429 | 2429 | [status.added|A b] |
|
2430 | 2430 | [status.added|A fifth] |
|
2431 | 2431 | [status.copied| fourth] |
|
2432 | 2432 | [status.removed|R a] |
|
2433 | 2433 | [status.removed|R fourth] |
|
2434 | 2434 | |
|
2435 | 2435 | $ hg --color=debug log -T status -C -r 10 --quiet |
|
2436 | 2436 | [log.node|10:0f9759ec227a] |
|
2437 | 2437 | |
|
2438 | 2438 | Check the bisect template |
|
2439 | 2439 | |
|
2440 | 2440 | $ hg bisect -g 1 |
|
2441 | 2441 | $ hg bisect -b 3 --noupdate |
|
2442 | 2442 | Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) |
|
2443 | 2443 | $ hg log -T bisect -r 0:4 |
|
2444 | 2444 | changeset: 0:1e4e1b8f71e0 |
|
2445 | 2445 | bisect: good (implicit) |
|
2446 | 2446 | user: User Name <user@hostname> |
|
2447 | 2447 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2448 | 2448 | summary: line 1 |
|
2449 | 2449 | |
|
2450 | 2450 | changeset: 1:b608e9d1a3f0 |
|
2451 | 2451 | bisect: good |
|
2452 | 2452 | user: A. N. Other <other@place> |
|
2453 | 2453 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2454 | 2454 | summary: other 1 |
|
2455 | 2455 | |
|
2456 | 2456 | changeset: 2:97054abb4ab8 |
|
2457 | 2457 | bisect: untested |
|
2458 | 2458 | user: other@place |
|
2459 | 2459 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2460 | 2460 | summary: no person |
|
2461 | 2461 | |
|
2462 | 2462 | changeset: 3:10e46f2dcbf4 |
|
2463 | 2463 | bisect: bad |
|
2464 | 2464 | user: person |
|
2465 | 2465 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2466 | 2466 | summary: no user, no domain |
|
2467 | 2467 | |
|
2468 | 2468 | changeset: 4:bbe44766e73d |
|
2469 | 2469 | bisect: bad (implicit) |
|
2470 | 2470 | branch: foo |
|
2471 | 2471 | user: person |
|
2472 | 2472 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2473 | 2473 | summary: new branch |
|
2474 | 2474 | |
|
2475 | 2475 | $ hg log --debug -T bisect -r 0:4 |
|
2476 | 2476 | changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2477 | 2477 | bisect: good (implicit) |
|
2478 | 2478 | phase: public |
|
2479 | 2479 | parent: -1:0000000000000000000000000000000000000000 |
|
2480 | 2480 | parent: -1:0000000000000000000000000000000000000000 |
|
2481 | 2481 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
2482 | 2482 | user: User Name <user@hostname> |
|
2483 | 2483 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2484 | 2484 | files+: a |
|
2485 | 2485 | extra: branch=default |
|
2486 | 2486 | description: |
|
2487 | 2487 | line 1 |
|
2488 | 2488 | line 2 |
|
2489 | 2489 | |
|
2490 | 2490 | |
|
2491 | 2491 | changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2492 | 2492 | bisect: good |
|
2493 | 2493 | phase: public |
|
2494 | 2494 | parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2495 | 2495 | parent: -1:0000000000000000000000000000000000000000 |
|
2496 | 2496 | manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
2497 | 2497 | user: A. N. Other <other@place> |
|
2498 | 2498 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2499 | 2499 | files+: b |
|
2500 | 2500 | extra: branch=default |
|
2501 | 2501 | description: |
|
2502 | 2502 | other 1 |
|
2503 | 2503 | other 2 |
|
2504 | 2504 | |
|
2505 | 2505 | other 3 |
|
2506 | 2506 | |
|
2507 | 2507 | |
|
2508 | 2508 | changeset: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2509 | 2509 | bisect: untested |
|
2510 | 2510 | phase: public |
|
2511 | 2511 | parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2512 | 2512 | parent: -1:0000000000000000000000000000000000000000 |
|
2513 | 2513 | manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
2514 | 2514 | user: other@place |
|
2515 | 2515 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2516 | 2516 | files+: c |
|
2517 | 2517 | extra: branch=default |
|
2518 | 2518 | description: |
|
2519 | 2519 | no person |
|
2520 | 2520 | |
|
2521 | 2521 | |
|
2522 | 2522 | changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2523 | 2523 | bisect: bad |
|
2524 | 2524 | phase: public |
|
2525 | 2525 | parent: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2526 | 2526 | parent: -1:0000000000000000000000000000000000000000 |
|
2527 | 2527 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2528 | 2528 | user: person |
|
2529 | 2529 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2530 | 2530 | files: c |
|
2531 | 2531 | extra: branch=default |
|
2532 | 2532 | description: |
|
2533 | 2533 | no user, no domain |
|
2534 | 2534 | |
|
2535 | 2535 | |
|
2536 | 2536 | changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2537 | 2537 | bisect: bad (implicit) |
|
2538 | 2538 | branch: foo |
|
2539 | 2539 | phase: draft |
|
2540 | 2540 | parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2541 | 2541 | parent: -1:0000000000000000000000000000000000000000 |
|
2542 | 2542 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2543 | 2543 | user: person |
|
2544 | 2544 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2545 | 2545 | extra: branch=foo |
|
2546 | 2546 | description: |
|
2547 | 2547 | new branch |
|
2548 | 2548 | |
|
2549 | 2549 | |
|
2550 | 2550 | $ hg log -v -T bisect -r 0:4 |
|
2551 | 2551 | changeset: 0:1e4e1b8f71e0 |
|
2552 | 2552 | bisect: good (implicit) |
|
2553 | 2553 | user: User Name <user@hostname> |
|
2554 | 2554 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2555 | 2555 | files: a |
|
2556 | 2556 | description: |
|
2557 | 2557 | line 1 |
|
2558 | 2558 | line 2 |
|
2559 | 2559 | |
|
2560 | 2560 | |
|
2561 | 2561 | changeset: 1:b608e9d1a3f0 |
|
2562 | 2562 | bisect: good |
|
2563 | 2563 | user: A. N. Other <other@place> |
|
2564 | 2564 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2565 | 2565 | files: b |
|
2566 | 2566 | description: |
|
2567 | 2567 | other 1 |
|
2568 | 2568 | other 2 |
|
2569 | 2569 | |
|
2570 | 2570 | other 3 |
|
2571 | 2571 | |
|
2572 | 2572 | |
|
2573 | 2573 | changeset: 2:97054abb4ab8 |
|
2574 | 2574 | bisect: untested |
|
2575 | 2575 | user: other@place |
|
2576 | 2576 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2577 | 2577 | files: c |
|
2578 | 2578 | description: |
|
2579 | 2579 | no person |
|
2580 | 2580 | |
|
2581 | 2581 | |
|
2582 | 2582 | changeset: 3:10e46f2dcbf4 |
|
2583 | 2583 | bisect: bad |
|
2584 | 2584 | user: person |
|
2585 | 2585 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2586 | 2586 | files: c |
|
2587 | 2587 | description: |
|
2588 | 2588 | no user, no domain |
|
2589 | 2589 | |
|
2590 | 2590 | |
|
2591 | 2591 | changeset: 4:bbe44766e73d |
|
2592 | 2592 | bisect: bad (implicit) |
|
2593 | 2593 | branch: foo |
|
2594 | 2594 | user: person |
|
2595 | 2595 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2596 | 2596 | description: |
|
2597 | 2597 | new branch |
|
2598 | 2598 | |
|
2599 | 2599 | |
|
2600 | 2600 | $ hg --color=debug log -T bisect -r 0:4 |
|
2601 | 2601 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2602 | 2602 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2603 | 2603 | [log.user|user: User Name <user@hostname>] |
|
2604 | 2604 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2605 | 2605 | [log.summary|summary: line 1] |
|
2606 | 2606 | |
|
2607 | 2607 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2608 | 2608 | [log.bisect bisect.good|bisect: good] |
|
2609 | 2609 | [log.user|user: A. N. Other <other@place>] |
|
2610 | 2610 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2611 | 2611 | [log.summary|summary: other 1] |
|
2612 | 2612 | |
|
2613 | 2613 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2614 | 2614 | [log.bisect bisect.untested|bisect: untested] |
|
2615 | 2615 | [log.user|user: other@place] |
|
2616 | 2616 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2617 | 2617 | [log.summary|summary: no person] |
|
2618 | 2618 | |
|
2619 | 2619 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2620 | 2620 | [log.bisect bisect.bad|bisect: bad] |
|
2621 | 2621 | [log.user|user: person] |
|
2622 | 2622 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2623 | 2623 | [log.summary|summary: no user, no domain] |
|
2624 | 2624 | |
|
2625 | 2625 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2626 | 2626 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2627 | 2627 | [log.branch|branch: foo] |
|
2628 | 2628 | [log.user|user: person] |
|
2629 | 2629 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2630 | 2630 | [log.summary|summary: new branch] |
|
2631 | 2631 | |
|
2632 | 2632 | $ hg --color=debug log --debug -T bisect -r 0:4 |
|
2633 | 2633 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2634 | 2634 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2635 | 2635 | [log.phase|phase: public] |
|
2636 | 2636 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2637 | 2637 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2638 | 2638 | [ui.debug log.manifest|manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0] |
|
2639 | 2639 | [log.user|user: User Name <user@hostname>] |
|
2640 | 2640 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2641 | 2641 | [ui.debug log.files|files+: a] |
|
2642 | 2642 | [ui.debug log.extra|extra: branch=default] |
|
2643 | 2643 | [ui.note log.description|description:] |
|
2644 | 2644 | [ui.note log.description|line 1 |
|
2645 | 2645 | line 2] |
|
2646 | 2646 | |
|
2647 | 2647 | |
|
2648 | 2648 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2649 | 2649 | [log.bisect bisect.good|bisect: good] |
|
2650 | 2650 | [log.phase|phase: public] |
|
2651 | 2651 | [log.parent changeset.public|parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2652 | 2652 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2653 | 2653 | [ui.debug log.manifest|manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55] |
|
2654 | 2654 | [log.user|user: A. N. Other <other@place>] |
|
2655 | 2655 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2656 | 2656 | [ui.debug log.files|files+: b] |
|
2657 | 2657 | [ui.debug log.extra|extra: branch=default] |
|
2658 | 2658 | [ui.note log.description|description:] |
|
2659 | 2659 | [ui.note log.description|other 1 |
|
2660 | 2660 | other 2 |
|
2661 | 2661 | |
|
2662 | 2662 | other 3] |
|
2663 | 2663 | |
|
2664 | 2664 | |
|
2665 | 2665 | [log.changeset changeset.public|changeset: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2666 | 2666 | [log.bisect bisect.untested|bisect: untested] |
|
2667 | 2667 | [log.phase|phase: public] |
|
2668 | 2668 | [log.parent changeset.public|parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2669 | 2669 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2670 | 2670 | [ui.debug log.manifest|manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1] |
|
2671 | 2671 | [log.user|user: other@place] |
|
2672 | 2672 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2673 | 2673 | [ui.debug log.files|files+: c] |
|
2674 | 2674 | [ui.debug log.extra|extra: branch=default] |
|
2675 | 2675 | [ui.note log.description|description:] |
|
2676 | 2676 | [ui.note log.description|no person] |
|
2677 | 2677 | |
|
2678 | 2678 | |
|
2679 | 2679 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2680 | 2680 | [log.bisect bisect.bad|bisect: bad] |
|
2681 | 2681 | [log.phase|phase: public] |
|
2682 | 2682 | [log.parent changeset.public|parent: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2683 | 2683 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2684 | 2684 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2685 | 2685 | [log.user|user: person] |
|
2686 | 2686 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2687 | 2687 | [ui.debug log.files|files: c] |
|
2688 | 2688 | [ui.debug log.extra|extra: branch=default] |
|
2689 | 2689 | [ui.note log.description|description:] |
|
2690 | 2690 | [ui.note log.description|no user, no domain] |
|
2691 | 2691 | |
|
2692 | 2692 | |
|
2693 | 2693 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74] |
|
2694 | 2694 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2695 | 2695 | [log.branch|branch: foo] |
|
2696 | 2696 | [log.phase|phase: draft] |
|
2697 | 2697 | [log.parent changeset.public|parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2698 | 2698 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2699 | 2699 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2700 | 2700 | [log.user|user: person] |
|
2701 | 2701 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2702 | 2702 | [ui.debug log.extra|extra: branch=foo] |
|
2703 | 2703 | [ui.note log.description|description:] |
|
2704 | 2704 | [ui.note log.description|new branch] |
|
2705 | 2705 | |
|
2706 | 2706 | |
|
2707 | 2707 | $ hg --color=debug log -v -T bisect -r 0:4 |
|
2708 | 2708 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2709 | 2709 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2710 | 2710 | [log.user|user: User Name <user@hostname>] |
|
2711 | 2711 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2712 | 2712 | [ui.note log.files|files: a] |
|
2713 | 2713 | [ui.note log.description|description:] |
|
2714 | 2714 | [ui.note log.description|line 1 |
|
2715 | 2715 | line 2] |
|
2716 | 2716 | |
|
2717 | 2717 | |
|
2718 | 2718 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2719 | 2719 | [log.bisect bisect.good|bisect: good] |
|
2720 | 2720 | [log.user|user: A. N. Other <other@place>] |
|
2721 | 2721 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2722 | 2722 | [ui.note log.files|files: b] |
|
2723 | 2723 | [ui.note log.description|description:] |
|
2724 | 2724 | [ui.note log.description|other 1 |
|
2725 | 2725 | other 2 |
|
2726 | 2726 | |
|
2727 | 2727 | other 3] |
|
2728 | 2728 | |
|
2729 | 2729 | |
|
2730 | 2730 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2731 | 2731 | [log.bisect bisect.untested|bisect: untested] |
|
2732 | 2732 | [log.user|user: other@place] |
|
2733 | 2733 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2734 | 2734 | [ui.note log.files|files: c] |
|
2735 | 2735 | [ui.note log.description|description:] |
|
2736 | 2736 | [ui.note log.description|no person] |
|
2737 | 2737 | |
|
2738 | 2738 | |
|
2739 | 2739 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2740 | 2740 | [log.bisect bisect.bad|bisect: bad] |
|
2741 | 2741 | [log.user|user: person] |
|
2742 | 2742 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2743 | 2743 | [ui.note log.files|files: c] |
|
2744 | 2744 | [ui.note log.description|description:] |
|
2745 | 2745 | [ui.note log.description|no user, no domain] |
|
2746 | 2746 | |
|
2747 | 2747 | |
|
2748 | 2748 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2749 | 2749 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2750 | 2750 | [log.branch|branch: foo] |
|
2751 | 2751 | [log.user|user: person] |
|
2752 | 2752 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2753 | 2753 | [ui.note log.description|description:] |
|
2754 | 2754 | [ui.note log.description|new branch] |
|
2755 | 2755 | |
|
2756 | 2756 | |
|
2757 | 2757 | $ hg bisect --reset |
|
2758 | 2758 | |
|
2759 | 2759 | Error on syntax: |
|
2760 | 2760 | |
|
2761 | 2761 | $ echo 'x = "f' >> t |
|
2762 | 2762 | $ hg log |
|
2763 | 2763 | hg: parse error at t:3: unmatched quotes |
|
2764 | 2764 | [255] |
|
2765 | 2765 | |
|
2766 | 2766 | $ hg log -T '{date' |
|
2767 | 2767 | hg: parse error at 1: unterminated template expansion |
|
2768 | 2768 | ({date |
|
2769 | 2769 | ^ here) |
|
2770 | 2770 | [255] |
|
2771 | 2771 | $ hg log -T '{date(}' |
|
2772 | 2772 | hg: parse error at 6: not a prefix: end |
|
2773 | 2773 | ({date(} |
|
2774 | 2774 | ^ here) |
|
2775 | 2775 | [255] |
|
2776 | 2776 | $ hg log -T '{date)}' |
|
2777 | 2777 | hg: parse error at 5: invalid token |
|
2778 | 2778 | ({date)} |
|
2779 | 2779 | ^ here) |
|
2780 | 2780 | [255] |
|
2781 | 2781 | $ hg log -T '{date date}' |
|
2782 | 2782 | hg: parse error at 6: invalid token |
|
2783 | 2783 | ({date date} |
|
2784 | 2784 | ^ here) |
|
2785 | 2785 | [255] |
|
2786 | 2786 | |
|
2787 | 2787 | $ hg log -T '{}' |
|
2788 | 2788 | hg: parse error at 1: not a prefix: end |
|
2789 | 2789 | ({} |
|
2790 | 2790 | ^ here) |
|
2791 | 2791 | [255] |
|
2792 | 2792 | $ hg debugtemplate -v '{()}' |
|
2793 | 2793 | (template |
|
2794 | 2794 | (group |
|
2795 | 2795 | None)) |
|
2796 | 2796 | hg: parse error: missing argument |
|
2797 | 2797 | [255] |
|
2798 | 2798 | |
|
2799 | 2799 | Behind the scenes, this would throw TypeError without intype=bytes |
|
2800 | 2800 | |
|
2801 | 2801 | $ hg log -l 3 --template '{date|obfuscate}\n' |
|
2802 | 2802 | 0.00 |
|
2803 | 2803 | 0.00 |
|
2804 | 2804 | 1577872860.00 |
|
2805 | 2805 | |
|
2806 | 2806 | Behind the scenes, this will throw a ValueError |
|
2807 | 2807 | |
|
2808 | 2808 | $ hg log -l 3 --template 'line: {desc|shortdate}\n' |
|
2809 | abort: template filter 'shortdate' is not compatible with keyword 'desc' | |
|
2809 | hg: parse error: invalid date: 'Modify, add, remove, rename' | |
|
2810 | (template filter 'shortdate' is not compatible with keyword 'desc') | |
|
2810 | 2811 | [255] |
|
2811 | 2812 | |
|
2812 | 2813 | Behind the scenes, this would throw AttributeError without intype=bytes |
|
2813 | 2814 | |
|
2814 | 2815 | $ hg log -l 3 --template 'line: {date|escape}\n' |
|
2815 | 2816 | line: 0.00 |
|
2816 | 2817 | line: 0.00 |
|
2817 | 2818 | line: 1577872860.00 |
|
2818 | 2819 | |
|
2819 | 2820 | $ hg log -l 3 --template 'line: {extras|localdate}\n' |
|
2820 | 2821 | hg: parse error: localdate expects a date information |
|
2821 | 2822 | [255] |
|
2822 | 2823 | |
|
2823 | 2824 | Behind the scenes, this will throw ValueError |
|
2824 | 2825 | |
|
2825 | 2826 | $ hg tip --template '{author|email|date}\n' |
|
2826 | 2827 | hg: parse error: date expects a date information |
|
2827 | 2828 | [255] |
|
2828 | 2829 | |
|
2829 | 2830 | $ hg tip -T '{author|email|shortdate}\n' |
|
2830 | abort: template filter 'shortdate' is not compatible with keyword 'author' | |
|
2831 | hg: parse error: invalid date: 'test' | |
|
2832 | (template filter 'shortdate' is not compatible with keyword 'author') | |
|
2831 | 2833 | [255] |
|
2832 | 2834 | |
|
2833 | 2835 | $ hg tip -T '{get(extras, "branch")|shortdate}\n' |
|
2834 | abort: incompatible use of template filter 'shortdate' | |
|
2836 | hg: parse error: invalid date: 'default' | |
|
2837 | (incompatible use of template filter 'shortdate') | |
|
2835 | 2838 | [255] |
|
2836 | 2839 | |
|
2837 | 2840 | Error in nested template: |
|
2838 | 2841 | |
|
2839 | 2842 | $ hg log -T '{"date' |
|
2840 | 2843 | hg: parse error at 2: unterminated string |
|
2841 | 2844 | ({"date |
|
2842 | 2845 | ^ here) |
|
2843 | 2846 | [255] |
|
2844 | 2847 | |
|
2845 | 2848 | $ hg log -T '{"foo{date|?}"}' |
|
2846 | 2849 | hg: parse error at 11: syntax error |
|
2847 | 2850 | ({"foo{date|?}"} |
|
2848 | 2851 | ^ here) |
|
2849 | 2852 | [255] |
|
2850 | 2853 | |
|
2851 | 2854 | Thrown an error if a template function doesn't exist |
|
2852 | 2855 | |
|
2853 | 2856 | $ hg tip --template '{foo()}\n' |
|
2854 | 2857 | hg: parse error: unknown function 'foo' |
|
2855 | 2858 | [255] |
|
2856 | 2859 | |
|
2857 | 2860 | Pass generator object created by template function to filter |
|
2858 | 2861 | |
|
2859 | 2862 | $ hg log -l 1 --template '{if(author, author)|user}\n' |
|
2860 | 2863 | test |
|
2861 | 2864 | |
|
2862 | 2865 | Test index keyword: |
|
2863 | 2866 | |
|
2864 | 2867 | $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n' |
|
2865 | 2868 | 10 0:a 1:b 2:fifth 3:fourth 4:third |
|
2866 | 2869 | 11 0:a |
|
2867 | 2870 | |
|
2868 | 2871 | $ hg branches -T '{index} {branch}\n' |
|
2869 | 2872 | 0 default |
|
2870 | 2873 | 1 foo |
|
2871 | 2874 | |
|
2872 | 2875 | Test diff function: |
|
2873 | 2876 | |
|
2874 | 2877 | $ hg diff -c 8 |
|
2875 | 2878 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2876 | 2879 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2877 | 2880 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2878 | 2881 | @@ -0,0 +1,1 @@ |
|
2879 | 2882 | +second |
|
2880 | 2883 | diff -r 29114dbae42b -r 95c24699272e second |
|
2881 | 2884 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2882 | 2885 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2883 | 2886 | @@ -1,1 +0,0 @@ |
|
2884 | 2887 | -second |
|
2885 | 2888 | diff -r 29114dbae42b -r 95c24699272e third |
|
2886 | 2889 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2887 | 2890 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2888 | 2891 | @@ -0,0 +1,1 @@ |
|
2889 | 2892 | +third |
|
2890 | 2893 | |
|
2891 | 2894 | $ hg log -r 8 -T "{diff()}" |
|
2892 | 2895 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2893 | 2896 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2894 | 2897 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2895 | 2898 | @@ -0,0 +1,1 @@ |
|
2896 | 2899 | +second |
|
2897 | 2900 | diff -r 29114dbae42b -r 95c24699272e second |
|
2898 | 2901 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2899 | 2902 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2900 | 2903 | @@ -1,1 +0,0 @@ |
|
2901 | 2904 | -second |
|
2902 | 2905 | diff -r 29114dbae42b -r 95c24699272e third |
|
2903 | 2906 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2904 | 2907 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2905 | 2908 | @@ -0,0 +1,1 @@ |
|
2906 | 2909 | +third |
|
2907 | 2910 | |
|
2908 | 2911 | $ hg log -r 8 -T "{diff('glob:f*')}" |
|
2909 | 2912 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2910 | 2913 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2911 | 2914 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2912 | 2915 | @@ -0,0 +1,1 @@ |
|
2913 | 2916 | +second |
|
2914 | 2917 | |
|
2915 | 2918 | $ hg log -r 8 -T "{diff('', 'glob:f*')}" |
|
2916 | 2919 | diff -r 29114dbae42b -r 95c24699272e second |
|
2917 | 2920 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2918 | 2921 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2919 | 2922 | @@ -1,1 +0,0 @@ |
|
2920 | 2923 | -second |
|
2921 | 2924 | diff -r 29114dbae42b -r 95c24699272e third |
|
2922 | 2925 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2923 | 2926 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2924 | 2927 | @@ -0,0 +1,1 @@ |
|
2925 | 2928 | +third |
|
2926 | 2929 | |
|
2927 | 2930 | $ hg log -r 8 -T "{diff('FOURTH'|lower)}" |
|
2928 | 2931 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2929 | 2932 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2930 | 2933 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2931 | 2934 | @@ -0,0 +1,1 @@ |
|
2932 | 2935 | +second |
|
2933 | 2936 | |
|
2934 | 2937 | ui verbosity: |
|
2935 | 2938 | |
|
2936 | 2939 | $ hg log -l1 -T '{verbosity}\n' |
|
2937 | 2940 | |
|
2938 | 2941 | $ hg log -l1 -T '{verbosity}\n' --debug |
|
2939 | 2942 | debug |
|
2940 | 2943 | $ hg log -l1 -T '{verbosity}\n' --quiet |
|
2941 | 2944 | quiet |
|
2942 | 2945 | $ hg log -l1 -T '{verbosity}\n' --verbose |
|
2943 | 2946 | verbose |
|
2944 | 2947 | |
|
2945 | 2948 | $ cd .. |
|
2946 | 2949 | |
|
2947 | 2950 | |
|
2948 | 2951 | latesttag: |
|
2949 | 2952 | |
|
2950 | 2953 | $ hg init latesttag |
|
2951 | 2954 | $ cd latesttag |
|
2952 | 2955 | |
|
2953 | 2956 | $ echo a > file |
|
2954 | 2957 | $ hg ci -Am a -d '0 0' |
|
2955 | 2958 | adding file |
|
2956 | 2959 | |
|
2957 | 2960 | $ echo b >> file |
|
2958 | 2961 | $ hg ci -m b -d '1 0' |
|
2959 | 2962 | |
|
2960 | 2963 | $ echo c >> head1 |
|
2961 | 2964 | $ hg ci -Am h1c -d '2 0' |
|
2962 | 2965 | adding head1 |
|
2963 | 2966 | |
|
2964 | 2967 | $ hg update -q 1 |
|
2965 | 2968 | $ echo d >> head2 |
|
2966 | 2969 | $ hg ci -Am h2d -d '3 0' |
|
2967 | 2970 | adding head2 |
|
2968 | 2971 | created new head |
|
2969 | 2972 | |
|
2970 | 2973 | $ echo e >> head2 |
|
2971 | 2974 | $ hg ci -m h2e -d '4 0' |
|
2972 | 2975 | |
|
2973 | 2976 | $ hg merge -q |
|
2974 | 2977 | $ hg ci -m merge -d '5 -3600' |
|
2975 | 2978 | |
|
2976 | 2979 | No tag set: |
|
2977 | 2980 | |
|
2978 | 2981 | $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2979 | 2982 | @ 5: null+5 |
|
2980 | 2983 | |\ |
|
2981 | 2984 | | o 4: null+4 |
|
2982 | 2985 | | | |
|
2983 | 2986 | | o 3: null+3 |
|
2984 | 2987 | | | |
|
2985 | 2988 | o | 2: null+3 |
|
2986 | 2989 | |/ |
|
2987 | 2990 | o 1: null+2 |
|
2988 | 2991 | | |
|
2989 | 2992 | o 0: null+1 |
|
2990 | 2993 | |
|
2991 | 2994 | |
|
2992 | 2995 | One common tag: longest path wins for {latesttagdistance}: |
|
2993 | 2996 | |
|
2994 | 2997 | $ hg tag -r 1 -m t1 -d '6 0' t1 |
|
2995 | 2998 | $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2996 | 2999 | @ 6: t1+4 |
|
2997 | 3000 | | |
|
2998 | 3001 | o 5: t1+3 |
|
2999 | 3002 | |\ |
|
3000 | 3003 | | o 4: t1+2 |
|
3001 | 3004 | | | |
|
3002 | 3005 | | o 3: t1+1 |
|
3003 | 3006 | | | |
|
3004 | 3007 | o | 2: t1+1 |
|
3005 | 3008 | |/ |
|
3006 | 3009 | o 1: t1+0 |
|
3007 | 3010 | | |
|
3008 | 3011 | o 0: null+1 |
|
3009 | 3012 | |
|
3010 | 3013 | |
|
3011 | 3014 | One ancestor tag: closest wins: |
|
3012 | 3015 | |
|
3013 | 3016 | $ hg tag -r 2 -m t2 -d '7 0' t2 |
|
3014 | 3017 | $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
3015 | 3018 | @ 7: t2+3 |
|
3016 | 3019 | | |
|
3017 | 3020 | o 6: t2+2 |
|
3018 | 3021 | | |
|
3019 | 3022 | o 5: t2+1 |
|
3020 | 3023 | |\ |
|
3021 | 3024 | | o 4: t1+2 |
|
3022 | 3025 | | | |
|
3023 | 3026 | | o 3: t1+1 |
|
3024 | 3027 | | | |
|
3025 | 3028 | o | 2: t2+0 |
|
3026 | 3029 | |/ |
|
3027 | 3030 | o 1: t1+0 |
|
3028 | 3031 | | |
|
3029 | 3032 | o 0: null+1 |
|
3030 | 3033 | |
|
3031 | 3034 | |
|
3032 | 3035 | Two branch tags: more recent wins if same number of changes: |
|
3033 | 3036 | |
|
3034 | 3037 | $ hg tag -r 3 -m t3 -d '8 0' t3 |
|
3035 | 3038 | $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
3036 | 3039 | @ 8: t3+5 |
|
3037 | 3040 | | |
|
3038 | 3041 | o 7: t3+4 |
|
3039 | 3042 | | |
|
3040 | 3043 | o 6: t3+3 |
|
3041 | 3044 | | |
|
3042 | 3045 | o 5: t3+2 |
|
3043 | 3046 | |\ |
|
3044 | 3047 | | o 4: t3+1 |
|
3045 | 3048 | | | |
|
3046 | 3049 | | o 3: t3+0 |
|
3047 | 3050 | | | |
|
3048 | 3051 | o | 2: t2+0 |
|
3049 | 3052 | |/ |
|
3050 | 3053 | o 1: t1+0 |
|
3051 | 3054 | | |
|
3052 | 3055 | o 0: null+1 |
|
3053 | 3056 | |
|
3054 | 3057 | |
|
3055 | 3058 | Two branch tags: fewest changes wins: |
|
3056 | 3059 | |
|
3057 | 3060 | $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter |
|
3058 | 3061 | $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
|
3059 | 3062 | @ 9: t4+5,6 |
|
3060 | 3063 | | |
|
3061 | 3064 | o 8: t4+4,5 |
|
3062 | 3065 | | |
|
3063 | 3066 | o 7: t4+3,4 |
|
3064 | 3067 | | |
|
3065 | 3068 | o 6: t4+2,3 |
|
3066 | 3069 | | |
|
3067 | 3070 | o 5: t4+1,2 |
|
3068 | 3071 | |\ |
|
3069 | 3072 | | o 4: t4+0,0 |
|
3070 | 3073 | | | |
|
3071 | 3074 | | o 3: t3+0,0 |
|
3072 | 3075 | | | |
|
3073 | 3076 | o | 2: t2+0,0 |
|
3074 | 3077 | |/ |
|
3075 | 3078 | o 1: t1+0,0 |
|
3076 | 3079 | | |
|
3077 | 3080 | o 0: null+1,1 |
|
3078 | 3081 | |
|
3079 | 3082 | |
|
3080 | 3083 | Merged tag overrides: |
|
3081 | 3084 | |
|
3082 | 3085 | $ hg tag -r 5 -m t5 -d '9 0' t5 |
|
3083 | 3086 | $ hg tag -r 3 -m at3 -d '10 0' at3 |
|
3084 | 3087 | $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
3085 | 3088 | @ 11: t5+6 |
|
3086 | 3089 | | |
|
3087 | 3090 | o 10: t5+5 |
|
3088 | 3091 | | |
|
3089 | 3092 | o 9: t5+4 |
|
3090 | 3093 | | |
|
3091 | 3094 | o 8: t5+3 |
|
3092 | 3095 | | |
|
3093 | 3096 | o 7: t5+2 |
|
3094 | 3097 | | |
|
3095 | 3098 | o 6: t5+1 |
|
3096 | 3099 | | |
|
3097 | 3100 | o 5: t5+0 |
|
3098 | 3101 | |\ |
|
3099 | 3102 | | o 4: t4+0 |
|
3100 | 3103 | | | |
|
3101 | 3104 | | o 3: at3:t3+0 |
|
3102 | 3105 | | | |
|
3103 | 3106 | o | 2: t2+0 |
|
3104 | 3107 | |/ |
|
3105 | 3108 | o 1: t1+0 |
|
3106 | 3109 | | |
|
3107 | 3110 | o 0: null+1 |
|
3108 | 3111 | |
|
3109 | 3112 | |
|
3110 | 3113 | $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
|
3111 | 3114 | @ 11: t5+6,6 |
|
3112 | 3115 | | |
|
3113 | 3116 | o 10: t5+5,5 |
|
3114 | 3117 | | |
|
3115 | 3118 | o 9: t5+4,4 |
|
3116 | 3119 | | |
|
3117 | 3120 | o 8: t5+3,3 |
|
3118 | 3121 | | |
|
3119 | 3122 | o 7: t5+2,2 |
|
3120 | 3123 | | |
|
3121 | 3124 | o 6: t5+1,1 |
|
3122 | 3125 | | |
|
3123 | 3126 | o 5: t5+0,0 |
|
3124 | 3127 | |\ |
|
3125 | 3128 | | o 4: t4+0,0 |
|
3126 | 3129 | | | |
|
3127 | 3130 | | o 3: at3+0,0 t3+0,0 |
|
3128 | 3131 | | | |
|
3129 | 3132 | o | 2: t2+0,0 |
|
3130 | 3133 | |/ |
|
3131 | 3134 | o 1: t1+0,0 |
|
3132 | 3135 | | |
|
3133 | 3136 | o 0: null+1,1 |
|
3134 | 3137 | |
|
3135 | 3138 | |
|
3136 | 3139 | $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
|
3137 | 3140 | @ 11: t3, C: 9, D: 8 |
|
3138 | 3141 | | |
|
3139 | 3142 | o 10: t3, C: 8, D: 7 |
|
3140 | 3143 | | |
|
3141 | 3144 | o 9: t3, C: 7, D: 6 |
|
3142 | 3145 | | |
|
3143 | 3146 | o 8: t3, C: 6, D: 5 |
|
3144 | 3147 | | |
|
3145 | 3148 | o 7: t3, C: 5, D: 4 |
|
3146 | 3149 | | |
|
3147 | 3150 | o 6: t3, C: 4, D: 3 |
|
3148 | 3151 | | |
|
3149 | 3152 | o 5: t3, C: 3, D: 2 |
|
3150 | 3153 | |\ |
|
3151 | 3154 | | o 4: t3, C: 1, D: 1 |
|
3152 | 3155 | | | |
|
3153 | 3156 | | o 3: t3, C: 0, D: 0 |
|
3154 | 3157 | | | |
|
3155 | 3158 | o | 2: t1, C: 1, D: 1 |
|
3156 | 3159 | |/ |
|
3157 | 3160 | o 1: t1, C: 0, D: 0 |
|
3158 | 3161 | | |
|
3159 | 3162 | o 0: null, C: 1, D: 1 |
|
3160 | 3163 | |
|
3161 | 3164 | |
|
3162 | 3165 | $ cd .. |
|
3163 | 3166 | |
|
3164 | 3167 | |
|
3165 | 3168 | Style path expansion: issue1948 - ui.style option doesn't work on OSX |
|
3166 | 3169 | if it is a relative path |
|
3167 | 3170 | |
|
3168 | 3171 | $ mkdir -p home/styles |
|
3169 | 3172 | |
|
3170 | 3173 | $ cat > home/styles/teststyle <<EOF |
|
3171 | 3174 | > changeset = 'test {rev}:{node|short}\n' |
|
3172 | 3175 | > EOF |
|
3173 | 3176 | |
|
3174 | 3177 | $ HOME=`pwd`/home; export HOME |
|
3175 | 3178 | |
|
3176 | 3179 | $ cat > latesttag/.hg/hgrc <<EOF |
|
3177 | 3180 | > [ui] |
|
3178 | 3181 | > style = ~/styles/teststyle |
|
3179 | 3182 | > EOF |
|
3180 | 3183 | |
|
3181 | 3184 | $ hg -R latesttag tip |
|
3182 | 3185 | test 11:97e5943b523a |
|
3183 | 3186 | |
|
3184 | 3187 | Test recursive showlist template (issue1989): |
|
3185 | 3188 | |
|
3186 | 3189 | $ cat > style1989 <<EOF |
|
3187 | 3190 | > changeset = '{file_mods}{manifest}{extras}' |
|
3188 | 3191 | > file_mod = 'M|{author|person}\n' |
|
3189 | 3192 | > manifest = '{rev},{author}\n' |
|
3190 | 3193 | > extra = '{key}: {author}\n' |
|
3191 | 3194 | > EOF |
|
3192 | 3195 | |
|
3193 | 3196 | $ hg -R latesttag log -r tip --style=style1989 |
|
3194 | 3197 | M|test |
|
3195 | 3198 | 11,test |
|
3196 | 3199 | branch: test |
|
3197 | 3200 | |
|
3198 | 3201 | Test new-style inline templating: |
|
3199 | 3202 | |
|
3200 | 3203 | $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' |
|
3201 | 3204 | modified files: .hgtags |
|
3202 | 3205 | |
|
3203 | 3206 | |
|
3204 | 3207 | $ hg log -R latesttag -r tip -T '{rev % "a"}\n' |
|
3205 | 3208 | hg: parse error: keyword 'rev' is not iterable |
|
3206 | 3209 | [255] |
|
3207 | 3210 | $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n' |
|
3208 | 3211 | hg: parse error: None is not iterable |
|
3209 | 3212 | [255] |
|
3210 | 3213 | |
|
3211 | 3214 | Test new-style inline templating of non-list/dict type: |
|
3212 | 3215 | |
|
3213 | 3216 | $ hg log -R latesttag -r tip -T '{manifest}\n' |
|
3214 | 3217 | 11:2bc6e9006ce2 |
|
3215 | 3218 | $ hg log -R latesttag -r tip -T 'string length: {manifest|count}\n' |
|
3216 | 3219 | string length: 15 |
|
3217 | 3220 | $ hg log -R latesttag -r tip -T '{manifest % "{rev}:{node}"}\n' |
|
3218 | 3221 | 11:2bc6e9006ce29882383a22d39fd1f4e66dd3e2fc |
|
3219 | 3222 | |
|
3220 | 3223 | $ hg log -R latesttag -r tip -T '{get(extras, "branch") % "{key}: {value}\n"}' |
|
3221 | 3224 | branch: default |
|
3222 | 3225 | $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "{key}\n"}' |
|
3223 | 3226 | hg: parse error: None is not iterable |
|
3224 | 3227 | [255] |
|
3225 | 3228 | $ hg log -R latesttag -r tip -T '{min(extras) % "{key}: {value}\n"}' |
|
3226 | 3229 | branch: default |
|
3227 | 3230 | $ hg log -R latesttag -l1 -T '{min(revset("0:9")) % "{rev}:{node|short}\n"}' |
|
3228 | 3231 | 0:ce3cec86e6c2 |
|
3229 | 3232 | $ hg log -R latesttag -l1 -T '{max(revset("0:9")) % "{rev}:{node|short}\n"}' |
|
3230 | 3233 | 9:fbc7cd862e9c |
|
3231 | 3234 | |
|
3232 | 3235 | Test manifest/get() can be join()-ed as before, though it's silly: |
|
3233 | 3236 | |
|
3234 | 3237 | $ hg log -R latesttag -r tip -T '{join(manifest, "")}\n' |
|
3235 | 3238 | 11:2bc6e9006ce2 |
|
3236 | 3239 | $ hg log -R latesttag -r tip -T '{join(get(extras, "branch"), "")}\n' |
|
3237 | 3240 | default |
|
3238 | 3241 | |
|
3239 | 3242 | Test min/max of integers |
|
3240 | 3243 | |
|
3241 | 3244 | $ hg log -R latesttag -l1 -T '{min(revset("9:10"))}\n' |
|
3242 | 3245 | 9 |
|
3243 | 3246 | $ hg log -R latesttag -l1 -T '{max(revset("9:10"))}\n' |
|
3244 | 3247 | 10 |
|
3245 | 3248 | |
|
3246 | 3249 | Test min/max of if() result |
|
3247 | 3250 | |
|
3248 | 3251 | $ cd latesttag |
|
3249 | 3252 | $ hg log -l1 -T '{min(if(true, revset("9:10"), ""))}\n' |
|
3250 | 3253 | 9 |
|
3251 | 3254 | $ hg log -l1 -T '{max(if(false, "", revset("9:10")))}\n' |
|
3252 | 3255 | 10 |
|
3253 | 3256 | $ hg log -l1 -T '{min(ifcontains("a", "aa", revset("9:10"), ""))}\n' |
|
3254 | 3257 | 9 |
|
3255 | 3258 | $ hg log -l1 -T '{max(ifcontains("a", "bb", "", revset("9:10")))}\n' |
|
3256 | 3259 | 10 |
|
3257 | 3260 | $ hg log -l1 -T '{min(ifeq(0, 0, revset("9:10"), ""))}\n' |
|
3258 | 3261 | 9 |
|
3259 | 3262 | $ hg log -l1 -T '{max(ifeq(0, 1, "", revset("9:10")))}\n' |
|
3260 | 3263 | 10 |
|
3261 | 3264 | $ cd .. |
|
3262 | 3265 | |
|
3263 | 3266 | Test laziness of if() then/else clause |
|
3264 | 3267 | |
|
3265 | 3268 | $ hg debugtemplate '{count(0)}' |
|
3266 | 3269 | abort: incompatible use of template filter 'count' |
|
3267 | 3270 | [255] |
|
3268 | 3271 | $ hg debugtemplate '{if(true, "", count(0))}' |
|
3269 | 3272 | $ hg debugtemplate '{if(false, count(0), "")}' |
|
3270 | 3273 | $ hg debugtemplate '{ifcontains("a", "aa", "", count(0))}' |
|
3271 | 3274 | $ hg debugtemplate '{ifcontains("a", "bb", count(0), "")}' |
|
3272 | 3275 | $ hg debugtemplate '{ifeq(0, 0, "", count(0))}' |
|
3273 | 3276 | $ hg debugtemplate '{ifeq(0, 1, count(0), "")}' |
|
3274 | 3277 | |
|
3275 | 3278 | Test dot operator precedence: |
|
3276 | 3279 | |
|
3277 | 3280 | $ hg debugtemplate -R latesttag -r0 -v '{manifest.node|short}\n' |
|
3278 | 3281 | (template |
|
3279 | 3282 | (| |
|
3280 | 3283 | (. |
|
3281 | 3284 | (symbol 'manifest') |
|
3282 | 3285 | (symbol 'node')) |
|
3283 | 3286 | (symbol 'short')) |
|
3284 | 3287 | (string '\n')) |
|
3285 | 3288 | 89f4071fec70 |
|
3286 | 3289 | |
|
3287 | 3290 | (the following examples are invalid, but seem natural in parsing POV) |
|
3288 | 3291 | |
|
3289 | 3292 | $ hg debugtemplate -R latesttag -r0 -v '{foo|bar.baz}\n' 2> /dev/null |
|
3290 | 3293 | (template |
|
3291 | 3294 | (| |
|
3292 | 3295 | (symbol 'foo') |
|
3293 | 3296 | (. |
|
3294 | 3297 | (symbol 'bar') |
|
3295 | 3298 | (symbol 'baz'))) |
|
3296 | 3299 | (string '\n')) |
|
3297 | 3300 | [255] |
|
3298 | 3301 | $ hg debugtemplate -R latesttag -r0 -v '{foo.bar()}\n' 2> /dev/null |
|
3299 | 3302 | (template |
|
3300 | 3303 | (. |
|
3301 | 3304 | (symbol 'foo') |
|
3302 | 3305 | (func |
|
3303 | 3306 | (symbol 'bar') |
|
3304 | 3307 | None)) |
|
3305 | 3308 | (string '\n')) |
|
3306 | 3309 | [255] |
|
3307 | 3310 | |
|
3308 | 3311 | Test evaluation of dot operator: |
|
3309 | 3312 | |
|
3310 | 3313 | $ hg log -R latesttag -l1 -T '{min(revset("0:9")).node}\n' |
|
3311 | 3314 | ce3cec86e6c26bd9bdfc590a6b92abc9680f1796 |
|
3312 | 3315 | $ hg log -R latesttag -r0 -T '{extras.branch}\n' |
|
3313 | 3316 | default |
|
3314 | 3317 | |
|
3315 | 3318 | $ hg log -R latesttag -l1 -T '{author.invalid}\n' |
|
3316 | 3319 | hg: parse error: keyword 'author' has no member |
|
3317 | 3320 | [255] |
|
3318 | 3321 | $ hg log -R latesttag -l1 -T '{min("abc").invalid}\n' |
|
3319 | 3322 | hg: parse error: 'a' has no member |
|
3320 | 3323 | [255] |
|
3321 | 3324 | |
|
3322 | 3325 | Test the sub function of templating for expansion: |
|
3323 | 3326 | |
|
3324 | 3327 | $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n' |
|
3325 | 3328 | xx |
|
3326 | 3329 | |
|
3327 | 3330 | $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n' |
|
3328 | 3331 | hg: parse error: sub got an invalid pattern: [ |
|
3329 | 3332 | [255] |
|
3330 | 3333 | $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n' |
|
3331 | 3334 | hg: parse error: sub got an invalid replacement: \1 |
|
3332 | 3335 | [255] |
|
3333 | 3336 | |
|
3334 | 3337 | Test the strip function with chars specified: |
|
3335 | 3338 | |
|
3336 | 3339 | $ hg log -R latesttag --template '{desc}\n' |
|
3337 | 3340 | at3 |
|
3338 | 3341 | t5 |
|
3339 | 3342 | t4 |
|
3340 | 3343 | t3 |
|
3341 | 3344 | t2 |
|
3342 | 3345 | t1 |
|
3343 | 3346 | merge |
|
3344 | 3347 | h2e |
|
3345 | 3348 | h2d |
|
3346 | 3349 | h1c |
|
3347 | 3350 | b |
|
3348 | 3351 | a |
|
3349 | 3352 | |
|
3350 | 3353 | $ hg log -R latesttag --template '{strip(desc, "te")}\n' |
|
3351 | 3354 | at3 |
|
3352 | 3355 | 5 |
|
3353 | 3356 | 4 |
|
3354 | 3357 | 3 |
|
3355 | 3358 | 2 |
|
3356 | 3359 | 1 |
|
3357 | 3360 | merg |
|
3358 | 3361 | h2 |
|
3359 | 3362 | h2d |
|
3360 | 3363 | h1c |
|
3361 | 3364 | b |
|
3362 | 3365 | a |
|
3363 | 3366 | |
|
3364 | 3367 | Test date format: |
|
3365 | 3368 | |
|
3366 | 3369 | $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' |
|
3367 | 3370 | date: 70 01 01 10 +0000 |
|
3368 | 3371 | date: 70 01 01 09 +0000 |
|
3369 | 3372 | date: 70 01 01 04 +0000 |
|
3370 | 3373 | date: 70 01 01 08 +0000 |
|
3371 | 3374 | date: 70 01 01 07 +0000 |
|
3372 | 3375 | date: 70 01 01 06 +0000 |
|
3373 | 3376 | date: 70 01 01 05 +0100 |
|
3374 | 3377 | date: 70 01 01 04 +0000 |
|
3375 | 3378 | date: 70 01 01 03 +0000 |
|
3376 | 3379 | date: 70 01 01 02 +0000 |
|
3377 | 3380 | date: 70 01 01 01 +0000 |
|
3378 | 3381 | date: 70 01 01 00 +0000 |
|
3379 | 3382 | |
|
3380 | 3383 | Test invalid date: |
|
3381 | 3384 | |
|
3382 | 3385 | $ hg log -R latesttag -T '{date(rev)}\n' |
|
3383 | 3386 | hg: parse error: date expects a date information |
|
3384 | 3387 | [255] |
|
3385 | 3388 | |
|
3386 | 3389 | Test integer literal: |
|
3387 | 3390 | |
|
3388 | 3391 | $ hg debugtemplate -v '{(0)}\n' |
|
3389 | 3392 | (template |
|
3390 | 3393 | (group |
|
3391 | 3394 | (integer '0')) |
|
3392 | 3395 | (string '\n')) |
|
3393 | 3396 | 0 |
|
3394 | 3397 | $ hg debugtemplate -v '{(123)}\n' |
|
3395 | 3398 | (template |
|
3396 | 3399 | (group |
|
3397 | 3400 | (integer '123')) |
|
3398 | 3401 | (string '\n')) |
|
3399 | 3402 | 123 |
|
3400 | 3403 | $ hg debugtemplate -v '{(-4)}\n' |
|
3401 | 3404 | (template |
|
3402 | 3405 | (group |
|
3403 | 3406 | (negate |
|
3404 | 3407 | (integer '4'))) |
|
3405 | 3408 | (string '\n')) |
|
3406 | 3409 | -4 |
|
3407 | 3410 | $ hg debugtemplate '{(-)}\n' |
|
3408 | 3411 | hg: parse error at 3: not a prefix: ) |
|
3409 | 3412 | ({(-)}\n |
|
3410 | 3413 | ^ here) |
|
3411 | 3414 | [255] |
|
3412 | 3415 | $ hg debugtemplate '{(-a)}\n' |
|
3413 | 3416 | hg: parse error: negation needs an integer argument |
|
3414 | 3417 | [255] |
|
3415 | 3418 | |
|
3416 | 3419 | top-level integer literal is interpreted as symbol (i.e. variable name): |
|
3417 | 3420 | |
|
3418 | 3421 | $ hg debugtemplate -D 1=one -v '{1}\n' |
|
3419 | 3422 | (template |
|
3420 | 3423 | (integer '1') |
|
3421 | 3424 | (string '\n')) |
|
3422 | 3425 | one |
|
3423 | 3426 | $ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n' |
|
3424 | 3427 | (template |
|
3425 | 3428 | (func |
|
3426 | 3429 | (symbol 'if') |
|
3427 | 3430 | (list |
|
3428 | 3431 | (string 't') |
|
3429 | 3432 | (template |
|
3430 | 3433 | (integer '1')))) |
|
3431 | 3434 | (string '\n')) |
|
3432 | 3435 | one |
|
3433 | 3436 | $ hg debugtemplate -D 1=one -v '{1|stringify}\n' |
|
3434 | 3437 | (template |
|
3435 | 3438 | (| |
|
3436 | 3439 | (integer '1') |
|
3437 | 3440 | (symbol 'stringify')) |
|
3438 | 3441 | (string '\n')) |
|
3439 | 3442 | one |
|
3440 | 3443 | |
|
3441 | 3444 | unless explicit symbol is expected: |
|
3442 | 3445 | |
|
3443 | 3446 | $ hg log -Ra -r0 -T '{desc|1}\n' |
|
3444 | 3447 | hg: parse error: expected a symbol, got 'integer' |
|
3445 | 3448 | [255] |
|
3446 | 3449 | $ hg log -Ra -r0 -T '{1()}\n' |
|
3447 | 3450 | hg: parse error: expected a symbol, got 'integer' |
|
3448 | 3451 | [255] |
|
3449 | 3452 | |
|
3450 | 3453 | Test string literal: |
|
3451 | 3454 | |
|
3452 | 3455 | $ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n' |
|
3453 | 3456 | (template |
|
3454 | 3457 | (string 'string with no template fragment') |
|
3455 | 3458 | (string '\n')) |
|
3456 | 3459 | string with no template fragment |
|
3457 | 3460 | $ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n' |
|
3458 | 3461 | (template |
|
3459 | 3462 | (template |
|
3460 | 3463 | (string 'template: ') |
|
3461 | 3464 | (symbol 'rev')) |
|
3462 | 3465 | (string '\n')) |
|
3463 | 3466 | template: 0 |
|
3464 | 3467 | $ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n' |
|
3465 | 3468 | (template |
|
3466 | 3469 | (string 'rawstring: {rev}') |
|
3467 | 3470 | (string '\n')) |
|
3468 | 3471 | rawstring: {rev} |
|
3469 | 3472 | $ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n' |
|
3470 | 3473 | (template |
|
3471 | 3474 | (% |
|
3472 | 3475 | (symbol 'files') |
|
3473 | 3476 | (string 'rawstring: {file}')) |
|
3474 | 3477 | (string '\n')) |
|
3475 | 3478 | rawstring: {file} |
|
3476 | 3479 | |
|
3477 | 3480 | Test string escaping: |
|
3478 | 3481 | |
|
3479 | 3482 | $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
3480 | 3483 | > |
|
3481 | 3484 | <>\n<[> |
|
3482 | 3485 | <>\n<]> |
|
3483 | 3486 | <>\n< |
|
3484 | 3487 | |
|
3485 | 3488 | $ hg log -R latesttag -r 0 \ |
|
3486 | 3489 | > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
3487 | 3490 | > |
|
3488 | 3491 | <>\n<[> |
|
3489 | 3492 | <>\n<]> |
|
3490 | 3493 | <>\n< |
|
3491 | 3494 | |
|
3492 | 3495 | $ hg log -R latesttag -r 0 -T esc \ |
|
3493 | 3496 | > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
3494 | 3497 | > |
|
3495 | 3498 | <>\n<[> |
|
3496 | 3499 | <>\n<]> |
|
3497 | 3500 | <>\n< |
|
3498 | 3501 | |
|
3499 | 3502 | $ cat <<'EOF' > esctmpl |
|
3500 | 3503 | > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
3501 | 3504 | > EOF |
|
3502 | 3505 | $ hg log -R latesttag -r 0 --style ./esctmpl |
|
3503 | 3506 | > |
|
3504 | 3507 | <>\n<[> |
|
3505 | 3508 | <>\n<]> |
|
3506 | 3509 | <>\n< |
|
3507 | 3510 | |
|
3508 | 3511 | Test string escaping of quotes: |
|
3509 | 3512 | |
|
3510 | 3513 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
3511 | 3514 | " |
|
3512 | 3515 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
3513 | 3516 | \" |
|
3514 | 3517 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
3515 | 3518 | \" |
|
3516 | 3519 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
3517 | 3520 | \\\" |
|
3518 | 3521 | |
|
3519 | 3522 | |
|
3520 | 3523 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
3521 | 3524 | " |
|
3522 | 3525 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
3523 | 3526 | \" |
|
3524 | 3527 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
3525 | 3528 | \" |
|
3526 | 3529 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
3527 | 3530 | \\\" |
|
3528 | 3531 | |
|
3529 | 3532 | Test exception in quoted template. single backslash before quotation mark is |
|
3530 | 3533 | stripped before parsing: |
|
3531 | 3534 | |
|
3532 | 3535 | $ cat <<'EOF' > escquotetmpl |
|
3533 | 3536 | > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n" |
|
3534 | 3537 | > EOF |
|
3535 | 3538 | $ cd latesttag |
|
3536 | 3539 | $ hg log -r 2 --style ../escquotetmpl |
|
3537 | 3540 | " \" \" \\" head1 |
|
3538 | 3541 | |
|
3539 | 3542 | $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"' |
|
3540 | 3543 | valid |
|
3541 | 3544 | $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'" |
|
3542 | 3545 | valid |
|
3543 | 3546 | |
|
3544 | 3547 | Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested |
|
3545 | 3548 | _evalifliteral() templates (issue4733): |
|
3546 | 3549 | |
|
3547 | 3550 | $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n' |
|
3548 | 3551 | "2 |
|
3549 | 3552 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n' |
|
3550 | 3553 | "2 |
|
3551 | 3554 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n' |
|
3552 | 3555 | "2 |
|
3553 | 3556 | |
|
3554 | 3557 | $ hg log -r 2 -T '{if(rev, "\\\"")}\n' |
|
3555 | 3558 | \" |
|
3556 | 3559 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n' |
|
3557 | 3560 | \" |
|
3558 | 3561 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
3559 | 3562 | \" |
|
3560 | 3563 | |
|
3561 | 3564 | $ hg log -r 2 -T '{if(rev, r"\\\"")}\n' |
|
3562 | 3565 | \\\" |
|
3563 | 3566 | $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n' |
|
3564 | 3567 | \\\" |
|
3565 | 3568 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
3566 | 3569 | \\\" |
|
3567 | 3570 | |
|
3568 | 3571 | escaped single quotes and errors: |
|
3569 | 3572 | |
|
3570 | 3573 | $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n' |
|
3571 | 3574 | foo |
|
3572 | 3575 | $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n' |
|
3573 | 3576 | foo |
|
3574 | 3577 | $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n' |
|
3575 | 3578 | hg: parse error at 21: unterminated string |
|
3576 | 3579 | ({if(rev, "{if(rev, \")}")}\n |
|
3577 | 3580 | ^ here) |
|
3578 | 3581 | [255] |
|
3579 | 3582 | $ hg log -r 2 -T '{if(rev, \"\\"")}\n' |
|
3580 | 3583 | hg: parse error: trailing \ in string |
|
3581 | 3584 | [255] |
|
3582 | 3585 | $ hg log -r 2 -T '{if(rev, r\"\\"")}\n' |
|
3583 | 3586 | hg: parse error: trailing \ in string |
|
3584 | 3587 | [255] |
|
3585 | 3588 | |
|
3586 | 3589 | $ cd .. |
|
3587 | 3590 | |
|
3588 | 3591 | Test leading backslashes: |
|
3589 | 3592 | |
|
3590 | 3593 | $ cd latesttag |
|
3591 | 3594 | $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n' |
|
3592 | 3595 | {rev} {file} |
|
3593 | 3596 | $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n' |
|
3594 | 3597 | \2 \head1 |
|
3595 | 3598 | $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n' |
|
3596 | 3599 | \{rev} \{file} |
|
3597 | 3600 | $ cd .. |
|
3598 | 3601 | |
|
3599 | 3602 | Test leading backslashes in "if" expression (issue4714): |
|
3600 | 3603 | |
|
3601 | 3604 | $ cd latesttag |
|
3602 | 3605 | $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n' |
|
3603 | 3606 | {rev} \{rev} |
|
3604 | 3607 | $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n' |
|
3605 | 3608 | \2 \\{rev} |
|
3606 | 3609 | $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n' |
|
3607 | 3610 | \{rev} \\\{rev} |
|
3608 | 3611 | $ cd .. |
|
3609 | 3612 | |
|
3610 | 3613 | "string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice) |
|
3611 | 3614 | |
|
3612 | 3615 | $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n' |
|
3613 | 3616 | \x6e |
|
3614 | 3617 | $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n' |
|
3615 | 3618 | \x5c\x786e |
|
3616 | 3619 | $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n' |
|
3617 | 3620 | \x6e |
|
3618 | 3621 | $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n' |
|
3619 | 3622 | \x5c\x786e |
|
3620 | 3623 | |
|
3621 | 3624 | $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n' |
|
3622 | 3625 | \x6e |
|
3623 | 3626 | $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n' |
|
3624 | 3627 | \x5c\x786e |
|
3625 | 3628 | $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n' |
|
3626 | 3629 | \x6e |
|
3627 | 3630 | $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n' |
|
3628 | 3631 | \x5c\x786e |
|
3629 | 3632 | |
|
3630 | 3633 | $ hg log -R a -r 8 --template '{join(files, "\n")}\n' |
|
3631 | 3634 | fourth |
|
3632 | 3635 | second |
|
3633 | 3636 | third |
|
3634 | 3637 | $ hg log -R a -r 8 --template '{join(files, r"\n")}\n' |
|
3635 | 3638 | fourth\nsecond\nthird |
|
3636 | 3639 | |
|
3637 | 3640 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}' |
|
3638 | 3641 | <p> |
|
3639 | 3642 | 1st |
|
3640 | 3643 | </p> |
|
3641 | 3644 | <p> |
|
3642 | 3645 | 2nd |
|
3643 | 3646 | </p> |
|
3644 | 3647 | $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}' |
|
3645 | 3648 | <p> |
|
3646 | 3649 | 1st\n\n2nd |
|
3647 | 3650 | </p> |
|
3648 | 3651 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}' |
|
3649 | 3652 | 1st |
|
3650 | 3653 | |
|
3651 | 3654 | 2nd |
|
3652 | 3655 | |
|
3653 | 3656 | $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n' |
|
3654 | 3657 | o perso |
|
3655 | 3658 | $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n' |
|
3656 | 3659 | no person |
|
3657 | 3660 | $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n' |
|
3658 | 3661 | o perso |
|
3659 | 3662 | $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n' |
|
3660 | 3663 | no perso |
|
3661 | 3664 | |
|
3662 | 3665 | $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n' |
|
3663 | 3666 | -o perso- |
|
3664 | 3667 | $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n' |
|
3665 | 3668 | no person |
|
3666 | 3669 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n' |
|
3667 | 3670 | \x2do perso\x2d |
|
3668 | 3671 | $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n' |
|
3669 | 3672 | -o perso- |
|
3670 | 3673 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n' |
|
3671 | 3674 | \x2do perso\x6e |
|
3672 | 3675 | |
|
3673 | 3676 | $ hg log -R a -r 8 --template '{files % "{file}\n"}' |
|
3674 | 3677 | fourth |
|
3675 | 3678 | second |
|
3676 | 3679 | third |
|
3677 | 3680 | |
|
3678 | 3681 | Test string escaping in nested expression: |
|
3679 | 3682 | |
|
3680 | 3683 | $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n' |
|
3681 | 3684 | fourth\x6esecond\x6ethird |
|
3682 | 3685 | $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n' |
|
3683 | 3686 | fourth\x6esecond\x6ethird |
|
3684 | 3687 | |
|
3685 | 3688 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n' |
|
3686 | 3689 | fourth\x6esecond\x6ethird |
|
3687 | 3690 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n' |
|
3688 | 3691 | fourth\x5c\x786esecond\x5c\x786ethird |
|
3689 | 3692 | |
|
3690 | 3693 | $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n' |
|
3691 | 3694 | 3:\x6eo user, \x6eo domai\x6e |
|
3692 | 3695 | 4:\x5c\x786eew bra\x5c\x786ech |
|
3693 | 3696 | |
|
3694 | 3697 | Test quotes in nested expression are evaluated just like a $(command) |
|
3695 | 3698 | substitution in POSIX shells: |
|
3696 | 3699 | |
|
3697 | 3700 | $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n' |
|
3698 | 3701 | 8:95c24699272e |
|
3699 | 3702 | $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n' |
|
3700 | 3703 | {8} "95c24699272e" |
|
3701 | 3704 | |
|
3702 | 3705 | Test recursive evaluation: |
|
3703 | 3706 | |
|
3704 | 3707 | $ hg init r |
|
3705 | 3708 | $ cd r |
|
3706 | 3709 | $ echo a > a |
|
3707 | 3710 | $ hg ci -Am '{rev}' |
|
3708 | 3711 | adding a |
|
3709 | 3712 | $ hg log -r 0 --template '{if(rev, desc)}\n' |
|
3710 | 3713 | {rev} |
|
3711 | 3714 | $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n' |
|
3712 | 3715 | test 0 |
|
3713 | 3716 | |
|
3714 | 3717 | $ hg branch -q 'text.{rev}' |
|
3715 | 3718 | $ echo aa >> aa |
|
3716 | 3719 | $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped' |
|
3717 | 3720 | |
|
3718 | 3721 | $ hg log -l1 --template '{fill(desc, "20", author, branch)}' |
|
3719 | 3722 | {node|short}desc to |
|
3720 | 3723 | text.{rev}be wrapped |
|
3721 | 3724 | text.{rev}desc to be |
|
3722 | 3725 | text.{rev}wrapped (no-eol) |
|
3723 | 3726 | $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}' |
|
3724 | 3727 | bcc7ff960b8e:desc to |
|
3725 | 3728 | text.1:be wrapped |
|
3726 | 3729 | text.1:desc to be |
|
3727 | 3730 | text.1:wrapped (no-eol) |
|
3728 | 3731 | $ hg log -l1 -T '{fill(desc, date, "", "")}\n' |
|
3729 | 3732 | hg: parse error: fill expects an integer width |
|
3730 | 3733 | [255] |
|
3731 | 3734 | |
|
3732 | 3735 | $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}' |
|
3733 | 3736 | bcc7ff960b8e:desc to be |
|
3734 | 3737 | termwidth.1:wrapped desc |
|
3735 | 3738 | termwidth.1:to be wrapped (no-eol) |
|
3736 | 3739 | |
|
3737 | 3740 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}' |
|
3738 | 3741 | {node|short} (no-eol) |
|
3739 | 3742 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}' |
|
3740 | 3743 | bcc-ff---b-e (no-eol) |
|
3741 | 3744 | |
|
3742 | 3745 | $ cat >> .hg/hgrc <<EOF |
|
3743 | 3746 | > [extensions] |
|
3744 | 3747 | > color= |
|
3745 | 3748 | > [color] |
|
3746 | 3749 | > mode=ansi |
|
3747 | 3750 | > text.{rev} = red |
|
3748 | 3751 | > text.1 = green |
|
3749 | 3752 | > EOF |
|
3750 | 3753 | $ hg log --color=always -l 1 --template '{label(branch, "text\n")}' |
|
3751 | 3754 | \x1b[0;31mtext\x1b[0m (esc) |
|
3752 | 3755 | $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}' |
|
3753 | 3756 | \x1b[0;32mtext\x1b[0m (esc) |
|
3754 | 3757 | |
|
3755 | 3758 | color effect can be specified without quoting: |
|
3756 | 3759 | |
|
3757 | 3760 | $ hg log --color=always -l 1 --template '{label(red, "text\n")}' |
|
3758 | 3761 | \x1b[0;31mtext\x1b[0m (esc) |
|
3759 | 3762 | |
|
3760 | 3763 | color effects can be nested (issue5413) |
|
3761 | 3764 | |
|
3762 | 3765 | $ hg debugtemplate --color=always \ |
|
3763 | 3766 | > '{label(red, "red{label(magenta, "ma{label(cyan, "cyan")}{label(yellow, "yellow")}genta")}")}\n' |
|
3764 | 3767 | \x1b[0;31mred\x1b[0;35mma\x1b[0;36mcyan\x1b[0m\x1b[0;31m\x1b[0;35m\x1b[0;33myellow\x1b[0m\x1b[0;31m\x1b[0;35mgenta\x1b[0m (esc) |
|
3765 | 3768 | |
|
3766 | 3769 | pad() should interact well with color codes (issue5416) |
|
3767 | 3770 | |
|
3768 | 3771 | $ hg debugtemplate --color=always \ |
|
3769 | 3772 | > '{pad(label(red, "red"), 5, label(cyan, "-"))}\n' |
|
3770 | 3773 | \x1b[0;31mred\x1b[0m\x1b[0;36m-\x1b[0m\x1b[0;36m-\x1b[0m (esc) |
|
3771 | 3774 | |
|
3772 | 3775 | label should be no-op if color is disabled: |
|
3773 | 3776 | |
|
3774 | 3777 | $ hg log --color=never -l 1 --template '{label(red, "text\n")}' |
|
3775 | 3778 | text |
|
3776 | 3779 | $ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}' |
|
3777 | 3780 | text |
|
3778 | 3781 | |
|
3779 | 3782 | Test branches inside if statement: |
|
3780 | 3783 | |
|
3781 | 3784 | $ hg log -r 0 --template '{if(branches, "yes", "no")}\n' |
|
3782 | 3785 | no |
|
3783 | 3786 | |
|
3784 | 3787 | Test dict constructor: |
|
3785 | 3788 | |
|
3786 | 3789 | $ hg log -r 0 -T '{dict(y=node|short, x=rev)}\n' |
|
3787 | 3790 | y=f7769ec2ab97 x=0 |
|
3788 | 3791 | $ hg log -r 0 -T '{dict(x=rev, y=node|short) % "{key}={value}\n"}' |
|
3789 | 3792 | x=0 |
|
3790 | 3793 | y=f7769ec2ab97 |
|
3791 | 3794 | $ hg log -r 0 -T '{dict(x=rev, y=node|short)|json}\n' |
|
3792 | 3795 | {"x": 0, "y": "f7769ec2ab97"} |
|
3793 | 3796 | $ hg log -r 0 -T '{dict()|json}\n' |
|
3794 | 3797 | {} |
|
3795 | 3798 | |
|
3796 | 3799 | $ hg log -r 0 -T '{dict(rev, node=node|short)}\n' |
|
3797 | 3800 | rev=0 node=f7769ec2ab97 |
|
3798 | 3801 | $ hg log -r 0 -T '{dict(rev, node|short)}\n' |
|
3799 | 3802 | rev=0 node=f7769ec2ab97 |
|
3800 | 3803 | |
|
3801 | 3804 | $ hg log -r 0 -T '{dict(rev, rev=rev)}\n' |
|
3802 | 3805 | hg: parse error: duplicated dict key 'rev' inferred |
|
3803 | 3806 | [255] |
|
3804 | 3807 | $ hg log -r 0 -T '{dict(node, node|short)}\n' |
|
3805 | 3808 | hg: parse error: duplicated dict key 'node' inferred |
|
3806 | 3809 | [255] |
|
3807 | 3810 | $ hg log -r 0 -T '{dict(1 + 2)}' |
|
3808 | 3811 | hg: parse error: dict key cannot be inferred |
|
3809 | 3812 | [255] |
|
3810 | 3813 | |
|
3811 | 3814 | $ hg log -r 0 -T '{dict(x=rev, x=node)}' |
|
3812 | 3815 | hg: parse error: dict got multiple values for keyword argument 'x' |
|
3813 | 3816 | [255] |
|
3814 | 3817 | |
|
3815 | 3818 | Test get function: |
|
3816 | 3819 | |
|
3817 | 3820 | $ hg log -r 0 --template '{get(extras, "branch")}\n' |
|
3818 | 3821 | default |
|
3819 | 3822 | $ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n' |
|
3820 | 3823 | default |
|
3821 | 3824 | $ hg log -r 0 --template '{get(files, "should_fail")}\n' |
|
3822 | 3825 | hg: parse error: get() expects a dict as first argument |
|
3823 | 3826 | [255] |
|
3824 | 3827 | |
|
3825 | 3828 | Test json filter applied to hybrid object: |
|
3826 | 3829 | |
|
3827 | 3830 | $ hg log -r0 -T '{files|json}\n' |
|
3828 | 3831 | ["a"] |
|
3829 | 3832 | $ hg log -r0 -T '{extras|json}\n' |
|
3830 | 3833 | {"branch": "default"} |
|
3831 | 3834 | |
|
3832 | 3835 | Test localdate(date, tz) function: |
|
3833 | 3836 | |
|
3834 | 3837 | $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n' |
|
3835 | 3838 | 1970-01-01 09:00 +0900 |
|
3836 | 3839 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n' |
|
3837 | 3840 | 1970-01-01 00:00 +0000 |
|
3838 | 3841 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "blahUTC")|isodate}\n' |
|
3839 | 3842 | hg: parse error: localdate expects a timezone |
|
3840 | 3843 | [255] |
|
3841 | 3844 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n' |
|
3842 | 3845 | 1970-01-01 02:00 +0200 |
|
3843 | 3846 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n' |
|
3844 | 3847 | 1970-01-01 00:00 +0000 |
|
3845 | 3848 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n' |
|
3846 | 3849 | 1970-01-01 00:00 +0000 |
|
3847 | 3850 | $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n' |
|
3848 | 3851 | hg: parse error: localdate expects a timezone |
|
3849 | 3852 | [255] |
|
3850 | 3853 | $ hg log -r0 -T '{localdate(date, date)|isodate}\n' |
|
3851 | 3854 | hg: parse error: localdate expects a timezone |
|
3852 | 3855 | [255] |
|
3853 | 3856 | |
|
3854 | 3857 | Test shortest(node) function: |
|
3855 | 3858 | |
|
3856 | 3859 | $ echo b > b |
|
3857 | 3860 | $ hg ci -qAm b |
|
3858 | 3861 | $ hg log --template '{shortest(node)}\n' |
|
3859 | 3862 | e777 |
|
3860 | 3863 | bcc7 |
|
3861 | 3864 | f776 |
|
3862 | 3865 | $ hg log --template '{shortest(node, 10)}\n' |
|
3863 | 3866 | e777603221 |
|
3864 | 3867 | bcc7ff960b |
|
3865 | 3868 | f7769ec2ab |
|
3866 | 3869 | $ hg log --template '{node|shortest}\n' -l1 |
|
3867 | 3870 | e777 |
|
3868 | 3871 | |
|
3869 | 3872 | $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n' |
|
3870 | 3873 | f7769ec2ab |
|
3871 | 3874 | $ hg log -r 0 -T '{shortest(node, "not an int")}\n' |
|
3872 | 3875 | hg: parse error: shortest() expects an integer minlength |
|
3873 | 3876 | [255] |
|
3874 | 3877 | |
|
3875 | 3878 | $ hg log -r 'wdir()' -T '{node|shortest}\n' |
|
3876 | 3879 | ffff |
|
3877 | 3880 | |
|
3878 | 3881 | $ cd .. |
|
3879 | 3882 | |
|
3880 | 3883 | Test shortest(node) with the repo having short hash collision: |
|
3881 | 3884 | |
|
3882 | 3885 | $ hg init hashcollision |
|
3883 | 3886 | $ cd hashcollision |
|
3884 | 3887 | $ cat <<EOF >> .hg/hgrc |
|
3885 | 3888 | > [experimental] |
|
3886 | 3889 | > evolution.createmarkers=True |
|
3887 | 3890 | > EOF |
|
3888 | 3891 | $ echo 0 > a |
|
3889 | 3892 | $ hg ci -qAm 0 |
|
3890 | 3893 | $ for i in 17 129 248 242 480 580 617 1057 2857 4025; do |
|
3891 | 3894 | > hg up -q 0 |
|
3892 | 3895 | > echo $i > a |
|
3893 | 3896 | > hg ci -qm $i |
|
3894 | 3897 | > done |
|
3895 | 3898 | $ hg up -q null |
|
3896 | 3899 | $ hg log -r0: -T '{rev}:{node}\n' |
|
3897 | 3900 | 0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a |
|
3898 | 3901 | 1:11424df6dc1dd4ea255eae2b58eaca7831973bbc |
|
3899 | 3902 | 2:11407b3f1b9c3e76a79c1ec5373924df096f0499 |
|
3900 | 3903 | 3:11dd92fe0f39dfdaacdaa5f3997edc533875cfc4 |
|
3901 | 3904 | 4:10776689e627b465361ad5c296a20a487e153ca4 |
|
3902 | 3905 | 5:a00be79088084cb3aff086ab799f8790e01a976b |
|
3903 | 3906 | 6:a0b0acd79b4498d0052993d35a6a748dd51d13e6 |
|
3904 | 3907 | 7:a0457b3450b8e1b778f1163b31a435802987fe5d |
|
3905 | 3908 | 8:c56256a09cd28e5764f32e8e2810d0f01e2e357a |
|
3906 | 3909 | 9:c5623987d205cd6d9d8389bfc40fff9dbb670b48 |
|
3907 | 3910 | 10:c562ddd9c94164376c20b86b0b4991636a3bf84f |
|
3908 | 3911 | $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b |
|
3909 | 3912 | obsoleted 1 changesets |
|
3910 | 3913 | $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48 |
|
3911 | 3914 | obsoleted 1 changesets |
|
3912 | 3915 | $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f |
|
3913 | 3916 | obsoleted 1 changesets |
|
3914 | 3917 | |
|
3915 | 3918 | nodes starting with '11' (we don't have the revision number '11' though) |
|
3916 | 3919 | |
|
3917 | 3920 | $ hg log -r 1:3 -T '{rev}:{shortest(node, 0)}\n' |
|
3918 | 3921 | 1:1142 |
|
3919 | 3922 | 2:1140 |
|
3920 | 3923 | 3:11d |
|
3921 | 3924 | |
|
3922 | 3925 | '5:a00' is hidden, but still we have two nodes starting with 'a0' |
|
3923 | 3926 | |
|
3924 | 3927 | $ hg log -r 6:7 -T '{rev}:{shortest(node, 0)}\n' |
|
3925 | 3928 | 6:a0b |
|
3926 | 3929 | 7:a04 |
|
3927 | 3930 | |
|
3928 | 3931 | node '10' conflicts with the revision number '10' even if it is hidden |
|
3929 | 3932 | (we could exclude hidden revision numbers, but currently we don't) |
|
3930 | 3933 | |
|
3931 | 3934 | $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' |
|
3932 | 3935 | 4:107 |
|
3933 | 3936 | $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden |
|
3934 | 3937 | 4:107 |
|
3935 | 3938 | |
|
3936 | 3939 | node 'c562' should be unique if the other 'c562' nodes are hidden |
|
3937 | 3940 | (but we don't try the slow path to filter out hidden nodes for now) |
|
3938 | 3941 | |
|
3939 | 3942 | $ hg log -r 8 -T '{rev}:{node|shortest}\n' |
|
3940 | 3943 | 8:c5625 |
|
3941 | 3944 | $ hg log -r 8:10 -T '{rev}:{node|shortest}\n' --hidden |
|
3942 | 3945 | 8:c5625 |
|
3943 | 3946 | 9:c5623 |
|
3944 | 3947 | 10:c562d |
|
3945 | 3948 | |
|
3946 | 3949 | $ cd .. |
|
3947 | 3950 | |
|
3948 | 3951 | Test pad function |
|
3949 | 3952 | |
|
3950 | 3953 | $ cd r |
|
3951 | 3954 | |
|
3952 | 3955 | $ hg log --template '{pad(rev, 20)} {author|user}\n' |
|
3953 | 3956 | 2 test |
|
3954 | 3957 | 1 {node|short} |
|
3955 | 3958 | 0 test |
|
3956 | 3959 | |
|
3957 | 3960 | $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n' |
|
3958 | 3961 | 2 test |
|
3959 | 3962 | 1 {node|short} |
|
3960 | 3963 | 0 test |
|
3961 | 3964 | |
|
3962 | 3965 | $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n' |
|
3963 | 3966 | 2------------------- test |
|
3964 | 3967 | 1------------------- {node|short} |
|
3965 | 3968 | 0------------------- test |
|
3966 | 3969 | |
|
3967 | 3970 | Test template string in pad function |
|
3968 | 3971 | |
|
3969 | 3972 | $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n' |
|
3970 | 3973 | {0} test |
|
3971 | 3974 | |
|
3972 | 3975 | $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n' |
|
3973 | 3976 | \{rev} test |
|
3974 | 3977 | |
|
3975 | 3978 | Test width argument passed to pad function |
|
3976 | 3979 | |
|
3977 | 3980 | $ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n' |
|
3978 | 3981 | 0 test |
|
3979 | 3982 | $ hg log -r 0 -T '{pad(rev, "not an int")}\n' |
|
3980 | 3983 | hg: parse error: pad() expects an integer width |
|
3981 | 3984 | [255] |
|
3982 | 3985 | |
|
3983 | 3986 | Test invalid fillchar passed to pad function |
|
3984 | 3987 | |
|
3985 | 3988 | $ hg log -r 0 -T '{pad(rev, 10, "")}\n' |
|
3986 | 3989 | hg: parse error: pad() expects a single fill character |
|
3987 | 3990 | [255] |
|
3988 | 3991 | $ hg log -r 0 -T '{pad(rev, 10, "--")}\n' |
|
3989 | 3992 | hg: parse error: pad() expects a single fill character |
|
3990 | 3993 | [255] |
|
3991 | 3994 | |
|
3992 | 3995 | Test boolean argument passed to pad function |
|
3993 | 3996 | |
|
3994 | 3997 | no crash |
|
3995 | 3998 | |
|
3996 | 3999 | $ hg log -r 0 -T '{pad(rev, 10, "-", "f{"oo"}")}\n' |
|
3997 | 4000 | ---------0 |
|
3998 | 4001 | |
|
3999 | 4002 | string/literal |
|
4000 | 4003 | |
|
4001 | 4004 | $ hg log -r 0 -T '{pad(rev, 10, "-", "false")}\n' |
|
4002 | 4005 | ---------0 |
|
4003 | 4006 | $ hg log -r 0 -T '{pad(rev, 10, "-", false)}\n' |
|
4004 | 4007 | 0--------- |
|
4005 | 4008 | $ hg log -r 0 -T '{pad(rev, 10, "-", "")}\n' |
|
4006 | 4009 | 0--------- |
|
4007 | 4010 | |
|
4008 | 4011 | unknown keyword is evaluated to '' |
|
4009 | 4012 | |
|
4010 | 4013 | $ hg log -r 0 -T '{pad(rev, 10, "-", unknownkeyword)}\n' |
|
4011 | 4014 | 0--------- |
|
4012 | 4015 | |
|
4013 | 4016 | Test separate function |
|
4014 | 4017 | |
|
4015 | 4018 | $ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n' |
|
4016 | 4019 | a-b-c |
|
4017 | 4020 | $ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n' |
|
4018 | 4021 | 0:f7769ec2ab97 test default |
|
4019 | 4022 | $ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n' |
|
4020 | 4023 | a \x1b[0;31mb\x1b[0m c d (esc) |
|
4021 | 4024 | |
|
4022 | 4025 | Test boolean expression/literal passed to if function |
|
4023 | 4026 | |
|
4024 | 4027 | $ hg log -r 0 -T '{if(rev, "rev 0 is True")}\n' |
|
4025 | 4028 | rev 0 is True |
|
4026 | 4029 | $ hg log -r 0 -T '{if(0, "literal 0 is True as well")}\n' |
|
4027 | 4030 | literal 0 is True as well |
|
4028 | 4031 | $ hg log -r 0 -T '{if("", "", "empty string is False")}\n' |
|
4029 | 4032 | empty string is False |
|
4030 | 4033 | $ hg log -r 0 -T '{if(revset(r"0 - 0"), "", "empty list is False")}\n' |
|
4031 | 4034 | empty list is False |
|
4032 | 4035 | $ hg log -r 0 -T '{if(true, "true is True")}\n' |
|
4033 | 4036 | true is True |
|
4034 | 4037 | $ hg log -r 0 -T '{if(false, "", "false is False")}\n' |
|
4035 | 4038 | false is False |
|
4036 | 4039 | $ hg log -r 0 -T '{if("false", "non-empty string is True")}\n' |
|
4037 | 4040 | non-empty string is True |
|
4038 | 4041 | |
|
4039 | 4042 | Test ifcontains function |
|
4040 | 4043 | |
|
4041 | 4044 | $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n' |
|
4042 | 4045 | 2 is in the string |
|
4043 | 4046 | 1 is not |
|
4044 | 4047 | 0 is in the string |
|
4045 | 4048 | |
|
4046 | 4049 | $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n' |
|
4047 | 4050 | 2 is in the string |
|
4048 | 4051 | 1 is not |
|
4049 | 4052 | 0 is in the string |
|
4050 | 4053 | |
|
4051 | 4054 | $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n' |
|
4052 | 4055 | 2 did not add a |
|
4053 | 4056 | 1 did not add a |
|
4054 | 4057 | 0 added a |
|
4055 | 4058 | |
|
4056 | 4059 | $ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n' |
|
4057 | 4060 | 2 is parent of 1 |
|
4058 | 4061 | 1 |
|
4059 | 4062 | 0 |
|
4060 | 4063 | |
|
4061 | 4064 | Test revset function |
|
4062 | 4065 | |
|
4063 | 4066 | $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n' |
|
4064 | 4067 | 2 current rev |
|
4065 | 4068 | 1 not current rev |
|
4066 | 4069 | 0 not current rev |
|
4067 | 4070 | |
|
4068 | 4071 | $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n' |
|
4069 | 4072 | 2 match rev |
|
4070 | 4073 | 1 match rev |
|
4071 | 4074 | 0 not match rev |
|
4072 | 4075 | |
|
4073 | 4076 | $ hg log -T '{ifcontains(desc, revset(":"), "", "type not match")}\n' -l1 |
|
4074 | 4077 | type not match |
|
4075 | 4078 | |
|
4076 | 4079 | $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n' |
|
4077 | 4080 | 2 Parents: 1 |
|
4078 | 4081 | 1 Parents: 0 |
|
4079 | 4082 | 0 Parents: |
|
4080 | 4083 | |
|
4081 | 4084 | $ cat >> .hg/hgrc <<EOF |
|
4082 | 4085 | > [revsetalias] |
|
4083 | 4086 | > myparents(\$1) = parents(\$1) |
|
4084 | 4087 | > EOF |
|
4085 | 4088 | $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n' |
|
4086 | 4089 | 2 Parents: 1 |
|
4087 | 4090 | 1 Parents: 0 |
|
4088 | 4091 | 0 Parents: |
|
4089 | 4092 | |
|
4090 | 4093 | $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n' |
|
4091 | 4094 | Rev: 2 |
|
4092 | 4095 | Ancestor: 0 |
|
4093 | 4096 | Ancestor: 1 |
|
4094 | 4097 | Ancestor: 2 |
|
4095 | 4098 | |
|
4096 | 4099 | Rev: 1 |
|
4097 | 4100 | Ancestor: 0 |
|
4098 | 4101 | Ancestor: 1 |
|
4099 | 4102 | |
|
4100 | 4103 | Rev: 0 |
|
4101 | 4104 | Ancestor: 0 |
|
4102 | 4105 | |
|
4103 | 4106 | $ hg log --template '{revset("TIP"|lower)}\n' -l1 |
|
4104 | 4107 | 2 |
|
4105 | 4108 | |
|
4106 | 4109 | $ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1 |
|
4107 | 4110 | 2 |
|
4108 | 4111 | |
|
4109 | 4112 | a list template is evaluated for each item of revset/parents |
|
4110 | 4113 | |
|
4111 | 4114 | $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n' |
|
4112 | 4115 | 2 p: 1:bcc7ff960b8e |
|
4113 | 4116 | 1 p: 0:f7769ec2ab97 |
|
4114 | 4117 | 0 p: |
|
4115 | 4118 | |
|
4116 | 4119 | $ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n' |
|
4117 | 4120 | 2 p: 1:bcc7ff960b8e -1:000000000000 |
|
4118 | 4121 | 1 p: 0:f7769ec2ab97 -1:000000000000 |
|
4119 | 4122 | 0 p: -1:000000000000 -1:000000000000 |
|
4120 | 4123 | |
|
4121 | 4124 | therefore, 'revcache' should be recreated for each rev |
|
4122 | 4125 | |
|
4123 | 4126 | $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n' |
|
4124 | 4127 | 2 aa b |
|
4125 | 4128 | p |
|
4126 | 4129 | 1 |
|
4127 | 4130 | p a |
|
4128 | 4131 | 0 a |
|
4129 | 4132 | p |
|
4130 | 4133 | |
|
4131 | 4134 | $ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n' |
|
4132 | 4135 | 2 aa b |
|
4133 | 4136 | p |
|
4134 | 4137 | 1 |
|
4135 | 4138 | p a |
|
4136 | 4139 | 0 a |
|
4137 | 4140 | p |
|
4138 | 4141 | |
|
4139 | 4142 | a revset item must be evaluated as an integer revision, not an offset from tip |
|
4140 | 4143 | |
|
4141 | 4144 | $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n' |
|
4142 | 4145 | -1:000000000000 |
|
4143 | 4146 | $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n' |
|
4144 | 4147 | -1:000000000000 |
|
4145 | 4148 | |
|
4146 | 4149 | join() should pick '{rev}' from revset items: |
|
4147 | 4150 | |
|
4148 | 4151 | $ hg log -R ../a -T '{join(revset("parents(%d)", rev), ", ")}\n' -r6 |
|
4149 | 4152 | 4, 5 |
|
4150 | 4153 | |
|
4151 | 4154 | on the other hand, parents are formatted as '{rev}:{node|formatnode}' by |
|
4152 | 4155 | default. join() should agree with the default formatting: |
|
4153 | 4156 | |
|
4154 | 4157 | $ hg log -R ../a -T '{join(parents, ", ")}\n' -r6 |
|
4155 | 4158 | 5:13207e5a10d9, 4:bbe44766e73d |
|
4156 | 4159 | |
|
4157 | 4160 | $ hg log -R ../a -T '{join(parents, ",\n")}\n' -r6 --debug |
|
4158 | 4161 | 5:13207e5a10d9fd28ec424934298e176197f2c67f, |
|
4159 | 4162 | 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
4160 | 4163 | |
|
4161 | 4164 | Invalid arguments passed to revset() |
|
4162 | 4165 | |
|
4163 | 4166 | $ hg log -T '{revset("%whatever", 0)}\n' |
|
4164 | 4167 | hg: parse error: unexpected revspec format character w |
|
4165 | 4168 | [255] |
|
4166 | 4169 | $ hg log -T '{revset("%lwhatever", files)}\n' |
|
4167 | 4170 | hg: parse error: unexpected revspec format character w |
|
4168 | 4171 | [255] |
|
4169 | 4172 | $ hg log -T '{revset("%s %s", 0)}\n' |
|
4170 | 4173 | hg: parse error: missing argument for revspec |
|
4171 | 4174 | [255] |
|
4172 | 4175 | $ hg log -T '{revset("", 0)}\n' |
|
4173 | 4176 | hg: parse error: too many revspec arguments specified |
|
4174 | 4177 | [255] |
|
4175 | 4178 | $ hg log -T '{revset("%s", 0, 1)}\n' |
|
4176 | 4179 | hg: parse error: too many revspec arguments specified |
|
4177 | 4180 | [255] |
|
4178 | 4181 | $ hg log -T '{revset("%", 0)}\n' |
|
4179 | 4182 | hg: parse error: incomplete revspec format character |
|
4180 | 4183 | [255] |
|
4181 | 4184 | $ hg log -T '{revset("%l", 0)}\n' |
|
4182 | 4185 | hg: parse error: incomplete revspec format character |
|
4183 | 4186 | [255] |
|
4184 | 4187 | $ hg log -T '{revset("%d", 'foo')}\n' |
|
4185 | 4188 | hg: parse error: invalid argument for revspec |
|
4186 | 4189 | [255] |
|
4187 | 4190 | $ hg log -T '{revset("%ld", files)}\n' |
|
4188 | 4191 | hg: parse error: invalid argument for revspec |
|
4189 | 4192 | [255] |
|
4190 | 4193 | $ hg log -T '{revset("%ls", 0)}\n' |
|
4191 | 4194 | hg: parse error: invalid argument for revspec |
|
4192 | 4195 | [255] |
|
4193 | 4196 | $ hg log -T '{revset("%b", 'foo')}\n' |
|
4194 | 4197 | hg: parse error: invalid argument for revspec |
|
4195 | 4198 | [255] |
|
4196 | 4199 | $ hg log -T '{revset("%lb", files)}\n' |
|
4197 | 4200 | hg: parse error: invalid argument for revspec |
|
4198 | 4201 | [255] |
|
4199 | 4202 | $ hg log -T '{revset("%r", 0)}\n' |
|
4200 | 4203 | hg: parse error: invalid argument for revspec |
|
4201 | 4204 | [255] |
|
4202 | 4205 | |
|
4203 | 4206 | Test 'originalnode' |
|
4204 | 4207 | |
|
4205 | 4208 | $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n' |
|
4206 | 4209 | 000000000000 bcc7ff960b8e |
|
4207 | 4210 | $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n' |
|
4208 | 4211 | a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1 |
|
4209 | 4212 | |
|
4210 | 4213 | Test files function |
|
4211 | 4214 | |
|
4212 | 4215 | $ hg log -T "{rev}\n{join(files('*'), '\n')}\n" |
|
4213 | 4216 | 2 |
|
4214 | 4217 | a |
|
4215 | 4218 | aa |
|
4216 | 4219 | b |
|
4217 | 4220 | 1 |
|
4218 | 4221 | a |
|
4219 | 4222 | 0 |
|
4220 | 4223 | a |
|
4221 | 4224 | |
|
4222 | 4225 | $ hg log -T "{rev}\n{join(files('aa'), '\n')}\n" |
|
4223 | 4226 | 2 |
|
4224 | 4227 | aa |
|
4225 | 4228 | 1 |
|
4226 | 4229 | |
|
4227 | 4230 | 0 |
|
4228 | 4231 | |
|
4229 | 4232 | |
|
4230 | 4233 | Test relpath function |
|
4231 | 4234 | |
|
4232 | 4235 | $ hg log -r0 -T '{files % "{file|relpath}\n"}' |
|
4233 | 4236 | a |
|
4234 | 4237 | $ cd .. |
|
4235 | 4238 | $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}' |
|
4236 | 4239 | r/a |
|
4237 | 4240 | $ cd r |
|
4238 | 4241 | |
|
4239 | 4242 | Test active bookmark templating |
|
4240 | 4243 | |
|
4241 | 4244 | $ hg book foo |
|
4242 | 4245 | $ hg book bar |
|
4243 | 4246 | $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n" |
|
4244 | 4247 | 2 bar* foo |
|
4245 | 4248 | 1 |
|
4246 | 4249 | 0 |
|
4247 | 4250 | $ hg log --template "{rev} {activebookmark}\n" |
|
4248 | 4251 | 2 bar |
|
4249 | 4252 | 1 |
|
4250 | 4253 | 0 |
|
4251 | 4254 | $ hg bookmarks --inactive bar |
|
4252 | 4255 | $ hg log --template "{rev} {activebookmark}\n" |
|
4253 | 4256 | 2 |
|
4254 | 4257 | 1 |
|
4255 | 4258 | 0 |
|
4256 | 4259 | $ hg book -r1 baz |
|
4257 | 4260 | $ hg log --template "{rev} {join(bookmarks, ' ')}\n" |
|
4258 | 4261 | 2 bar foo |
|
4259 | 4262 | 1 baz |
|
4260 | 4263 | 0 |
|
4261 | 4264 | $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n" |
|
4262 | 4265 | 2 t |
|
4263 | 4266 | 1 f |
|
4264 | 4267 | 0 f |
|
4265 | 4268 | |
|
4266 | 4269 | Test namespaces dict |
|
4267 | 4270 | |
|
4268 | 4271 | $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n {join(names, ",")}\n"}\n' |
|
4269 | 4272 | 2 |
|
4270 | 4273 | bookmarks color=bookmark builtin=True |
|
4271 | 4274 | bar,foo |
|
4272 | 4275 | tags color=tag builtin=True |
|
4273 | 4276 | tip |
|
4274 | 4277 | branches color=branch builtin=True |
|
4275 | 4278 | text.{rev} |
|
4276 | 4279 | revnames color=revname builtin=False |
|
4277 | 4280 | r2 |
|
4278 | 4281 | |
|
4279 | 4282 | 1 |
|
4280 | 4283 | bookmarks color=bookmark builtin=True |
|
4281 | 4284 | baz |
|
4282 | 4285 | tags color=tag builtin=True |
|
4283 | 4286 | |
|
4284 | 4287 | branches color=branch builtin=True |
|
4285 | 4288 | text.{rev} |
|
4286 | 4289 | revnames color=revname builtin=False |
|
4287 | 4290 | r1 |
|
4288 | 4291 | |
|
4289 | 4292 | 0 |
|
4290 | 4293 | bookmarks color=bookmark builtin=True |
|
4291 | 4294 | |
|
4292 | 4295 | tags color=tag builtin=True |
|
4293 | 4296 | |
|
4294 | 4297 | branches color=branch builtin=True |
|
4295 | 4298 | default |
|
4296 | 4299 | revnames color=revname builtin=False |
|
4297 | 4300 | r0 |
|
4298 | 4301 | |
|
4299 | 4302 | $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}' |
|
4300 | 4303 | bookmarks: bar foo |
|
4301 | 4304 | tags: tip |
|
4302 | 4305 | branches: text.{rev} |
|
4303 | 4306 | $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}' |
|
4304 | 4307 | bookmarks: |
|
4305 | 4308 | bar |
|
4306 | 4309 | foo |
|
4307 | 4310 | tags: |
|
4308 | 4311 | tip |
|
4309 | 4312 | branches: |
|
4310 | 4313 | text.{rev} |
|
4311 | 4314 | $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}' |
|
4312 | 4315 | bar |
|
4313 | 4316 | foo |
|
4314 | 4317 | $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}' |
|
4315 | 4318 | bar |
|
4316 | 4319 | foo |
|
4317 | 4320 | |
|
4318 | 4321 | Test stringify on sub expressions |
|
4319 | 4322 | |
|
4320 | 4323 | $ cd .. |
|
4321 | 4324 | $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n' |
|
4322 | 4325 | fourth, second, third |
|
4323 | 4326 | $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n' |
|
4324 | 4327 | abc |
|
4325 | 4328 | |
|
4326 | 4329 | Test splitlines |
|
4327 | 4330 | |
|
4328 | 4331 | $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}" |
|
4329 | 4332 | @ foo Modify, add, remove, rename |
|
4330 | 4333 | | |
|
4331 | 4334 | o foo future |
|
4332 | 4335 | | |
|
4333 | 4336 | o foo third |
|
4334 | 4337 | | |
|
4335 | 4338 | o foo second |
|
4336 | 4339 | |
|
4337 | 4340 | o foo merge |
|
4338 | 4341 | |\ |
|
4339 | 4342 | | o foo new head |
|
4340 | 4343 | | | |
|
4341 | 4344 | o | foo new branch |
|
4342 | 4345 | |/ |
|
4343 | 4346 | o foo no user, no domain |
|
4344 | 4347 | | |
|
4345 | 4348 | o foo no person |
|
4346 | 4349 | | |
|
4347 | 4350 | o foo other 1 |
|
4348 | 4351 | | foo other 2 |
|
4349 | 4352 | | foo |
|
4350 | 4353 | | foo other 3 |
|
4351 | 4354 | o foo line 1 |
|
4352 | 4355 | foo line 2 |
|
4353 | 4356 | |
|
4354 | 4357 | $ hg log -R a -r0 -T '{desc|splitlines}\n' |
|
4355 | 4358 | line 1 line 2 |
|
4356 | 4359 | $ hg log -R a -r0 -T '{join(desc|splitlines, "|")}\n' |
|
4357 | 4360 | line 1|line 2 |
|
4358 | 4361 | |
|
4359 | 4362 | Test startswith |
|
4360 | 4363 | $ hg log -Gv -R a --template "{startswith(desc)}" |
|
4361 | 4364 | hg: parse error: startswith expects two arguments |
|
4362 | 4365 | [255] |
|
4363 | 4366 | |
|
4364 | 4367 | $ hg log -Gv -R a --template "{startswith('line', desc)}" |
|
4365 | 4368 | @ |
|
4366 | 4369 | | |
|
4367 | 4370 | o |
|
4368 | 4371 | | |
|
4369 | 4372 | o |
|
4370 | 4373 | | |
|
4371 | 4374 | o |
|
4372 | 4375 | |
|
4373 | 4376 | o |
|
4374 | 4377 | |\ |
|
4375 | 4378 | | o |
|
4376 | 4379 | | | |
|
4377 | 4380 | o | |
|
4378 | 4381 | |/ |
|
4379 | 4382 | o |
|
4380 | 4383 | | |
|
4381 | 4384 | o |
|
4382 | 4385 | | |
|
4383 | 4386 | o |
|
4384 | 4387 | | |
|
4385 | 4388 | o line 1 |
|
4386 | 4389 | line 2 |
|
4387 | 4390 | |
|
4388 | 4391 | Test bad template with better error message |
|
4389 | 4392 | |
|
4390 | 4393 | $ hg log -Gv -R a --template '{desc|user()}' |
|
4391 | 4394 | hg: parse error: expected a symbol, got 'func' |
|
4392 | 4395 | [255] |
|
4393 | 4396 | |
|
4394 | 4397 | Test word function (including index out of bounds graceful failure) |
|
4395 | 4398 | |
|
4396 | 4399 | $ hg log -Gv -R a --template "{word('1', desc)}" |
|
4397 | 4400 | @ add, |
|
4398 | 4401 | | |
|
4399 | 4402 | o |
|
4400 | 4403 | | |
|
4401 | 4404 | o |
|
4402 | 4405 | | |
|
4403 | 4406 | o |
|
4404 | 4407 | |
|
4405 | 4408 | o |
|
4406 | 4409 | |\ |
|
4407 | 4410 | | o head |
|
4408 | 4411 | | | |
|
4409 | 4412 | o | branch |
|
4410 | 4413 | |/ |
|
4411 | 4414 | o user, |
|
4412 | 4415 | | |
|
4413 | 4416 | o person |
|
4414 | 4417 | | |
|
4415 | 4418 | o 1 |
|
4416 | 4419 | | |
|
4417 | 4420 | o 1 |
|
4418 | 4421 | |
|
4419 | 4422 | |
|
4420 | 4423 | Test word third parameter used as splitter |
|
4421 | 4424 | |
|
4422 | 4425 | $ hg log -Gv -R a --template "{word('0', desc, 'o')}" |
|
4423 | 4426 | @ M |
|
4424 | 4427 | | |
|
4425 | 4428 | o future |
|
4426 | 4429 | | |
|
4427 | 4430 | o third |
|
4428 | 4431 | | |
|
4429 | 4432 | o sec |
|
4430 | 4433 | |
|
4431 | 4434 | o merge |
|
4432 | 4435 | |\ |
|
4433 | 4436 | | o new head |
|
4434 | 4437 | | | |
|
4435 | 4438 | o | new branch |
|
4436 | 4439 | |/ |
|
4437 | 4440 | o n |
|
4438 | 4441 | | |
|
4439 | 4442 | o n |
|
4440 | 4443 | | |
|
4441 | 4444 | o |
|
4442 | 4445 | | |
|
4443 | 4446 | o line 1 |
|
4444 | 4447 | line 2 |
|
4445 | 4448 | |
|
4446 | 4449 | Test word error messages for not enough and too many arguments |
|
4447 | 4450 | |
|
4448 | 4451 | $ hg log -Gv -R a --template "{word('0')}" |
|
4449 | 4452 | hg: parse error: word expects two or three arguments, got 1 |
|
4450 | 4453 | [255] |
|
4451 | 4454 | |
|
4452 | 4455 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" |
|
4453 | 4456 | hg: parse error: word expects two or three arguments, got 7 |
|
4454 | 4457 | [255] |
|
4455 | 4458 | |
|
4456 | 4459 | Test word for integer literal |
|
4457 | 4460 | |
|
4458 | 4461 | $ hg log -R a --template "{word(2, desc)}\n" -r0 |
|
4459 | 4462 | line |
|
4460 | 4463 | |
|
4461 | 4464 | Test word for invalid numbers |
|
4462 | 4465 | |
|
4463 | 4466 | $ hg log -Gv -R a --template "{word('a', desc)}" |
|
4464 | 4467 | hg: parse error: word expects an integer index |
|
4465 | 4468 | [255] |
|
4466 | 4469 | |
|
4467 | 4470 | Test word for out of range |
|
4468 | 4471 | |
|
4469 | 4472 | $ hg log -R a --template "{word(10000, desc)}" |
|
4470 | 4473 | $ hg log -R a --template "{word(-10000, desc)}" |
|
4471 | 4474 | |
|
4472 | 4475 | Test indent and not adding to empty lines |
|
4473 | 4476 | |
|
4474 | 4477 | $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a |
|
4475 | 4478 | ----- |
|
4476 | 4479 | > line 1 |
|
4477 | 4480 | >> line 2 |
|
4478 | 4481 | ----- |
|
4479 | 4482 | > other 1 |
|
4480 | 4483 | >> other 2 |
|
4481 | 4484 | |
|
4482 | 4485 | >> other 3 |
|
4483 | 4486 | |
|
4484 | 4487 | Test with non-strings like dates |
|
4485 | 4488 | |
|
4486 | 4489 | $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a |
|
4487 | 4490 | 1200000.00 |
|
4488 | 4491 | 1300000.00 |
|
4489 | 4492 | |
|
4490 | 4493 | Test broken string escapes: |
|
4491 | 4494 | |
|
4492 | 4495 | $ hg log -T "bogus\\" -R a |
|
4493 | 4496 | hg: parse error: trailing \ in string |
|
4494 | 4497 | [255] |
|
4495 | 4498 | $ hg log -T "\\xy" -R a |
|
4496 | 4499 | hg: parse error: invalid \x escape* (glob) |
|
4497 | 4500 | [255] |
|
4498 | 4501 | |
|
4499 | 4502 | json filter should escape HTML tags so that the output can be embedded in hgweb: |
|
4500 | 4503 | |
|
4501 | 4504 | $ hg log -T "{'<foo@example.org>'|json}\n" -R a -l1 |
|
4502 | 4505 | "\u003cfoo@example.org\u003e" |
|
4503 | 4506 | |
|
4504 | 4507 | Templater supports aliases of symbol and func() styles: |
|
4505 | 4508 | |
|
4506 | 4509 | $ hg clone -q a aliases |
|
4507 | 4510 | $ cd aliases |
|
4508 | 4511 | $ cat <<EOF >> .hg/hgrc |
|
4509 | 4512 | > [templatealias] |
|
4510 | 4513 | > r = rev |
|
4511 | 4514 | > rn = "{r}:{node|short}" |
|
4512 | 4515 | > status(c, files) = files % "{c} {file}\n" |
|
4513 | 4516 | > utcdate(d) = localdate(d, "UTC") |
|
4514 | 4517 | > EOF |
|
4515 | 4518 | |
|
4516 | 4519 | $ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n' |
|
4517 | 4520 | (template |
|
4518 | 4521 | (symbol 'rn') |
|
4519 | 4522 | (string ' ') |
|
4520 | 4523 | (| |
|
4521 | 4524 | (func |
|
4522 | 4525 | (symbol 'utcdate') |
|
4523 | 4526 | (symbol 'date')) |
|
4524 | 4527 | (symbol 'isodate')) |
|
4525 | 4528 | (string '\n')) |
|
4526 | 4529 | * expanded: |
|
4527 | 4530 | (template |
|
4528 | 4531 | (template |
|
4529 | 4532 | (symbol 'rev') |
|
4530 | 4533 | (string ':') |
|
4531 | 4534 | (| |
|
4532 | 4535 | (symbol 'node') |
|
4533 | 4536 | (symbol 'short'))) |
|
4534 | 4537 | (string ' ') |
|
4535 | 4538 | (| |
|
4536 | 4539 | (func |
|
4537 | 4540 | (symbol 'localdate') |
|
4538 | 4541 | (list |
|
4539 | 4542 | (symbol 'date') |
|
4540 | 4543 | (string 'UTC'))) |
|
4541 | 4544 | (symbol 'isodate')) |
|
4542 | 4545 | (string '\n')) |
|
4543 | 4546 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
4544 | 4547 | |
|
4545 | 4548 | $ hg debugtemplate -vr0 '{status("A", file_adds)}' |
|
4546 | 4549 | (template |
|
4547 | 4550 | (func |
|
4548 | 4551 | (symbol 'status') |
|
4549 | 4552 | (list |
|
4550 | 4553 | (string 'A') |
|
4551 | 4554 | (symbol 'file_adds')))) |
|
4552 | 4555 | * expanded: |
|
4553 | 4556 | (template |
|
4554 | 4557 | (% |
|
4555 | 4558 | (symbol 'file_adds') |
|
4556 | 4559 | (template |
|
4557 | 4560 | (string 'A') |
|
4558 | 4561 | (string ' ') |
|
4559 | 4562 | (symbol 'file') |
|
4560 | 4563 | (string '\n')))) |
|
4561 | 4564 | A a |
|
4562 | 4565 | |
|
4563 | 4566 | A unary function alias can be called as a filter: |
|
4564 | 4567 | |
|
4565 | 4568 | $ hg debugtemplate -vr0 '{date|utcdate|isodate}\n' |
|
4566 | 4569 | (template |
|
4567 | 4570 | (| |
|
4568 | 4571 | (| |
|
4569 | 4572 | (symbol 'date') |
|
4570 | 4573 | (symbol 'utcdate')) |
|
4571 | 4574 | (symbol 'isodate')) |
|
4572 | 4575 | (string '\n')) |
|
4573 | 4576 | * expanded: |
|
4574 | 4577 | (template |
|
4575 | 4578 | (| |
|
4576 | 4579 | (func |
|
4577 | 4580 | (symbol 'localdate') |
|
4578 | 4581 | (list |
|
4579 | 4582 | (symbol 'date') |
|
4580 | 4583 | (string 'UTC'))) |
|
4581 | 4584 | (symbol 'isodate')) |
|
4582 | 4585 | (string '\n')) |
|
4583 | 4586 | 1970-01-12 13:46 +0000 |
|
4584 | 4587 | |
|
4585 | 4588 | Aliases should be applied only to command arguments and templates in hgrc. |
|
4586 | 4589 | Otherwise, our stock styles and web templates could be corrupted: |
|
4587 | 4590 | |
|
4588 | 4591 | $ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n' |
|
4589 | 4592 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
4590 | 4593 | |
|
4591 | 4594 | $ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"' |
|
4592 | 4595 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
4593 | 4596 | |
|
4594 | 4597 | $ cat <<EOF > tmpl |
|
4595 | 4598 | > changeset = 'nothing expanded:{rn}\n' |
|
4596 | 4599 | > EOF |
|
4597 | 4600 | $ hg log -r0 --style ./tmpl |
|
4598 | 4601 | nothing expanded: |
|
4599 | 4602 | |
|
4600 | 4603 | Aliases in formatter: |
|
4601 | 4604 | |
|
4602 | 4605 | $ hg branches -T '{pad(branch, 7)} {rn}\n' |
|
4603 | 4606 | default 6:d41e714fe50d |
|
4604 | 4607 | foo 4:bbe44766e73d |
|
4605 | 4608 | |
|
4606 | 4609 | Aliases should honor HGPLAIN: |
|
4607 | 4610 | |
|
4608 | 4611 | $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n' |
|
4609 | 4612 | nothing expanded: |
|
4610 | 4613 | $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n' |
|
4611 | 4614 | 0:1e4e1b8f71e0 |
|
4612 | 4615 | |
|
4613 | 4616 | Unparsable alias: |
|
4614 | 4617 | |
|
4615 | 4618 | $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}' |
|
4616 | 4619 | (template |
|
4617 | 4620 | (symbol 'bad')) |
|
4618 | 4621 | abort: bad definition of template alias "bad": at 2: not a prefix: end |
|
4619 | 4622 | [255] |
|
4620 | 4623 | $ hg log --config templatealias.bad='x(' -T '{bad}' |
|
4621 | 4624 | abort: bad definition of template alias "bad": at 2: not a prefix: end |
|
4622 | 4625 | [255] |
|
4623 | 4626 | |
|
4624 | 4627 | $ cd .. |
|
4625 | 4628 | |
|
4626 | 4629 | Set up repository for non-ascii encoding tests: |
|
4627 | 4630 | |
|
4628 | 4631 | $ hg init nonascii |
|
4629 | 4632 | $ cd nonascii |
|
4630 | 4633 | $ $PYTHON <<EOF |
|
4631 | 4634 | > open('latin1', 'wb').write(b'\xe9') |
|
4632 | 4635 | > open('utf-8', 'wb').write(b'\xc3\xa9') |
|
4633 | 4636 | > EOF |
|
4634 | 4637 | $ HGENCODING=utf-8 hg branch -q `cat utf-8` |
|
4635 | 4638 | $ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8 |
|
4636 | 4639 | |
|
4637 | 4640 | json filter should try round-trip conversion to utf-8: |
|
4638 | 4641 | |
|
4639 | 4642 | $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0 |
|
4640 | 4643 | "\u00e9" |
|
4641 | 4644 | $ HGENCODING=ascii hg log -T "{desc|json}\n" -r0 |
|
4642 | 4645 | "non-ascii branch: \u00e9" |
|
4643 | 4646 | |
|
4644 | 4647 | json filter takes input as utf-8b: |
|
4645 | 4648 | |
|
4646 | 4649 | $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1 |
|
4647 | 4650 | "\u00e9" |
|
4648 | 4651 | $ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1 |
|
4649 | 4652 | "\udce9" |
|
4650 | 4653 | |
|
4651 | 4654 | utf8 filter: |
|
4652 | 4655 | |
|
4653 | 4656 | $ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0 |
|
4654 | 4657 | round-trip: c3a9 |
|
4655 | 4658 | $ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1 |
|
4656 | 4659 | decoded: c3a9 |
|
4657 | 4660 | $ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1 |
|
4658 | 4661 | abort: decoding near * (glob) |
|
4659 | 4662 | [255] |
|
4660 | 4663 | $ hg log -T "coerced to string: {rev|utf8}\n" -r0 |
|
4661 | 4664 | coerced to string: 0 |
|
4662 | 4665 | |
|
4663 | 4666 | pad width: |
|
4664 | 4667 | |
|
4665 | 4668 | $ HGENCODING=utf-8 hg debugtemplate "{pad('`cat utf-8`', 2, '-')}\n" |
|
4666 | 4669 | \xc3\xa9- (esc) |
|
4667 | 4670 | |
|
4668 | 4671 | $ cd .. |
|
4669 | 4672 | |
|
4670 | 4673 | Test that template function in extension is registered as expected |
|
4671 | 4674 | |
|
4672 | 4675 | $ cd a |
|
4673 | 4676 | |
|
4674 | 4677 | $ cat <<EOF > $TESTTMP/customfunc.py |
|
4675 | 4678 | > from mercurial import registrar |
|
4676 | 4679 | > |
|
4677 | 4680 | > templatefunc = registrar.templatefunc() |
|
4678 | 4681 | > |
|
4679 | 4682 | > @templatefunc(b'custom()') |
|
4680 | 4683 | > def custom(context, mapping, args): |
|
4681 | 4684 | > return b'custom' |
|
4682 | 4685 | > EOF |
|
4683 | 4686 | $ cat <<EOF > .hg/hgrc |
|
4684 | 4687 | > [extensions] |
|
4685 | 4688 | > customfunc = $TESTTMP/customfunc.py |
|
4686 | 4689 | > EOF |
|
4687 | 4690 | |
|
4688 | 4691 | $ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true |
|
4689 | 4692 | custom |
|
4690 | 4693 | |
|
4691 | 4694 | $ cd .. |
|
4692 | 4695 | |
|
4693 | 4696 | Test 'graphwidth' in 'hg log' on various topologies. The key here is that the |
|
4694 | 4697 | printed graphwidths 3, 5, 7, etc. should all line up in their respective |
|
4695 | 4698 | columns. We don't care about other aspects of the graph rendering here. |
|
4696 | 4699 | |
|
4697 | 4700 | $ hg init graphwidth |
|
4698 | 4701 | $ cd graphwidth |
|
4699 | 4702 | |
|
4700 | 4703 | $ wrappabletext="a a a a a a a a a a a a" |
|
4701 | 4704 | |
|
4702 | 4705 | $ printf "first\n" > file |
|
4703 | 4706 | $ hg add file |
|
4704 | 4707 | $ hg commit -m "$wrappabletext" |
|
4705 | 4708 | |
|
4706 | 4709 | $ printf "first\nsecond\n" > file |
|
4707 | 4710 | $ hg commit -m "$wrappabletext" |
|
4708 | 4711 | |
|
4709 | 4712 | $ hg checkout 0 |
|
4710 | 4713 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4711 | 4714 | $ printf "third\nfirst\n" > file |
|
4712 | 4715 | $ hg commit -m "$wrappabletext" |
|
4713 | 4716 | created new head |
|
4714 | 4717 | |
|
4715 | 4718 | $ hg merge |
|
4716 | 4719 | merging file |
|
4717 | 4720 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
4718 | 4721 | (branch merge, don't forget to commit) |
|
4719 | 4722 | |
|
4720 | 4723 | $ hg log --graph -T "{graphwidth}" |
|
4721 | 4724 | @ 3 |
|
4722 | 4725 | | |
|
4723 | 4726 | | @ 5 |
|
4724 | 4727 | |/ |
|
4725 | 4728 | o 3 |
|
4726 | 4729 | |
|
4727 | 4730 | $ hg commit -m "$wrappabletext" |
|
4728 | 4731 | |
|
4729 | 4732 | $ hg log --graph -T "{graphwidth}" |
|
4730 | 4733 | @ 5 |
|
4731 | 4734 | |\ |
|
4732 | 4735 | | o 5 |
|
4733 | 4736 | | | |
|
4734 | 4737 | o | 5 |
|
4735 | 4738 | |/ |
|
4736 | 4739 | o 3 |
|
4737 | 4740 | |
|
4738 | 4741 | |
|
4739 | 4742 | $ hg checkout 0 |
|
4740 | 4743 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4741 | 4744 | $ printf "third\nfirst\nsecond\n" > file |
|
4742 | 4745 | $ hg commit -m "$wrappabletext" |
|
4743 | 4746 | created new head |
|
4744 | 4747 | |
|
4745 | 4748 | $ hg log --graph -T "{graphwidth}" |
|
4746 | 4749 | @ 3 |
|
4747 | 4750 | | |
|
4748 | 4751 | | o 7 |
|
4749 | 4752 | | |\ |
|
4750 | 4753 | +---o 7 |
|
4751 | 4754 | | | |
|
4752 | 4755 | | o 5 |
|
4753 | 4756 | |/ |
|
4754 | 4757 | o 3 |
|
4755 | 4758 | |
|
4756 | 4759 | |
|
4757 | 4760 | $ hg log --graph -T "{graphwidth}" -r 3 |
|
4758 | 4761 | o 5 |
|
4759 | 4762 | |\ |
|
4760 | 4763 | ~ ~ |
|
4761 | 4764 | |
|
4762 | 4765 | $ hg log --graph -T "{graphwidth}" -r 1 |
|
4763 | 4766 | o 3 |
|
4764 | 4767 | | |
|
4765 | 4768 | ~ |
|
4766 | 4769 | |
|
4767 | 4770 | $ hg merge |
|
4768 | 4771 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4769 | 4772 | (branch merge, don't forget to commit) |
|
4770 | 4773 | $ hg commit -m "$wrappabletext" |
|
4771 | 4774 | |
|
4772 | 4775 | $ printf "seventh\n" >> file |
|
4773 | 4776 | $ hg commit -m "$wrappabletext" |
|
4774 | 4777 | |
|
4775 | 4778 | $ hg log --graph -T "{graphwidth}" |
|
4776 | 4779 | @ 3 |
|
4777 | 4780 | | |
|
4778 | 4781 | o 5 |
|
4779 | 4782 | |\ |
|
4780 | 4783 | | o 5 |
|
4781 | 4784 | | | |
|
4782 | 4785 | o | 7 |
|
4783 | 4786 | |\ \ |
|
4784 | 4787 | | o | 7 |
|
4785 | 4788 | | |/ |
|
4786 | 4789 | o / 5 |
|
4787 | 4790 | |/ |
|
4788 | 4791 | o 3 |
|
4789 | 4792 | |
|
4790 | 4793 | |
|
4791 | 4794 | The point of graphwidth is to allow wrapping that accounts for the space taken |
|
4792 | 4795 | by the graph. |
|
4793 | 4796 | |
|
4794 | 4797 | $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}" |
|
4795 | 4798 | @ a a a a |
|
4796 | 4799 | | a a a a |
|
4797 | 4800 | | a a a a |
|
4798 | 4801 | o a a a |
|
4799 | 4802 | |\ a a a |
|
4800 | 4803 | | | a a a |
|
4801 | 4804 | | | a a a |
|
4802 | 4805 | | o a a a |
|
4803 | 4806 | | | a a a |
|
4804 | 4807 | | | a a a |
|
4805 | 4808 | | | a a a |
|
4806 | 4809 | o | a a |
|
4807 | 4810 | |\ \ a a |
|
4808 | 4811 | | | | a a |
|
4809 | 4812 | | | | a a |
|
4810 | 4813 | | | | a a |
|
4811 | 4814 | | | | a a |
|
4812 | 4815 | | o | a a |
|
4813 | 4816 | | |/ a a |
|
4814 | 4817 | | | a a |
|
4815 | 4818 | | | a a |
|
4816 | 4819 | | | a a |
|
4817 | 4820 | | | a a |
|
4818 | 4821 | o | a a a |
|
4819 | 4822 | |/ a a a |
|
4820 | 4823 | | a a a |
|
4821 | 4824 | | a a a |
|
4822 | 4825 | o a a a a |
|
4823 | 4826 | a a a a |
|
4824 | 4827 | a a a a |
|
4825 | 4828 | |
|
4826 | 4829 | Something tricky happens when there are elided nodes; the next drawn row of |
|
4827 | 4830 | edges can be more than one column wider, but the graph width only increases by |
|
4828 | 4831 | one column. The remaining columns are added in between the nodes. |
|
4829 | 4832 | |
|
4830 | 4833 | $ hg log --graph -T "{graphwidth}" -r "0|2|4|5" |
|
4831 | 4834 | o 5 |
|
4832 | 4835 | |\ |
|
4833 | 4836 | | \ |
|
4834 | 4837 | | :\ |
|
4835 | 4838 | o : : 7 |
|
4836 | 4839 | :/ / |
|
4837 | 4840 | : o 5 |
|
4838 | 4841 | :/ |
|
4839 | 4842 | o 3 |
|
4840 | 4843 | |
|
4841 | 4844 | |
|
4842 | 4845 | $ cd .. |
|
4843 | 4846 |
General Comments 0
You need to be logged in to leave comments.
Login now