Show More
@@ -1,584 +1,585 b'' | |||||
1 | # templatekw.py - common changeset template keywords |
|
1 | # templatekw.py - common changeset template keywords | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2009 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2009 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | from .node import hex, nullid |
|
10 | from .node import hex, nullid | |
11 | from . import ( |
|
11 | from . import ( | |
12 | encoding, |
|
12 | encoding, | |
13 | error, |
|
13 | error, | |
14 | hbisect, |
|
14 | hbisect, | |
15 | patch, |
|
15 | patch, | |
16 | registrar, |
|
16 | registrar, | |
17 | scmutil, |
|
17 | scmutil, | |
18 | util, |
|
18 | util, | |
19 | ) |
|
19 | ) | |
20 |
|
20 | |||
21 | # This helper class allows us to handle both: |
|
21 | # This helper class allows us to handle both: | |
22 | # "{files}" (legacy command-line-specific list hack) and |
|
22 | # "{files}" (legacy command-line-specific list hack) and | |
23 | # "{files % '{file}\n'}" (hgweb-style with inlining and function support) |
|
23 | # "{files % '{file}\n'}" (hgweb-style with inlining and function support) | |
24 | # and to access raw values: |
|
24 | # and to access raw values: | |
25 | # "{ifcontains(file, files, ...)}", "{ifcontains(key, extras, ...)}" |
|
25 | # "{ifcontains(file, files, ...)}", "{ifcontains(key, extras, ...)}" | |
26 | # "{get(extras, key)}" |
|
26 | # "{get(extras, key)}" | |
27 |
|
27 | |||
28 | class _hybrid(object): |
|
28 | class _hybrid(object): | |
29 | def __init__(self, gen, values, makemap, joinfmt=None): |
|
29 | def __init__(self, gen, values, makemap, joinfmt=None): | |
30 | self.gen = gen |
|
30 | self.gen = gen | |
31 | self.values = values |
|
31 | self.values = values | |
32 | self._makemap = makemap |
|
32 | self._makemap = makemap | |
33 | if joinfmt: |
|
33 | if joinfmt: | |
34 | self.joinfmt = joinfmt |
|
34 | self.joinfmt = joinfmt | |
35 | else: |
|
35 | else: | |
36 | self.joinfmt = lambda x: x.values()[0] |
|
36 | self.joinfmt = lambda x: x.values()[0] | |
37 | def __iter__(self): |
|
37 | def __iter__(self): | |
38 | return self.gen |
|
38 | return self.gen | |
39 | def itermaps(self): |
|
39 | def itermaps(self): | |
40 | makemap = self._makemap |
|
40 | makemap = self._makemap | |
41 | for x in self.values: |
|
41 | for x in self.values: | |
42 | yield makemap(x) |
|
42 | yield makemap(x) | |
43 | def __contains__(self, x): |
|
43 | def __contains__(self, x): | |
44 | return x in self.values |
|
44 | return x in self.values | |
45 | def __len__(self): |
|
45 | def __len__(self): | |
46 | return len(self.values) |
|
46 | return len(self.values) | |
47 | def __getattr__(self, name): |
|
47 | def __getattr__(self, name): | |
48 | if name != 'get': |
|
48 | if name != 'get': | |
49 | raise AttributeError(name) |
|
49 | raise AttributeError(name) | |
50 | return getattr(self.values, name) |
|
50 | return getattr(self.values, name) | |
51 |
|
51 | |||
52 | def showlist(name, values, plural=None, element=None, separator=' ', **args): |
|
52 | def showlist(name, values, plural=None, element=None, separator=' ', **args): | |
53 | if not element: |
|
53 | if not element: | |
54 | element = name |
|
54 | element = name | |
55 | f = _showlist(name, values, plural, separator, **args) |
|
55 | f = _showlist(name, values, plural, separator, **args) | |
56 | return _hybrid(f, values, lambda x: {element: x}) |
|
56 | return _hybrid(f, values, lambda x: {element: x}) | |
57 |
|
57 | |||
58 | def _showlist(name, values, plural=None, separator=' ', **args): |
|
58 | def _showlist(name, values, plural=None, separator=' ', **args): | |
59 | '''expand set of values. |
|
59 | '''expand set of values. | |
60 | name is name of key in template map. |
|
60 | name is name of key in template map. | |
61 | values is list of strings or dicts. |
|
61 | values is list of strings or dicts. | |
62 | plural is plural of name, if not simply name + 's'. |
|
62 | plural is plural of name, if not simply name + 's'. | |
63 | separator is used to join values as a string |
|
63 | separator is used to join values as a string | |
64 |
|
64 | |||
65 | expansion works like this, given name 'foo'. |
|
65 | expansion works like this, given name 'foo'. | |
66 |
|
66 | |||
67 | if values is empty, expand 'no_foos'. |
|
67 | if values is empty, expand 'no_foos'. | |
68 |
|
68 | |||
69 | if 'foo' not in template map, return values as a string, |
|
69 | if 'foo' not in template map, return values as a string, | |
70 | joined by 'separator'. |
|
70 | joined by 'separator'. | |
71 |
|
71 | |||
72 | expand 'start_foos'. |
|
72 | expand 'start_foos'. | |
73 |
|
73 | |||
74 | for each value, expand 'foo'. if 'last_foo' in template |
|
74 | for each value, expand 'foo'. if 'last_foo' in template | |
75 | map, expand it instead of 'foo' for last key. |
|
75 | map, expand it instead of 'foo' for last key. | |
76 |
|
76 | |||
77 | expand 'end_foos'. |
|
77 | expand 'end_foos'. | |
78 | ''' |
|
78 | ''' | |
79 | templ = args['templ'] |
|
79 | templ = args['templ'] | |
80 | if plural: |
|
80 | if plural: | |
81 | names = plural |
|
81 | names = plural | |
82 | else: names = name + 's' |
|
82 | else: names = name + 's' | |
83 | if not values: |
|
83 | if not values: | |
84 | noname = 'no_' + names |
|
84 | noname = 'no_' + names | |
85 | if noname in templ: |
|
85 | if noname in templ: | |
86 | yield templ(noname, **args) |
|
86 | yield templ(noname, **args) | |
87 | return |
|
87 | return | |
88 | if name not in templ: |
|
88 | if name not in templ: | |
89 | if isinstance(values[0], str): |
|
89 | if isinstance(values[0], str): | |
90 | yield separator.join(values) |
|
90 | yield separator.join(values) | |
91 | else: |
|
91 | else: | |
92 | for v in values: |
|
92 | for v in values: | |
93 | yield dict(v, **args) |
|
93 | yield dict(v, **args) | |
94 | return |
|
94 | return | |
95 | startname = 'start_' + names |
|
95 | startname = 'start_' + names | |
96 | if startname in templ: |
|
96 | if startname in templ: | |
97 | yield templ(startname, **args) |
|
97 | yield templ(startname, **args) | |
98 | vargs = args.copy() |
|
98 | vargs = args.copy() | |
99 | def one(v, tag=name): |
|
99 | def one(v, tag=name): | |
100 | try: |
|
100 | try: | |
101 | vargs.update(v) |
|
101 | vargs.update(v) | |
102 | except (AttributeError, ValueError): |
|
102 | except (AttributeError, ValueError): | |
103 | try: |
|
103 | try: | |
104 | for a, b in v: |
|
104 | for a, b in v: | |
105 | vargs[a] = b |
|
105 | vargs[a] = b | |
106 | except ValueError: |
|
106 | except ValueError: | |
107 | vargs[name] = v |
|
107 | vargs[name] = v | |
108 | return templ(tag, **vargs) |
|
108 | return templ(tag, **vargs) | |
109 | lastname = 'last_' + name |
|
109 | lastname = 'last_' + name | |
110 | if lastname in templ: |
|
110 | if lastname in templ: | |
111 | last = values.pop() |
|
111 | last = values.pop() | |
112 | else: |
|
112 | else: | |
113 | last = None |
|
113 | last = None | |
114 | for v in values: |
|
114 | for v in values: | |
115 | yield one(v) |
|
115 | yield one(v) | |
116 | if last is not None: |
|
116 | if last is not None: | |
117 | yield one(last, tag=lastname) |
|
117 | yield one(last, tag=lastname) | |
118 | endname = 'end_' + names |
|
118 | endname = 'end_' + names | |
119 | if endname in templ: |
|
119 | if endname in templ: | |
120 | yield templ(endname, **args) |
|
120 | yield templ(endname, **args) | |
121 |
|
121 | |||
122 | def getfiles(repo, ctx, revcache): |
|
122 | def getfiles(repo, ctx, revcache): | |
123 | if 'files' not in revcache: |
|
123 | if 'files' not in revcache: | |
124 | revcache['files'] = repo.status(ctx.p1(), ctx)[:3] |
|
124 | revcache['files'] = repo.status(ctx.p1(), ctx)[:3] | |
125 | return revcache['files'] |
|
125 | return revcache['files'] | |
126 |
|
126 | |||
127 | def getlatesttags(repo, ctx, cache, pattern=None): |
|
127 | def getlatesttags(repo, ctx, cache, pattern=None): | |
128 | '''return date, distance and name for the latest tag of rev''' |
|
128 | '''return date, distance and name for the latest tag of rev''' | |
129 |
|
129 | |||
130 | cachename = 'latesttags' |
|
130 | cachename = 'latesttags' | |
131 | if pattern is not None: |
|
131 | if pattern is not None: | |
132 | cachename += '-' + pattern |
|
132 | cachename += '-' + pattern | |
133 | match = util.stringmatcher(pattern)[2] |
|
133 | match = util.stringmatcher(pattern)[2] | |
134 | else: |
|
134 | else: | |
135 | match = util.always |
|
135 | match = util.always | |
136 |
|
136 | |||
137 | if cachename not in cache: |
|
137 | if cachename not in cache: | |
138 | # Cache mapping from rev to a tuple with tag date, tag |
|
138 | # Cache mapping from rev to a tuple with tag date, tag | |
139 | # distance and tag name |
|
139 | # distance and tag name | |
140 | cache[cachename] = {-1: (0, 0, ['null'])} |
|
140 | cache[cachename] = {-1: (0, 0, ['null'])} | |
141 | latesttags = cache[cachename] |
|
141 | latesttags = cache[cachename] | |
142 |
|
142 | |||
143 | rev = ctx.rev() |
|
143 | rev = ctx.rev() | |
144 | todo = [rev] |
|
144 | todo = [rev] | |
145 | while todo: |
|
145 | while todo: | |
146 | rev = todo.pop() |
|
146 | rev = todo.pop() | |
147 | if rev in latesttags: |
|
147 | if rev in latesttags: | |
148 | continue |
|
148 | continue | |
149 | ctx = repo[rev] |
|
149 | ctx = repo[rev] | |
150 | tags = [t for t in ctx.tags() |
|
150 | tags = [t for t in ctx.tags() | |
151 | if (repo.tagtype(t) and repo.tagtype(t) != 'local' |
|
151 | if (repo.tagtype(t) and repo.tagtype(t) != 'local' | |
152 | and match(t))] |
|
152 | and match(t))] | |
153 | if tags: |
|
153 | if tags: | |
154 | latesttags[rev] = ctx.date()[0], 0, [t for t in sorted(tags)] |
|
154 | latesttags[rev] = ctx.date()[0], 0, [t for t in sorted(tags)] | |
155 | continue |
|
155 | continue | |
156 | try: |
|
156 | try: | |
157 | # The tuples are laid out so the right one can be found by |
|
157 | # The tuples are laid out so the right one can be found by | |
158 | # comparison. |
|
158 | # comparison. | |
159 | pdate, pdist, ptag = max( |
|
159 | pdate, pdist, ptag = max( | |
160 | latesttags[p.rev()] for p in ctx.parents()) |
|
160 | latesttags[p.rev()] for p in ctx.parents()) | |
161 | except KeyError: |
|
161 | except KeyError: | |
162 | # Cache miss - recurse |
|
162 | # Cache miss - recurse | |
163 | todo.append(rev) |
|
163 | todo.append(rev) | |
164 | todo.extend(p.rev() for p in ctx.parents()) |
|
164 | todo.extend(p.rev() for p in ctx.parents()) | |
165 | continue |
|
165 | continue | |
166 | latesttags[rev] = pdate, pdist + 1, ptag |
|
166 | latesttags[rev] = pdate, pdist + 1, ptag | |
167 | return latesttags[rev] |
|
167 | return latesttags[rev] | |
168 |
|
168 | |||
169 | def getrenamedfn(repo, endrev=None): |
|
169 | def getrenamedfn(repo, endrev=None): | |
170 | rcache = {} |
|
170 | rcache = {} | |
171 | if endrev is None: |
|
171 | if endrev is None: | |
172 | endrev = len(repo) |
|
172 | endrev = len(repo) | |
173 |
|
173 | |||
174 | def getrenamed(fn, rev): |
|
174 | def getrenamed(fn, rev): | |
175 | '''looks up all renames for a file (up to endrev) the first |
|
175 | '''looks up all renames for a file (up to endrev) the first | |
176 | time the file is given. It indexes on the changerev and only |
|
176 | time the file is given. It indexes on the changerev and only | |
177 | parses the manifest if linkrev != changerev. |
|
177 | parses the manifest if linkrev != changerev. | |
178 | Returns rename info for fn at changerev rev.''' |
|
178 | Returns rename info for fn at changerev rev.''' | |
179 | if fn not in rcache: |
|
179 | if fn not in rcache: | |
180 | rcache[fn] = {} |
|
180 | rcache[fn] = {} | |
181 | fl = repo.file(fn) |
|
181 | fl = repo.file(fn) | |
182 | for i in fl: |
|
182 | for i in fl: | |
183 | lr = fl.linkrev(i) |
|
183 | lr = fl.linkrev(i) | |
184 | renamed = fl.renamed(fl.node(i)) |
|
184 | renamed = fl.renamed(fl.node(i)) | |
185 | rcache[fn][lr] = renamed |
|
185 | rcache[fn][lr] = renamed | |
186 | if lr >= endrev: |
|
186 | if lr >= endrev: | |
187 | break |
|
187 | break | |
188 | if rev in rcache[fn]: |
|
188 | if rev in rcache[fn]: | |
189 | return rcache[fn][rev] |
|
189 | return rcache[fn][rev] | |
190 |
|
190 | |||
191 | # If linkrev != rev (i.e. rev not found in rcache) fallback to |
|
191 | # If linkrev != rev (i.e. rev not found in rcache) fallback to | |
192 | # filectx logic. |
|
192 | # filectx logic. | |
193 | try: |
|
193 | try: | |
194 | return repo[rev][fn].renamed() |
|
194 | return repo[rev][fn].renamed() | |
195 | except error.LookupError: |
|
195 | except error.LookupError: | |
196 | return None |
|
196 | return None | |
197 |
|
197 | |||
198 | return getrenamed |
|
198 | return getrenamed | |
199 |
|
199 | |||
200 | # keywords are callables like: |
|
200 | # keywords are callables like: | |
201 | # fn(repo, ctx, templ, cache, revcache, **args) |
|
201 | # fn(repo, ctx, templ, cache, revcache, **args) | |
202 | # with: |
|
202 | # with: | |
203 | # repo - current repository instance |
|
203 | # repo - current repository instance | |
204 | # ctx - the changectx being displayed |
|
204 | # ctx - the changectx being displayed | |
205 | # templ - the templater instance |
|
205 | # templ - the templater instance | |
206 | # cache - a cache dictionary for the whole templater run |
|
206 | # cache - a cache dictionary for the whole templater run | |
207 | # revcache - a cache dictionary for the current revision |
|
207 | # revcache - a cache dictionary for the current revision | |
208 | keywords = {} |
|
208 | keywords = {} | |
209 |
|
209 | |||
210 | templatekeyword = registrar.templatekeyword(keywords) |
|
210 | templatekeyword = registrar.templatekeyword(keywords) | |
211 |
|
211 | |||
212 | @templatekeyword('author') |
|
212 | @templatekeyword('author') | |
213 | def showauthor(repo, ctx, templ, **args): |
|
213 | def showauthor(repo, ctx, templ, **args): | |
214 | """String. The unmodified author of the changeset.""" |
|
214 | """String. The unmodified author of the changeset.""" | |
215 | return ctx.user() |
|
215 | return ctx.user() | |
216 |
|
216 | |||
217 | @templatekeyword('bisect') |
|
217 | @templatekeyword('bisect') | |
218 | def showbisect(repo, ctx, templ, **args): |
|
218 | def showbisect(repo, ctx, templ, **args): | |
219 | """String. The changeset bisection status.""" |
|
219 | """String. The changeset bisection status.""" | |
220 | return hbisect.label(repo, ctx.node()) |
|
220 | return hbisect.label(repo, ctx.node()) | |
221 |
|
221 | |||
222 | @templatekeyword('branch') |
|
222 | @templatekeyword('branch') | |
223 | def showbranch(**args): |
|
223 | def showbranch(**args): | |
224 | """String. The name of the branch on which the changeset was |
|
224 | """String. The name of the branch on which the changeset was | |
225 | committed. |
|
225 | committed. | |
226 | """ |
|
226 | """ | |
227 | return args['ctx'].branch() |
|
227 | return args['ctx'].branch() | |
228 |
|
228 | |||
229 | @templatekeyword('branches') |
|
229 | @templatekeyword('branches') | |
230 | def showbranches(**args): |
|
230 | def showbranches(**args): | |
231 | """List of strings. The name of the branch on which the |
|
231 | """List of strings. The name of the branch on which the | |
232 | changeset was committed. Will be empty if the branch name was |
|
232 | changeset was committed. Will be empty if the branch name was | |
233 | default. (DEPRECATED) |
|
233 | default. (DEPRECATED) | |
234 | """ |
|
234 | """ | |
235 | branch = args['ctx'].branch() |
|
235 | branch = args['ctx'].branch() | |
236 | if branch != 'default': |
|
236 | if branch != 'default': | |
237 | return showlist('branch', [branch], plural='branches', **args) |
|
237 | return showlist('branch', [branch], plural='branches', **args) | |
238 | return showlist('branch', [], plural='branches', **args) |
|
238 | return showlist('branch', [], plural='branches', **args) | |
239 |
|
239 | |||
240 | @templatekeyword('bookmarks') |
|
240 | @templatekeyword('bookmarks') | |
241 | def showbookmarks(**args): |
|
241 | def showbookmarks(**args): | |
242 | """List of strings. Any bookmarks associated with the |
|
242 | """List of strings. Any bookmarks associated with the | |
243 | changeset. Also sets 'active', the name of the active bookmark. |
|
243 | changeset. Also sets 'active', the name of the active bookmark. | |
244 | """ |
|
244 | """ | |
245 | repo = args['ctx']._repo |
|
245 | repo = args['ctx']._repo | |
246 | bookmarks = args['ctx'].bookmarks() |
|
246 | bookmarks = args['ctx'].bookmarks() | |
247 | active = repo._activebookmark |
|
247 | active = repo._activebookmark | |
248 | makemap = lambda v: {'bookmark': v, 'active': active, 'current': active} |
|
248 | makemap = lambda v: {'bookmark': v, 'active': active, 'current': active} | |
249 | f = _showlist('bookmark', bookmarks, **args) |
|
249 | f = _showlist('bookmark', bookmarks, **args) | |
250 | return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) |
|
250 | return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) | |
251 |
|
251 | |||
252 | @templatekeyword('children') |
|
252 | @templatekeyword('children') | |
253 | def showchildren(**args): |
|
253 | def showchildren(**args): | |
254 | """List of strings. The children of the changeset.""" |
|
254 | """List of strings. The children of the changeset.""" | |
255 | ctx = args['ctx'] |
|
255 | ctx = args['ctx'] | |
256 | childrevs = ['%d:%s' % (cctx, cctx) for cctx in ctx.children()] |
|
256 | childrevs = ['%d:%s' % (cctx, cctx) for cctx in ctx.children()] | |
257 | return showlist('children', childrevs, element='child', **args) |
|
257 | return showlist('children', childrevs, element='child', **args) | |
258 |
|
258 | |||
259 | # Deprecated, but kept alive for help generation a purpose. |
|
259 | # Deprecated, but kept alive for help generation a purpose. | |
260 | @templatekeyword('currentbookmark') |
|
260 | @templatekeyword('currentbookmark') | |
261 | def showcurrentbookmark(**args): |
|
261 | def showcurrentbookmark(**args): | |
262 | """String. The active bookmark, if it is |
|
262 | """String. The active bookmark, if it is | |
263 | associated with the changeset (DEPRECATED)""" |
|
263 | associated with the changeset (DEPRECATED)""" | |
264 | return showactivebookmark(**args) |
|
264 | return showactivebookmark(**args) | |
265 |
|
265 | |||
266 | @templatekeyword('activebookmark') |
|
266 | @templatekeyword('activebookmark') | |
267 | def showactivebookmark(**args): |
|
267 | def showactivebookmark(**args): | |
268 | """String. The active bookmark, if it is |
|
268 | """String. The active bookmark, if it is | |
269 | associated with the changeset""" |
|
269 | associated with the changeset""" | |
270 | active = args['repo']._activebookmark |
|
270 | active = args['repo']._activebookmark | |
271 | if active and active in args['ctx'].bookmarks(): |
|
271 | if active and active in args['ctx'].bookmarks(): | |
272 | return active |
|
272 | return active | |
273 | return '' |
|
273 | return '' | |
274 |
|
274 | |||
275 | @templatekeyword('date') |
|
275 | @templatekeyword('date') | |
276 | def showdate(repo, ctx, templ, **args): |
|
276 | def showdate(repo, ctx, templ, **args): | |
277 | """Date information. The date when the changeset was committed.""" |
|
277 | """Date information. The date when the changeset was committed.""" | |
278 | return ctx.date() |
|
278 | return ctx.date() | |
279 |
|
279 | |||
280 | @templatekeyword('desc') |
|
280 | @templatekeyword('desc') | |
281 | def showdescription(repo, ctx, templ, **args): |
|
281 | def showdescription(repo, ctx, templ, **args): | |
282 | """String. The text of the changeset description.""" |
|
282 | """String. The text of the changeset description.""" | |
283 | s = ctx.description() |
|
283 | s = ctx.description() | |
284 | if isinstance(s, encoding.localstr): |
|
284 | if isinstance(s, encoding.localstr): | |
285 | # try hard to preserve utf-8 bytes |
|
285 | # try hard to preserve utf-8 bytes | |
286 | return encoding.tolocal(encoding.fromlocal(s).strip()) |
|
286 | return encoding.tolocal(encoding.fromlocal(s).strip()) | |
287 | else: |
|
287 | else: | |
288 | return s.strip() |
|
288 | return s.strip() | |
289 |
|
289 | |||
290 | @templatekeyword('diffstat') |
|
290 | @templatekeyword('diffstat') | |
291 | def showdiffstat(repo, ctx, templ, **args): |
|
291 | def showdiffstat(repo, ctx, templ, **args): | |
292 | """String. Statistics of changes with the following format: |
|
292 | """String. Statistics of changes with the following format: | |
293 | "modified files: +added/-removed lines" |
|
293 | "modified files: +added/-removed lines" | |
294 | """ |
|
294 | """ | |
295 | stats = patch.diffstatdata(util.iterlines(ctx.diff())) |
|
295 | stats = patch.diffstatdata(util.iterlines(ctx.diff())) | |
296 | maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats) |
|
296 | maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats) | |
297 | return '%s: +%s/-%s' % (len(stats), adds, removes) |
|
297 | return '%s: +%s/-%s' % (len(stats), adds, removes) | |
298 |
|
298 | |||
299 | @templatekeyword('extras') |
|
299 | @templatekeyword('extras') | |
300 | def showextras(**args): |
|
300 | def showextras(**args): | |
301 | """List of dicts with key, value entries of the 'extras' |
|
301 | """List of dicts with key, value entries of the 'extras' | |
302 | field of this changeset.""" |
|
302 | field of this changeset.""" | |
303 | extras = args['ctx'].extra() |
|
303 | extras = args['ctx'].extra() | |
304 | extras = util.sortdict((k, extras[k]) for k in sorted(extras)) |
|
304 | extras = util.sortdict((k, extras[k]) for k in sorted(extras)) | |
305 | makemap = lambda k: {'key': k, 'value': extras[k]} |
|
305 | makemap = lambda k: {'key': k, 'value': extras[k]} | |
306 | c = [makemap(k) for k in extras] |
|
306 | c = [makemap(k) for k in extras] | |
307 | f = _showlist('extra', c, plural='extras', **args) |
|
307 | f = _showlist('extra', c, plural='extras', **args) | |
308 | return _hybrid(f, extras, makemap, |
|
308 | return _hybrid(f, extras, makemap, | |
309 | lambda x: '%s=%s' % (x['key'], x['value'])) |
|
309 | lambda x: '%s=%s' % (x['key'], x['value'])) | |
310 |
|
310 | |||
311 | @templatekeyword('file_adds') |
|
311 | @templatekeyword('file_adds') | |
312 | def showfileadds(**args): |
|
312 | def showfileadds(**args): | |
313 | """List of strings. Files added by this changeset.""" |
|
313 | """List of strings. Files added by this changeset.""" | |
314 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
314 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] | |
315 | return showlist('file_add', getfiles(repo, ctx, revcache)[1], |
|
315 | return showlist('file_add', getfiles(repo, ctx, revcache)[1], | |
316 | element='file', **args) |
|
316 | element='file', **args) | |
317 |
|
317 | |||
318 | @templatekeyword('file_copies') |
|
318 | @templatekeyword('file_copies') | |
319 | def showfilecopies(**args): |
|
319 | def showfilecopies(**args): | |
320 | """List of strings. Files copied in this changeset with |
|
320 | """List of strings. Files copied in this changeset with | |
321 | their sources. |
|
321 | their sources. | |
322 | """ |
|
322 | """ | |
323 | cache, ctx = args['cache'], args['ctx'] |
|
323 | cache, ctx = args['cache'], args['ctx'] | |
324 | copies = args['revcache'].get('copies') |
|
324 | copies = args['revcache'].get('copies') | |
325 | if copies is None: |
|
325 | if copies is None: | |
326 | if 'getrenamed' not in cache: |
|
326 | if 'getrenamed' not in cache: | |
327 | cache['getrenamed'] = getrenamedfn(args['repo']) |
|
327 | cache['getrenamed'] = getrenamedfn(args['repo']) | |
328 | copies = [] |
|
328 | copies = [] | |
329 | getrenamed = cache['getrenamed'] |
|
329 | getrenamed = cache['getrenamed'] | |
330 | for fn in ctx.files(): |
|
330 | for fn in ctx.files(): | |
331 | rename = getrenamed(fn, ctx.rev()) |
|
331 | rename = getrenamed(fn, ctx.rev()) | |
332 | if rename: |
|
332 | if rename: | |
333 | copies.append((fn, rename[0])) |
|
333 | copies.append((fn, rename[0])) | |
334 |
|
334 | |||
335 | copies = util.sortdict(copies) |
|
335 | copies = util.sortdict(copies) | |
336 | makemap = lambda k: {'name': k, 'source': copies[k]} |
|
336 | makemap = lambda k: {'name': k, 'source': copies[k]} | |
337 | c = [makemap(k) for k in copies] |
|
337 | c = [makemap(k) for k in copies] | |
338 | f = _showlist('file_copy', c, plural='file_copies', **args) |
|
338 | f = _showlist('file_copy', c, plural='file_copies', **args) | |
339 | return _hybrid(f, copies, makemap, |
|
339 | return _hybrid(f, copies, makemap, | |
340 | lambda x: '%s (%s)' % (x['name'], x['source'])) |
|
340 | lambda x: '%s (%s)' % (x['name'], x['source'])) | |
341 |
|
341 | |||
342 | # showfilecopiesswitch() displays file copies only if copy records are |
|
342 | # showfilecopiesswitch() displays file copies only if copy records are | |
343 | # provided before calling the templater, usually with a --copies |
|
343 | # provided before calling the templater, usually with a --copies | |
344 | # command line switch. |
|
344 | # command line switch. | |
345 | @templatekeyword('file_copies_switch') |
|
345 | @templatekeyword('file_copies_switch') | |
346 | def showfilecopiesswitch(**args): |
|
346 | def showfilecopiesswitch(**args): | |
347 | """List of strings. Like "file_copies" but displayed |
|
347 | """List of strings. Like "file_copies" but displayed | |
348 | only if the --copied switch is set. |
|
348 | only if the --copied switch is set. | |
349 | """ |
|
349 | """ | |
350 | copies = args['revcache'].get('copies') or [] |
|
350 | copies = args['revcache'].get('copies') or [] | |
351 | copies = util.sortdict(copies) |
|
351 | copies = util.sortdict(copies) | |
352 | makemap = lambda k: {'name': k, 'source': copies[k]} |
|
352 | makemap = lambda k: {'name': k, 'source': copies[k]} | |
353 | c = [makemap(k) for k in copies] |
|
353 | c = [makemap(k) for k in copies] | |
354 | f = _showlist('file_copy', c, plural='file_copies', **args) |
|
354 | f = _showlist('file_copy', c, plural='file_copies', **args) | |
355 | return _hybrid(f, copies, makemap, |
|
355 | return _hybrid(f, copies, makemap, | |
356 | lambda x: '%s (%s)' % (x['name'], x['source'])) |
|
356 | lambda x: '%s (%s)' % (x['name'], x['source'])) | |
357 |
|
357 | |||
358 | @templatekeyword('file_dels') |
|
358 | @templatekeyword('file_dels') | |
359 | def showfiledels(**args): |
|
359 | def showfiledels(**args): | |
360 | """List of strings. Files removed by this changeset.""" |
|
360 | """List of strings. Files removed by this changeset.""" | |
361 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
361 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] | |
362 | return showlist('file_del', getfiles(repo, ctx, revcache)[2], |
|
362 | return showlist('file_del', getfiles(repo, ctx, revcache)[2], | |
363 | element='file', **args) |
|
363 | element='file', **args) | |
364 |
|
364 | |||
365 | @templatekeyword('file_mods') |
|
365 | @templatekeyword('file_mods') | |
366 | def showfilemods(**args): |
|
366 | def showfilemods(**args): | |
367 | """List of strings. Files modified by this changeset.""" |
|
367 | """List of strings. Files modified by this changeset.""" | |
368 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] |
|
368 | repo, ctx, revcache = args['repo'], args['ctx'], args['revcache'] | |
369 | return showlist('file_mod', getfiles(repo, ctx, revcache)[0], |
|
369 | return showlist('file_mod', getfiles(repo, ctx, revcache)[0], | |
370 | element='file', **args) |
|
370 | element='file', **args) | |
371 |
|
371 | |||
372 | @templatekeyword('files') |
|
372 | @templatekeyword('files') | |
373 | def showfiles(**args): |
|
373 | def showfiles(**args): | |
374 | """List of strings. All files modified, added, or removed by this |
|
374 | """List of strings. All files modified, added, or removed by this | |
375 | changeset. |
|
375 | changeset. | |
376 | """ |
|
376 | """ | |
377 | return showlist('file', args['ctx'].files(), **args) |
|
377 | return showlist('file', args['ctx'].files(), **args) | |
378 |
|
378 | |||
379 | @templatekeyword('graphnode') |
|
379 | @templatekeyword('graphnode') | |
380 | def showgraphnode(repo, ctx, **args): |
|
380 | def showgraphnode(repo, ctx, **args): | |
381 | """String. The character representing the changeset node in |
|
381 | """String. The character representing the changeset node in | |
382 | an ASCII revision graph""" |
|
382 | an ASCII revision graph""" | |
383 | wpnodes = repo.dirstate.parents() |
|
383 | wpnodes = repo.dirstate.parents() | |
384 | if wpnodes[1] == nullid: |
|
384 | if wpnodes[1] == nullid: | |
385 | wpnodes = wpnodes[:1] |
|
385 | wpnodes = wpnodes[:1] | |
386 | if ctx.node() in wpnodes: |
|
386 | if ctx.node() in wpnodes: | |
387 | return '@' |
|
387 | return '@' | |
388 | elif ctx.obsolete(): |
|
388 | elif ctx.obsolete(): | |
389 | return 'x' |
|
389 | return 'x' | |
390 | elif ctx.closesbranch(): |
|
390 | elif ctx.closesbranch(): | |
391 | return '_' |
|
391 | return '_' | |
392 | else: |
|
392 | else: | |
393 | return 'o' |
|
393 | return 'o' | |
394 |
|
394 | |||
395 | @templatekeyword('latesttag') |
|
395 | @templatekeyword('latesttag') | |
396 | def showlatesttag(**args): |
|
396 | def showlatesttag(**args): | |
397 | """List of strings. The global tags on the most recent globally |
|
397 | """List of strings. The global tags on the most recent globally | |
398 | tagged ancestor of this changeset. |
|
398 | tagged ancestor of this changeset. | |
399 | """ |
|
399 | """ | |
400 | return showlatesttags(None, **args) |
|
400 | return showlatesttags(None, **args) | |
401 |
|
401 | |||
402 | def showlatesttags(pattern, **args): |
|
402 | def showlatesttags(pattern, **args): | |
403 | """helper method for the latesttag keyword and function""" |
|
403 | """helper method for the latesttag keyword and function""" | |
404 | repo, ctx = args['repo'], args['ctx'] |
|
404 | repo, ctx = args['repo'], args['ctx'] | |
405 | cache = args['cache'] |
|
405 | cache = args['cache'] | |
406 | latesttags = getlatesttags(repo, ctx, cache, pattern) |
|
406 | latesttags = getlatesttags(repo, ctx, cache, pattern) | |
407 |
|
407 | |||
408 | # latesttag[0] is an implementation detail for sorting csets on different |
|
408 | # latesttag[0] is an implementation detail for sorting csets on different | |
409 | # branches in a stable manner- it is the date the tagged cset was created, |
|
409 | # branches in a stable manner- it is the date the tagged cset was created, | |
410 | # not the date the tag was created. Therefore it isn't made visible here. |
|
410 | # not the date the tag was created. Therefore it isn't made visible here. | |
411 | makemap = lambda v: { |
|
411 | makemap = lambda v: { | |
412 | 'changes': _showchangessincetag, |
|
412 | 'changes': _showchangessincetag, | |
413 | 'distance': latesttags[1], |
|
413 | 'distance': latesttags[1], | |
414 | 'latesttag': v, # BC with {latesttag % '{latesttag}'} |
|
414 | 'latesttag': v, # BC with {latesttag % '{latesttag}'} | |
415 | 'tag': v |
|
415 | 'tag': v | |
416 | } |
|
416 | } | |
417 |
|
417 | |||
418 | tags = latesttags[2] |
|
418 | tags = latesttags[2] | |
419 | f = _showlist('latesttag', tags, separator=':', **args) |
|
419 | f = _showlist('latesttag', tags, separator=':', **args) | |
420 | return _hybrid(f, tags, makemap, lambda x: x['latesttag']) |
|
420 | return _hybrid(f, tags, makemap, lambda x: x['latesttag']) | |
421 |
|
421 | |||
422 | @templatekeyword('latesttagdistance') |
|
422 | @templatekeyword('latesttagdistance') | |
423 | def showlatesttagdistance(repo, ctx, templ, cache, **args): |
|
423 | def showlatesttagdistance(repo, ctx, templ, cache, **args): | |
424 | """Integer. Longest path to the latest tag.""" |
|
424 | """Integer. Longest path to the latest tag.""" | |
425 | return getlatesttags(repo, ctx, cache)[1] |
|
425 | return getlatesttags(repo, ctx, cache)[1] | |
426 |
|
426 | |||
427 | @templatekeyword('changessincelatesttag') |
|
427 | @templatekeyword('changessincelatesttag') | |
428 | def showchangessincelatesttag(repo, ctx, templ, cache, **args): |
|
428 | def showchangessincelatesttag(repo, ctx, templ, cache, **args): | |
429 | """Integer. All ancestors not in the latest tag.""" |
|
429 | """Integer. All ancestors not in the latest tag.""" | |
430 | latesttag = getlatesttags(repo, ctx, cache)[2][0] |
|
430 | latesttag = getlatesttags(repo, ctx, cache)[2][0] | |
431 |
|
431 | |||
432 | return _showchangessincetag(repo, ctx, tag=latesttag, **args) |
|
432 | return _showchangessincetag(repo, ctx, tag=latesttag, **args) | |
433 |
|
433 | |||
434 | def _showchangessincetag(repo, ctx, **args): |
|
434 | def _showchangessincetag(repo, ctx, **args): | |
435 | offset = 0 |
|
435 | offset = 0 | |
436 | revs = [ctx.rev()] |
|
436 | revs = [ctx.rev()] | |
437 | tag = args['tag'] |
|
437 | tag = args['tag'] | |
438 |
|
438 | |||
439 | # The only() revset doesn't currently support wdir() |
|
439 | # The only() revset doesn't currently support wdir() | |
440 | if ctx.rev() is None: |
|
440 | if ctx.rev() is None: | |
441 | offset = 1 |
|
441 | offset = 1 | |
442 | revs = [p.rev() for p in ctx.parents()] |
|
442 | revs = [p.rev() for p in ctx.parents()] | |
443 |
|
443 | |||
444 | return len(repo.revs('only(%ld, %s)', revs, tag)) + offset |
|
444 | return len(repo.revs('only(%ld, %s)', revs, tag)) + offset | |
445 |
|
445 | |||
446 | @templatekeyword('manifest') |
|
446 | @templatekeyword('manifest') | |
447 | def showmanifest(**args): |
|
447 | def showmanifest(**args): | |
448 | repo, ctx, templ = args['repo'], args['ctx'], args['templ'] |
|
448 | repo, ctx, templ = args['repo'], args['ctx'], args['templ'] | |
449 | mnode = ctx.manifestnode() |
|
449 | mnode = ctx.manifestnode() | |
450 | if mnode is None: |
|
450 | if mnode is None: | |
451 | # just avoid crash, we might want to use the 'ff...' hash in future |
|
451 | # just avoid crash, we might want to use the 'ff...' hash in future | |
452 | return |
|
452 | return | |
453 | args = args.copy() |
|
453 | args = args.copy() | |
454 | args.update({'rev': repo.manifest.rev(mnode), 'node': hex(mnode)}) |
|
454 | args.update({'rev': repo.manifest.rev(mnode), 'node': hex(mnode)}) | |
455 | return templ('manifest', **args) |
|
455 | return templ('manifest', **args) | |
456 |
|
456 | |||
457 | def shownames(namespace, **args): |
|
457 | def shownames(namespace, **args): | |
458 | """helper method to generate a template keyword for a namespace""" |
|
458 | """helper method to generate a template keyword for a namespace""" | |
459 | ctx = args['ctx'] |
|
459 | ctx = args['ctx'] | |
460 | repo = ctx.repo() |
|
460 | repo = ctx.repo() | |
461 | ns = repo.names[namespace] |
|
461 | ns = repo.names[namespace] | |
462 | names = ns.names(repo, ctx.node()) |
|
462 | names = ns.names(repo, ctx.node()) | |
463 | return showlist(ns.templatename, names, plural=namespace, **args) |
|
463 | return showlist(ns.templatename, names, plural=namespace, **args) | |
464 |
|
464 | |||
465 | @templatekeyword('namespaces') |
|
465 | @templatekeyword('namespaces') | |
466 | def shownamespaces(**args): |
|
466 | def shownamespaces(**args): | |
467 | """Dict of lists. Names attached to this changeset per |
|
467 | """Dict of lists. Names attached to this changeset per | |
468 | namespace.""" |
|
468 | namespace.""" | |
469 | ctx = args['ctx'] |
|
469 | ctx = args['ctx'] | |
470 | repo = ctx.repo() |
|
470 | repo = ctx.repo() | |
471 | namespaces = util.sortdict((k, showlist('name', ns.names(repo, ctx.node()), |
|
471 | namespaces = util.sortdict((k, showlist('name', ns.names(repo, ctx.node()), | |
472 | **args)) |
|
472 | **args)) | |
473 | for k, ns in repo.names.iteritems()) |
|
473 | for k, ns in repo.names.iteritems()) | |
474 | f = _showlist('namespace', list(namespaces), **args) |
|
474 | f = _showlist('namespace', list(namespaces), **args) | |
475 | return _hybrid(f, namespaces, |
|
475 | return _hybrid(f, namespaces, | |
476 | lambda k: {'namespace': k, 'names': namespaces[k]}, |
|
476 | lambda k: {'namespace': k, 'names': namespaces[k]}, | |
477 | lambda x: x['namespace']) |
|
477 | lambda x: x['namespace']) | |
478 |
|
478 | |||
479 | @templatekeyword('node') |
|
479 | @templatekeyword('node') | |
480 | def shownode(repo, ctx, templ, **args): |
|
480 | def shownode(repo, ctx, templ, **args): | |
481 | """String. The changeset identification hash, as a 40 hexadecimal |
|
481 | """String. The changeset identification hash, as a 40 hexadecimal | |
482 | digit string. |
|
482 | digit string. | |
483 | """ |
|
483 | """ | |
484 | return ctx.hex() |
|
484 | return ctx.hex() | |
485 |
|
485 | |||
486 | @templatekeyword('p1rev') |
|
486 | @templatekeyword('p1rev') | |
487 | def showp1rev(repo, ctx, templ, **args): |
|
487 | def showp1rev(repo, ctx, templ, **args): | |
488 | """Integer. The repository-local revision number of the changeset's |
|
488 | """Integer. The repository-local revision number of the changeset's | |
489 | first parent, or -1 if the changeset has no parents.""" |
|
489 | first parent, or -1 if the changeset has no parents.""" | |
490 | return ctx.p1().rev() |
|
490 | return ctx.p1().rev() | |
491 |
|
491 | |||
492 | @templatekeyword('p2rev') |
|
492 | @templatekeyword('p2rev') | |
493 | def showp2rev(repo, ctx, templ, **args): |
|
493 | def showp2rev(repo, ctx, templ, **args): | |
494 | """Integer. The repository-local revision number of the changeset's |
|
494 | """Integer. The repository-local revision number of the changeset's | |
495 | second parent, or -1 if the changeset has no second parent.""" |
|
495 | second parent, or -1 if the changeset has no second parent.""" | |
496 | return ctx.p2().rev() |
|
496 | return ctx.p2().rev() | |
497 |
|
497 | |||
498 | @templatekeyword('p1node') |
|
498 | @templatekeyword('p1node') | |
499 | def showp1node(repo, ctx, templ, **args): |
|
499 | def showp1node(repo, ctx, templ, **args): | |
500 | """String. The identification hash of the changeset's first parent, |
|
500 | """String. The identification hash of the changeset's first parent, | |
501 | as a 40 digit hexadecimal string. If the changeset has no parents, all |
|
501 | as a 40 digit hexadecimal string. If the changeset has no parents, all | |
502 | digits are 0.""" |
|
502 | digits are 0.""" | |
503 | return ctx.p1().hex() |
|
503 | return ctx.p1().hex() | |
504 |
|
504 | |||
505 | @templatekeyword('p2node') |
|
505 | @templatekeyword('p2node') | |
506 | def showp2node(repo, ctx, templ, **args): |
|
506 | def showp2node(repo, ctx, templ, **args): | |
507 | """String. The identification hash of the changeset's second |
|
507 | """String. The identification hash of the changeset's second | |
508 | parent, as a 40 digit hexadecimal string. If the changeset has no second |
|
508 | parent, as a 40 digit hexadecimal string. If the changeset has no second | |
509 | parent, all digits are 0.""" |
|
509 | parent, all digits are 0.""" | |
510 | return ctx.p2().hex() |
|
510 | return ctx.p2().hex() | |
511 |
|
511 | |||
512 | @templatekeyword('parents') |
|
512 | @templatekeyword('parents') | |
513 | def showparents(**args): |
|
513 | def showparents(**args): | |
514 | """List of strings. The parents of the changeset in "rev:node" |
|
514 | """List of strings. The parents of the changeset in "rev:node" | |
515 | format. If the changeset has only one "natural" parent (the predecessor |
|
515 | format. If the changeset has only one "natural" parent (the predecessor | |
516 | revision) nothing is shown.""" |
|
516 | revision) nothing is shown.""" | |
517 | repo = args['repo'] |
|
517 | repo = args['repo'] | |
518 | ctx = args['ctx'] |
|
518 | ctx = args['ctx'] | |
519 | pctxs = scmutil.meaningfulparents(repo, ctx) |
|
519 | pctxs = scmutil.meaningfulparents(repo, ctx) | |
520 | prevs = [str(p.rev()) for p in pctxs] # ifcontains() needs a list of str |
|
520 | prevs = [str(p.rev()) for p in pctxs] # ifcontains() needs a list of str | |
521 | parents = [[('rev', p.rev()), |
|
521 | parents = [[('rev', p.rev()), | |
522 | ('node', p.hex()), |
|
522 | ('node', p.hex()), | |
523 | ('phase', p.phasestr())] |
|
523 | ('phase', p.phasestr())] | |
524 | for p in pctxs] |
|
524 | for p in pctxs] | |
525 | f = _showlist('parent', parents, **args) |
|
525 | f = _showlist('parent', parents, **args) | |
526 | return _hybrid(f, prevs, lambda x: {'ctx': repo[int(x)], 'revcache': {}}) |
|
526 | return _hybrid(f, prevs, lambda x: {'ctx': repo[int(x)], 'revcache': {}}) | |
527 |
|
527 | |||
528 | @templatekeyword('phase') |
|
528 | @templatekeyword('phase') | |
529 | def showphase(repo, ctx, templ, **args): |
|
529 | def showphase(repo, ctx, templ, **args): | |
530 | """String. The changeset phase name.""" |
|
530 | """String. The changeset phase name.""" | |
531 | return ctx.phasestr() |
|
531 | return ctx.phasestr() | |
532 |
|
532 | |||
533 | @templatekeyword('phaseidx') |
|
533 | @templatekeyword('phaseidx') | |
534 | def showphaseidx(repo, ctx, templ, **args): |
|
534 | def showphaseidx(repo, ctx, templ, **args): | |
535 | """Integer. The changeset phase index.""" |
|
535 | """Integer. The changeset phase index.""" | |
536 | return ctx.phase() |
|
536 | return ctx.phase() | |
537 |
|
537 | |||
538 | @templatekeyword('rev') |
|
538 | @templatekeyword('rev') | |
539 | def showrev(repo, ctx, templ, **args): |
|
539 | def showrev(repo, ctx, templ, **args): | |
540 | """Integer. The repository-local changeset revision number.""" |
|
540 | """Integer. The repository-local changeset revision number.""" | |
541 | return scmutil.intrev(ctx.rev()) |
|
541 | return scmutil.intrev(ctx.rev()) | |
542 |
|
542 | |||
543 | def showrevslist(name, revs, **args): |
|
543 | def showrevslist(name, revs, **args): | |
544 | """helper to generate a list of revisions in which a mapped template will |
|
544 | """helper to generate a list of revisions in which a mapped template will | |
545 | be evaluated""" |
|
545 | be evaluated""" | |
546 | repo = args['ctx'].repo() |
|
546 | repo = args['ctx'].repo() | |
547 | revs = [str(r) for r in revs] # ifcontains() needs a list of str |
|
547 | revs = [str(r) for r in revs] # ifcontains() needs a list of str | |
548 | f = _showlist(name, revs, **args) |
|
548 | f = _showlist(name, revs, **args) | |
549 | return _hybrid(f, revs, |
|
549 | return _hybrid(f, revs, | |
550 |
lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}} |
|
550 | lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}}, | |
|
551 | lambda d: d[name]) | |||
551 |
|
552 | |||
552 | @templatekeyword('subrepos') |
|
553 | @templatekeyword('subrepos') | |
553 | def showsubrepos(**args): |
|
554 | def showsubrepos(**args): | |
554 | """List of strings. Updated subrepositories in the changeset.""" |
|
555 | """List of strings. Updated subrepositories in the changeset.""" | |
555 | ctx = args['ctx'] |
|
556 | ctx = args['ctx'] | |
556 | substate = ctx.substate |
|
557 | substate = ctx.substate | |
557 | if not substate: |
|
558 | if not substate: | |
558 | return showlist('subrepo', [], **args) |
|
559 | return showlist('subrepo', [], **args) | |
559 | psubstate = ctx.parents()[0].substate or {} |
|
560 | psubstate = ctx.parents()[0].substate or {} | |
560 | subrepos = [] |
|
561 | subrepos = [] | |
561 | for sub in substate: |
|
562 | for sub in substate: | |
562 | if sub not in psubstate or substate[sub] != psubstate[sub]: |
|
563 | if sub not in psubstate or substate[sub] != psubstate[sub]: | |
563 | subrepos.append(sub) # modified or newly added in ctx |
|
564 | subrepos.append(sub) # modified or newly added in ctx | |
564 | for sub in psubstate: |
|
565 | for sub in psubstate: | |
565 | if sub not in substate: |
|
566 | if sub not in substate: | |
566 | subrepos.append(sub) # removed in ctx |
|
567 | subrepos.append(sub) # removed in ctx | |
567 | return showlist('subrepo', sorted(subrepos), **args) |
|
568 | return showlist('subrepo', sorted(subrepos), **args) | |
568 |
|
569 | |||
569 | # don't remove "showtags" definition, even though namespaces will put |
|
570 | # don't remove "showtags" definition, even though namespaces will put | |
570 | # a helper function for "tags" keyword into "keywords" map automatically, |
|
571 | # a helper function for "tags" keyword into "keywords" map automatically, | |
571 | # because online help text is built without namespaces initialization |
|
572 | # because online help text is built without namespaces initialization | |
572 | @templatekeyword('tags') |
|
573 | @templatekeyword('tags') | |
573 | def showtags(**args): |
|
574 | def showtags(**args): | |
574 | """List of strings. Any tags associated with the changeset.""" |
|
575 | """List of strings. Any tags associated with the changeset.""" | |
575 | return shownames('tags', **args) |
|
576 | return shownames('tags', **args) | |
576 |
|
577 | |||
577 | def loadkeyword(ui, extname, registrarobj): |
|
578 | def loadkeyword(ui, extname, registrarobj): | |
578 | """Load template keyword from specified registrarobj |
|
579 | """Load template keyword from specified registrarobj | |
579 | """ |
|
580 | """ | |
580 | for name, func in registrarobj._table.iteritems(): |
|
581 | for name, func in registrarobj._table.iteritems(): | |
581 | keywords[name] = func |
|
582 | keywords[name] = func | |
582 |
|
583 | |||
583 | # tell hggettext to extract docstrings from these functions: |
|
584 | # tell hggettext to extract docstrings from these functions: | |
584 | i18nfunctions = keywords.values() |
|
585 | i18nfunctions = keywords.values() |
@@ -1,3849 +1,3854 b'' | |||||
1 | $ hg init a |
|
1 | $ hg init a | |
2 | $ cd a |
|
2 | $ cd a | |
3 | $ echo a > a |
|
3 | $ echo a > a | |
4 | $ hg add a |
|
4 | $ hg add a | |
5 | $ echo line 1 > b |
|
5 | $ echo line 1 > b | |
6 | $ echo line 2 >> b |
|
6 | $ echo line 2 >> b | |
7 | $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>' |
|
7 | $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>' | |
8 |
|
8 | |||
9 | $ hg add b |
|
9 | $ hg add b | |
10 | $ echo other 1 > c |
|
10 | $ echo other 1 > c | |
11 | $ echo other 2 >> c |
|
11 | $ echo other 2 >> c | |
12 | $ echo >> c |
|
12 | $ echo >> c | |
13 | $ echo other 3 >> c |
|
13 | $ echo other 3 >> c | |
14 | $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>' |
|
14 | $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>' | |
15 |
|
15 | |||
16 | $ hg add c |
|
16 | $ hg add c | |
17 | $ hg commit -m 'no person' -d '1200000 0' -u 'other@place' |
|
17 | $ hg commit -m 'no person' -d '1200000 0' -u 'other@place' | |
18 | $ echo c >> c |
|
18 | $ echo c >> c | |
19 | $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' |
|
19 | $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' | |
20 |
|
20 | |||
21 | $ echo foo > .hg/branch |
|
21 | $ echo foo > .hg/branch | |
22 | $ hg commit -m 'new branch' -d '1400000 0' -u 'person' |
|
22 | $ hg commit -m 'new branch' -d '1400000 0' -u 'person' | |
23 |
|
23 | |||
24 | $ hg co -q 3 |
|
24 | $ hg co -q 3 | |
25 | $ echo other 4 >> d |
|
25 | $ echo other 4 >> d | |
26 | $ hg add d |
|
26 | $ hg add d | |
27 | $ hg commit -m 'new head' -d '1500000 0' -u 'person' |
|
27 | $ hg commit -m 'new head' -d '1500000 0' -u 'person' | |
28 |
|
28 | |||
29 | $ hg merge -q foo |
|
29 | $ hg merge -q foo | |
30 | $ hg commit -m 'merge' -d '1500001 0' -u 'person' |
|
30 | $ hg commit -m 'merge' -d '1500001 0' -u 'person' | |
31 |
|
31 | |||
32 | Second branch starting at nullrev: |
|
32 | Second branch starting at nullrev: | |
33 |
|
33 | |||
34 | $ hg update null |
|
34 | $ hg update null | |
35 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
35 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
36 | $ echo second > second |
|
36 | $ echo second > second | |
37 | $ hg add second |
|
37 | $ hg add second | |
38 | $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' |
|
38 | $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' | |
39 | created new head |
|
39 | created new head | |
40 |
|
40 | |||
41 | $ echo third > third |
|
41 | $ echo third > third | |
42 | $ hg add third |
|
42 | $ hg add third | |
43 | $ hg mv second fourth |
|
43 | $ hg mv second fourth | |
44 | $ hg commit -m third -d "2020-01-01 10:01" |
|
44 | $ hg commit -m third -d "2020-01-01 10:01" | |
45 |
|
45 | |||
46 | $ hg log --template '{join(file_copies, ",\n")}\n' -r . |
|
46 | $ hg log --template '{join(file_copies, ",\n")}\n' -r . | |
47 | fourth (second) |
|
47 | fourth (second) | |
48 | $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r . |
|
48 | $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r . | |
49 | second -> fourth |
|
49 | second -> fourth | |
50 | $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7 |
|
50 | $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7 | |
51 | 8 t |
|
51 | 8 t | |
52 | 7 f |
|
52 | 7 f | |
53 |
|
53 | |||
54 | Working-directory revision has special identifiers, though they are still |
|
54 | Working-directory revision has special identifiers, though they are still | |
55 | experimental: |
|
55 | experimental: | |
56 |
|
56 | |||
57 | $ hg log -r 'wdir()' -T '{rev}:{node}\n' |
|
57 | $ hg log -r 'wdir()' -T '{rev}:{node}\n' | |
58 | 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
58 | 2147483647:ffffffffffffffffffffffffffffffffffffffff | |
59 |
|
59 | |||
60 | Some keywords are invalid for working-directory revision, but they should |
|
60 | Some keywords are invalid for working-directory revision, but they should | |
61 | never cause crash: |
|
61 | never cause crash: | |
62 |
|
62 | |||
63 | $ hg log -r 'wdir()' -T '{manifest}\n' |
|
63 | $ hg log -r 'wdir()' -T '{manifest}\n' | |
64 |
|
64 | |||
65 |
|
65 | |||
66 | Quoting for ui.logtemplate |
|
66 | Quoting for ui.logtemplate | |
67 |
|
67 | |||
68 | $ hg tip --config "ui.logtemplate={rev}\n" |
|
68 | $ hg tip --config "ui.logtemplate={rev}\n" | |
69 | 8 |
|
69 | 8 | |
70 | $ hg tip --config "ui.logtemplate='{rev}\n'" |
|
70 | $ hg tip --config "ui.logtemplate='{rev}\n'" | |
71 | 8 |
|
71 | 8 | |
72 | $ hg tip --config 'ui.logtemplate="{rev}\n"' |
|
72 | $ hg tip --config 'ui.logtemplate="{rev}\n"' | |
73 | 8 |
|
73 | 8 | |
74 | $ hg tip --config 'ui.logtemplate=n{rev}\n' |
|
74 | $ hg tip --config 'ui.logtemplate=n{rev}\n' | |
75 | n8 |
|
75 | n8 | |
76 |
|
76 | |||
77 | Make sure user/global hgrc does not affect tests |
|
77 | Make sure user/global hgrc does not affect tests | |
78 |
|
78 | |||
79 | $ echo '[ui]' > .hg/hgrc |
|
79 | $ echo '[ui]' > .hg/hgrc | |
80 | $ echo 'logtemplate =' >> .hg/hgrc |
|
80 | $ echo 'logtemplate =' >> .hg/hgrc | |
81 | $ echo 'style =' >> .hg/hgrc |
|
81 | $ echo 'style =' >> .hg/hgrc | |
82 |
|
82 | |||
83 | Add some simple styles to settings |
|
83 | Add some simple styles to settings | |
84 |
|
84 | |||
85 | $ echo '[templates]' >> .hg/hgrc |
|
85 | $ echo '[templates]' >> .hg/hgrc | |
86 | $ printf 'simple = "{rev}\\n"\n' >> .hg/hgrc |
|
86 | $ printf 'simple = "{rev}\\n"\n' >> .hg/hgrc | |
87 | $ printf 'simple2 = {rev}\\n\n' >> .hg/hgrc |
|
87 | $ printf 'simple2 = {rev}\\n\n' >> .hg/hgrc | |
88 |
|
88 | |||
89 | $ hg log -l1 -Tsimple |
|
89 | $ hg log -l1 -Tsimple | |
90 | 8 |
|
90 | 8 | |
91 | $ hg log -l1 -Tsimple2 |
|
91 | $ hg log -l1 -Tsimple2 | |
92 | 8 |
|
92 | 8 | |
93 |
|
93 | |||
94 | Test templates and style maps in files: |
|
94 | Test templates and style maps in files: | |
95 |
|
95 | |||
96 | $ echo "{rev}" > tmpl |
|
96 | $ echo "{rev}" > tmpl | |
97 | $ hg log -l1 -T./tmpl |
|
97 | $ hg log -l1 -T./tmpl | |
98 | 8 |
|
98 | 8 | |
99 | $ hg log -l1 -Tblah/blah |
|
99 | $ hg log -l1 -Tblah/blah | |
100 | blah/blah (no-eol) |
|
100 | blah/blah (no-eol) | |
101 |
|
101 | |||
102 | $ printf 'changeset = "{rev}\\n"\n' > map-simple |
|
102 | $ printf 'changeset = "{rev}\\n"\n' > map-simple | |
103 | $ hg log -l1 -T./map-simple |
|
103 | $ hg log -l1 -T./map-simple | |
104 | 8 |
|
104 | 8 | |
105 |
|
105 | |||
106 | Template should precede style option |
|
106 | Template should precede style option | |
107 |
|
107 | |||
108 | $ hg log -l1 --style default -T '{rev}\n' |
|
108 | $ hg log -l1 --style default -T '{rev}\n' | |
109 | 8 |
|
109 | 8 | |
110 |
|
110 | |||
111 | Add a commit with empty description, to ensure that the templates |
|
111 | Add a commit with empty description, to ensure that the templates | |
112 | below will omit the description line. |
|
112 | below will omit the description line. | |
113 |
|
113 | |||
114 | $ echo c >> c |
|
114 | $ echo c >> c | |
115 | $ hg add c |
|
115 | $ hg add c | |
116 | $ hg commit -qm ' ' |
|
116 | $ hg commit -qm ' ' | |
117 |
|
117 | |||
118 | Default style is like normal output. Phases style should be the same |
|
118 | Default style is like normal output. Phases style should be the same | |
119 | as default style, except for extra phase lines. |
|
119 | as default style, except for extra phase lines. | |
120 |
|
120 | |||
121 | $ hg log > log.out |
|
121 | $ hg log > log.out | |
122 | $ hg log --style default > style.out |
|
122 | $ hg log --style default > style.out | |
123 | $ cmp log.out style.out || diff -u log.out style.out |
|
123 | $ cmp log.out style.out || diff -u log.out style.out | |
124 | $ hg log -T phases > phases.out |
|
124 | $ hg log -T phases > phases.out | |
125 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
125 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
126 | +phase: draft |
|
126 | +phase: draft | |
127 | +phase: draft |
|
127 | +phase: draft | |
128 | +phase: draft |
|
128 | +phase: draft | |
129 | +phase: draft |
|
129 | +phase: draft | |
130 | +phase: draft |
|
130 | +phase: draft | |
131 | +phase: draft |
|
131 | +phase: draft | |
132 | +phase: draft |
|
132 | +phase: draft | |
133 | +phase: draft |
|
133 | +phase: draft | |
134 | +phase: draft |
|
134 | +phase: draft | |
135 | +phase: draft |
|
135 | +phase: draft | |
136 |
|
136 | |||
137 | $ hg log -v > log.out |
|
137 | $ hg log -v > log.out | |
138 | $ hg log -v --style default > style.out |
|
138 | $ hg log -v --style default > style.out | |
139 | $ cmp log.out style.out || diff -u log.out style.out |
|
139 | $ cmp log.out style.out || diff -u log.out style.out | |
140 | $ hg log -v -T phases > phases.out |
|
140 | $ hg log -v -T phases > phases.out | |
141 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
141 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
142 | +phase: draft |
|
142 | +phase: draft | |
143 | +phase: draft |
|
143 | +phase: draft | |
144 | +phase: draft |
|
144 | +phase: draft | |
145 | +phase: draft |
|
145 | +phase: draft | |
146 | +phase: draft |
|
146 | +phase: draft | |
147 | +phase: draft |
|
147 | +phase: draft | |
148 | +phase: draft |
|
148 | +phase: draft | |
149 | +phase: draft |
|
149 | +phase: draft | |
150 | +phase: draft |
|
150 | +phase: draft | |
151 | +phase: draft |
|
151 | +phase: draft | |
152 |
|
152 | |||
153 | $ hg log -q > log.out |
|
153 | $ hg log -q > log.out | |
154 | $ hg log -q --style default > style.out |
|
154 | $ hg log -q --style default > style.out | |
155 | $ cmp log.out style.out || diff -u log.out style.out |
|
155 | $ cmp log.out style.out || diff -u log.out style.out | |
156 | $ hg log -q -T phases > phases.out |
|
156 | $ hg log -q -T phases > phases.out | |
157 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
157 | $ cmp log.out phases.out || diff -u log.out phases.out | |
158 |
|
158 | |||
159 | $ hg log --debug > log.out |
|
159 | $ hg log --debug > log.out | |
160 | $ hg log --debug --style default > style.out |
|
160 | $ hg log --debug --style default > style.out | |
161 | $ cmp log.out style.out || diff -u log.out style.out |
|
161 | $ cmp log.out style.out || diff -u log.out style.out | |
162 | $ hg log --debug -T phases > phases.out |
|
162 | $ hg log --debug -T phases > phases.out | |
163 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
163 | $ cmp log.out phases.out || diff -u log.out phases.out | |
164 |
|
164 | |||
165 | Default style of working-directory revision should also be the same (but |
|
165 | Default style of working-directory revision should also be the same (but | |
166 | date may change while running tests): |
|
166 | date may change while running tests): | |
167 |
|
167 | |||
168 | $ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out |
|
168 | $ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out | |
169 | $ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out |
|
169 | $ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out | |
170 | $ cmp log.out style.out || diff -u log.out style.out |
|
170 | $ cmp log.out style.out || diff -u log.out style.out | |
171 |
|
171 | |||
172 | $ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out |
|
172 | $ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out | |
173 | $ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out |
|
173 | $ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out | |
174 | $ cmp log.out style.out || diff -u log.out style.out |
|
174 | $ cmp log.out style.out || diff -u log.out style.out | |
175 |
|
175 | |||
176 | $ hg log -r 'wdir()' -q > log.out |
|
176 | $ hg log -r 'wdir()' -q > log.out | |
177 | $ hg log -r 'wdir()' -q --style default > style.out |
|
177 | $ hg log -r 'wdir()' -q --style default > style.out | |
178 | $ cmp log.out style.out || diff -u log.out style.out |
|
178 | $ cmp log.out style.out || diff -u log.out style.out | |
179 |
|
179 | |||
180 | $ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out |
|
180 | $ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out | |
181 | $ hg log -r 'wdir()' --debug --style default \ |
|
181 | $ hg log -r 'wdir()' --debug --style default \ | |
182 | > | sed 's|^date:.*|date:|' > style.out |
|
182 | > | sed 's|^date:.*|date:|' > style.out | |
183 | $ cmp log.out style.out || diff -u log.out style.out |
|
183 | $ cmp log.out style.out || diff -u log.out style.out | |
184 |
|
184 | |||
185 | Default style should also preserve color information (issue2866): |
|
185 | Default style should also preserve color information (issue2866): | |
186 |
|
186 | |||
187 | $ cp $HGRCPATH $HGRCPATH-bak |
|
187 | $ cp $HGRCPATH $HGRCPATH-bak | |
188 | $ cat <<EOF >> $HGRCPATH |
|
188 | $ cat <<EOF >> $HGRCPATH | |
189 | > [extensions] |
|
189 | > [extensions] | |
190 | > color= |
|
190 | > color= | |
191 | > EOF |
|
191 | > EOF | |
192 |
|
192 | |||
193 | $ hg --color=debug log > log.out |
|
193 | $ hg --color=debug log > log.out | |
194 | $ hg --color=debug log --style default > style.out |
|
194 | $ hg --color=debug log --style default > style.out | |
195 | $ cmp log.out style.out || diff -u log.out style.out |
|
195 | $ cmp log.out style.out || diff -u log.out style.out | |
196 | $ hg --color=debug log -T phases > phases.out |
|
196 | $ hg --color=debug log -T phases > phases.out | |
197 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
197 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
198 | +[log.phase|phase: draft] |
|
198 | +[log.phase|phase: draft] | |
199 | +[log.phase|phase: draft] |
|
199 | +[log.phase|phase: draft] | |
200 | +[log.phase|phase: draft] |
|
200 | +[log.phase|phase: draft] | |
201 | +[log.phase|phase: draft] |
|
201 | +[log.phase|phase: draft] | |
202 | +[log.phase|phase: draft] |
|
202 | +[log.phase|phase: draft] | |
203 | +[log.phase|phase: draft] |
|
203 | +[log.phase|phase: draft] | |
204 | +[log.phase|phase: draft] |
|
204 | +[log.phase|phase: draft] | |
205 | +[log.phase|phase: draft] |
|
205 | +[log.phase|phase: draft] | |
206 | +[log.phase|phase: draft] |
|
206 | +[log.phase|phase: draft] | |
207 | +[log.phase|phase: draft] |
|
207 | +[log.phase|phase: draft] | |
208 |
|
208 | |||
209 | $ hg --color=debug -v log > log.out |
|
209 | $ hg --color=debug -v log > log.out | |
210 | $ hg --color=debug -v log --style default > style.out |
|
210 | $ hg --color=debug -v log --style default > style.out | |
211 | $ cmp log.out style.out || diff -u log.out style.out |
|
211 | $ cmp log.out style.out || diff -u log.out style.out | |
212 | $ hg --color=debug -v log -T phases > phases.out |
|
212 | $ hg --color=debug -v log -T phases > phases.out | |
213 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' |
|
213 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
214 | +[log.phase|phase: draft] |
|
214 | +[log.phase|phase: draft] | |
215 | +[log.phase|phase: draft] |
|
215 | +[log.phase|phase: draft] | |
216 | +[log.phase|phase: draft] |
|
216 | +[log.phase|phase: draft] | |
217 | +[log.phase|phase: draft] |
|
217 | +[log.phase|phase: draft] | |
218 | +[log.phase|phase: draft] |
|
218 | +[log.phase|phase: draft] | |
219 | +[log.phase|phase: draft] |
|
219 | +[log.phase|phase: draft] | |
220 | +[log.phase|phase: draft] |
|
220 | +[log.phase|phase: draft] | |
221 | +[log.phase|phase: draft] |
|
221 | +[log.phase|phase: draft] | |
222 | +[log.phase|phase: draft] |
|
222 | +[log.phase|phase: draft] | |
223 | +[log.phase|phase: draft] |
|
223 | +[log.phase|phase: draft] | |
224 |
|
224 | |||
225 | $ hg --color=debug -q log > log.out |
|
225 | $ hg --color=debug -q log > log.out | |
226 | $ hg --color=debug -q log --style default > style.out |
|
226 | $ hg --color=debug -q log --style default > style.out | |
227 | $ cmp log.out style.out || diff -u log.out style.out |
|
227 | $ cmp log.out style.out || diff -u log.out style.out | |
228 | $ hg --color=debug -q log -T phases > phases.out |
|
228 | $ hg --color=debug -q log -T phases > phases.out | |
229 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
229 | $ cmp log.out phases.out || diff -u log.out phases.out | |
230 |
|
230 | |||
231 | $ hg --color=debug --debug log > log.out |
|
231 | $ hg --color=debug --debug log > log.out | |
232 | $ hg --color=debug --debug log --style default > style.out |
|
232 | $ hg --color=debug --debug log --style default > style.out | |
233 | $ cmp log.out style.out || diff -u log.out style.out |
|
233 | $ cmp log.out style.out || diff -u log.out style.out | |
234 | $ hg --color=debug --debug log -T phases > phases.out |
|
234 | $ hg --color=debug --debug log -T phases > phases.out | |
235 | $ cmp log.out phases.out || diff -u log.out phases.out |
|
235 | $ cmp log.out phases.out || diff -u log.out phases.out | |
236 |
|
236 | |||
237 | $ mv $HGRCPATH-bak $HGRCPATH |
|
237 | $ mv $HGRCPATH-bak $HGRCPATH | |
238 |
|
238 | |||
239 | Remove commit with empty commit message, so as to not pollute further |
|
239 | Remove commit with empty commit message, so as to not pollute further | |
240 | tests. |
|
240 | tests. | |
241 |
|
241 | |||
242 | $ hg --config extensions.strip= strip -q . |
|
242 | $ hg --config extensions.strip= strip -q . | |
243 |
|
243 | |||
244 | Revision with no copies (used to print a traceback): |
|
244 | Revision with no copies (used to print a traceback): | |
245 |
|
245 | |||
246 | $ hg tip -v --template '\n' |
|
246 | $ hg tip -v --template '\n' | |
247 |
|
247 | |||
248 |
|
248 | |||
249 | Compact style works: |
|
249 | Compact style works: | |
250 |
|
250 | |||
251 | $ hg log -Tcompact |
|
251 | $ hg log -Tcompact | |
252 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
252 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test | |
253 | third |
|
253 | third | |
254 |
|
254 | |||
255 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user |
|
255 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user | |
256 | second |
|
256 | second | |
257 |
|
257 | |||
258 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
258 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person | |
259 | merge |
|
259 | merge | |
260 |
|
260 | |||
261 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
261 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
262 | new head |
|
262 | new head | |
263 |
|
263 | |||
264 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
264 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person | |
265 | new branch |
|
265 | new branch | |
266 |
|
266 | |||
267 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
267 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
268 | no user, no domain |
|
268 | no user, no domain | |
269 |
|
269 | |||
270 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other |
|
270 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
271 | no person |
|
271 | no person | |
272 |
|
272 | |||
273 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other |
|
273 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
274 | other 1 |
|
274 | other 1 | |
275 |
|
275 | |||
276 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
276 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
277 | line 1 |
|
277 | line 1 | |
278 |
|
278 | |||
279 |
|
279 | |||
280 | $ hg log -v --style compact |
|
280 | $ hg log -v --style compact | |
281 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test |
|
281 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test | |
282 | third |
|
282 | third | |
283 |
|
283 | |||
284 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
284 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> | |
285 | second |
|
285 | second | |
286 |
|
286 | |||
287 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
287 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person | |
288 | merge |
|
288 | merge | |
289 |
|
289 | |||
290 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
290 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
291 | new head |
|
291 | new head | |
292 |
|
292 | |||
293 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
293 | 4 bbe44766e73d 1970-01-17 04:53 +0000 person | |
294 | new branch |
|
294 | new branch | |
295 |
|
295 | |||
296 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
296 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
297 | no user, no domain |
|
297 | no user, no domain | |
298 |
|
298 | |||
299 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
299 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place | |
300 | no person |
|
300 | no person | |
301 |
|
301 | |||
302 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
302 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> | |
303 | other 1 |
|
303 | other 1 | |
304 | other 2 |
|
304 | other 2 | |
305 |
|
305 | |||
306 | other 3 |
|
306 | other 3 | |
307 |
|
307 | |||
308 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
308 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> | |
309 | line 1 |
|
309 | line 1 | |
310 | line 2 |
|
310 | line 2 | |
311 |
|
311 | |||
312 |
|
312 | |||
313 | $ hg log --debug --style compact |
|
313 | $ hg log --debug --style compact | |
314 | 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test |
|
314 | 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test | |
315 | third |
|
315 | third | |
316 |
|
316 | |||
317 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
317 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> | |
318 | second |
|
318 | second | |
319 |
|
319 | |||
320 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person |
|
320 | 6:5,4 d41e714fe50d 1970-01-18 08:40 +0000 person | |
321 | merge |
|
321 | merge | |
322 |
|
322 | |||
323 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
323 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person | |
324 | new head |
|
324 | new head | |
325 |
|
325 | |||
326 | 4:3,-1 bbe44766e73d 1970-01-17 04:53 +0000 person |
|
326 | 4:3,-1 bbe44766e73d 1970-01-17 04:53 +0000 person | |
327 | new branch |
|
327 | new branch | |
328 |
|
328 | |||
329 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
329 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
330 | no user, no domain |
|
330 | no user, no domain | |
331 |
|
331 | |||
332 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
332 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place | |
333 | no person |
|
333 | no person | |
334 |
|
334 | |||
335 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
335 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> | |
336 | other 1 |
|
336 | other 1 | |
337 | other 2 |
|
337 | other 2 | |
338 |
|
338 | |||
339 | other 3 |
|
339 | other 3 | |
340 |
|
340 | |||
341 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
341 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> | |
342 | line 1 |
|
342 | line 1 | |
343 | line 2 |
|
343 | line 2 | |
344 |
|
344 | |||
345 |
|
345 | |||
346 | Test xml styles: |
|
346 | Test xml styles: | |
347 |
|
347 | |||
348 | $ hg log --style xml -r 'not all()' |
|
348 | $ hg log --style xml -r 'not all()' | |
349 | <?xml version="1.0"?> |
|
349 | <?xml version="1.0"?> | |
350 | <log> |
|
350 | <log> | |
351 | </log> |
|
351 | </log> | |
352 |
|
352 | |||
353 | $ hg log --style xml |
|
353 | $ hg log --style xml | |
354 | <?xml version="1.0"?> |
|
354 | <?xml version="1.0"?> | |
355 | <log> |
|
355 | <log> | |
356 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
356 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
357 | <tag>tip</tag> |
|
357 | <tag>tip</tag> | |
358 | <author email="test">test</author> |
|
358 | <author email="test">test</author> | |
359 | <date>2020-01-01T10:01:00+00:00</date> |
|
359 | <date>2020-01-01T10:01:00+00:00</date> | |
360 | <msg xml:space="preserve">third</msg> |
|
360 | <msg xml:space="preserve">third</msg> | |
361 | </logentry> |
|
361 | </logentry> | |
362 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
362 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
363 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
363 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
364 | <author email="user@hostname">User Name</author> |
|
364 | <author email="user@hostname">User Name</author> | |
365 | <date>1970-01-12T13:46:40+00:00</date> |
|
365 | <date>1970-01-12T13:46:40+00:00</date> | |
366 | <msg xml:space="preserve">second</msg> |
|
366 | <msg xml:space="preserve">second</msg> | |
367 | </logentry> |
|
367 | </logentry> | |
368 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
368 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> | |
369 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
369 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
370 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
370 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> | |
371 | <author email="person">person</author> |
|
371 | <author email="person">person</author> | |
372 | <date>1970-01-18T08:40:01+00:00</date> |
|
372 | <date>1970-01-18T08:40:01+00:00</date> | |
373 | <msg xml:space="preserve">merge</msg> |
|
373 | <msg xml:space="preserve">merge</msg> | |
374 | </logentry> |
|
374 | </logentry> | |
375 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
375 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
376 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
376 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
377 | <author email="person">person</author> |
|
377 | <author email="person">person</author> | |
378 | <date>1970-01-18T08:40:00+00:00</date> |
|
378 | <date>1970-01-18T08:40:00+00:00</date> | |
379 | <msg xml:space="preserve">new head</msg> |
|
379 | <msg xml:space="preserve">new head</msg> | |
380 | </logentry> |
|
380 | </logentry> | |
381 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
381 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> | |
382 | <branch>foo</branch> |
|
382 | <branch>foo</branch> | |
383 | <author email="person">person</author> |
|
383 | <author email="person">person</author> | |
384 | <date>1970-01-17T04:53:20+00:00</date> |
|
384 | <date>1970-01-17T04:53:20+00:00</date> | |
385 | <msg xml:space="preserve">new branch</msg> |
|
385 | <msg xml:space="preserve">new branch</msg> | |
386 | </logentry> |
|
386 | </logentry> | |
387 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
387 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
388 | <author email="person">person</author> |
|
388 | <author email="person">person</author> | |
389 | <date>1970-01-16T01:06:40+00:00</date> |
|
389 | <date>1970-01-16T01:06:40+00:00</date> | |
390 | <msg xml:space="preserve">no user, no domain</msg> |
|
390 | <msg xml:space="preserve">no user, no domain</msg> | |
391 | </logentry> |
|
391 | </logentry> | |
392 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
392 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
393 | <author email="other@place">other</author> |
|
393 | <author email="other@place">other</author> | |
394 | <date>1970-01-14T21:20:00+00:00</date> |
|
394 | <date>1970-01-14T21:20:00+00:00</date> | |
395 | <msg xml:space="preserve">no person</msg> |
|
395 | <msg xml:space="preserve">no person</msg> | |
396 | </logentry> |
|
396 | </logentry> | |
397 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
397 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
398 | <author email="other@place">A. N. Other</author> |
|
398 | <author email="other@place">A. N. Other</author> | |
399 | <date>1970-01-13T17:33:20+00:00</date> |
|
399 | <date>1970-01-13T17:33:20+00:00</date> | |
400 | <msg xml:space="preserve">other 1 |
|
400 | <msg xml:space="preserve">other 1 | |
401 | other 2 |
|
401 | other 2 | |
402 |
|
402 | |||
403 | other 3</msg> |
|
403 | other 3</msg> | |
404 | </logentry> |
|
404 | </logentry> | |
405 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
405 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
406 | <author email="user@hostname">User Name</author> |
|
406 | <author email="user@hostname">User Name</author> | |
407 | <date>1970-01-12T13:46:40+00:00</date> |
|
407 | <date>1970-01-12T13:46:40+00:00</date> | |
408 | <msg xml:space="preserve">line 1 |
|
408 | <msg xml:space="preserve">line 1 | |
409 | line 2</msg> |
|
409 | line 2</msg> | |
410 | </logentry> |
|
410 | </logentry> | |
411 | </log> |
|
411 | </log> | |
412 |
|
412 | |||
413 | $ hg log -v --style xml |
|
413 | $ hg log -v --style xml | |
414 | <?xml version="1.0"?> |
|
414 | <?xml version="1.0"?> | |
415 | <log> |
|
415 | <log> | |
416 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
416 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
417 | <tag>tip</tag> |
|
417 | <tag>tip</tag> | |
418 | <author email="test">test</author> |
|
418 | <author email="test">test</author> | |
419 | <date>2020-01-01T10:01:00+00:00</date> |
|
419 | <date>2020-01-01T10:01:00+00:00</date> | |
420 | <msg xml:space="preserve">third</msg> |
|
420 | <msg xml:space="preserve">third</msg> | |
421 | <paths> |
|
421 | <paths> | |
422 | <path action="A">fourth</path> |
|
422 | <path action="A">fourth</path> | |
423 | <path action="A">third</path> |
|
423 | <path action="A">third</path> | |
424 | <path action="R">second</path> |
|
424 | <path action="R">second</path> | |
425 | </paths> |
|
425 | </paths> | |
426 | <copies> |
|
426 | <copies> | |
427 | <copy source="second">fourth</copy> |
|
427 | <copy source="second">fourth</copy> | |
428 | </copies> |
|
428 | </copies> | |
429 | </logentry> |
|
429 | </logentry> | |
430 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
430 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
431 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
431 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
432 | <author email="user@hostname">User Name</author> |
|
432 | <author email="user@hostname">User Name</author> | |
433 | <date>1970-01-12T13:46:40+00:00</date> |
|
433 | <date>1970-01-12T13:46:40+00:00</date> | |
434 | <msg xml:space="preserve">second</msg> |
|
434 | <msg xml:space="preserve">second</msg> | |
435 | <paths> |
|
435 | <paths> | |
436 | <path action="A">second</path> |
|
436 | <path action="A">second</path> | |
437 | </paths> |
|
437 | </paths> | |
438 | </logentry> |
|
438 | </logentry> | |
439 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
439 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> | |
440 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
440 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
441 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
441 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> | |
442 | <author email="person">person</author> |
|
442 | <author email="person">person</author> | |
443 | <date>1970-01-18T08:40:01+00:00</date> |
|
443 | <date>1970-01-18T08:40:01+00:00</date> | |
444 | <msg xml:space="preserve">merge</msg> |
|
444 | <msg xml:space="preserve">merge</msg> | |
445 | <paths> |
|
445 | <paths> | |
446 | </paths> |
|
446 | </paths> | |
447 | </logentry> |
|
447 | </logentry> | |
448 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
448 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
449 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
449 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
450 | <author email="person">person</author> |
|
450 | <author email="person">person</author> | |
451 | <date>1970-01-18T08:40:00+00:00</date> |
|
451 | <date>1970-01-18T08:40:00+00:00</date> | |
452 | <msg xml:space="preserve">new head</msg> |
|
452 | <msg xml:space="preserve">new head</msg> | |
453 | <paths> |
|
453 | <paths> | |
454 | <path action="A">d</path> |
|
454 | <path action="A">d</path> | |
455 | </paths> |
|
455 | </paths> | |
456 | </logentry> |
|
456 | </logentry> | |
457 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
457 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> | |
458 | <branch>foo</branch> |
|
458 | <branch>foo</branch> | |
459 | <author email="person">person</author> |
|
459 | <author email="person">person</author> | |
460 | <date>1970-01-17T04:53:20+00:00</date> |
|
460 | <date>1970-01-17T04:53:20+00:00</date> | |
461 | <msg xml:space="preserve">new branch</msg> |
|
461 | <msg xml:space="preserve">new branch</msg> | |
462 | <paths> |
|
462 | <paths> | |
463 | </paths> |
|
463 | </paths> | |
464 | </logentry> |
|
464 | </logentry> | |
465 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
465 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
466 | <author email="person">person</author> |
|
466 | <author email="person">person</author> | |
467 | <date>1970-01-16T01:06:40+00:00</date> |
|
467 | <date>1970-01-16T01:06:40+00:00</date> | |
468 | <msg xml:space="preserve">no user, no domain</msg> |
|
468 | <msg xml:space="preserve">no user, no domain</msg> | |
469 | <paths> |
|
469 | <paths> | |
470 | <path action="M">c</path> |
|
470 | <path action="M">c</path> | |
471 | </paths> |
|
471 | </paths> | |
472 | </logentry> |
|
472 | </logentry> | |
473 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
473 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
474 | <author email="other@place">other</author> |
|
474 | <author email="other@place">other</author> | |
475 | <date>1970-01-14T21:20:00+00:00</date> |
|
475 | <date>1970-01-14T21:20:00+00:00</date> | |
476 | <msg xml:space="preserve">no person</msg> |
|
476 | <msg xml:space="preserve">no person</msg> | |
477 | <paths> |
|
477 | <paths> | |
478 | <path action="A">c</path> |
|
478 | <path action="A">c</path> | |
479 | </paths> |
|
479 | </paths> | |
480 | </logentry> |
|
480 | </logentry> | |
481 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
481 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
482 | <author email="other@place">A. N. Other</author> |
|
482 | <author email="other@place">A. N. Other</author> | |
483 | <date>1970-01-13T17:33:20+00:00</date> |
|
483 | <date>1970-01-13T17:33:20+00:00</date> | |
484 | <msg xml:space="preserve">other 1 |
|
484 | <msg xml:space="preserve">other 1 | |
485 | other 2 |
|
485 | other 2 | |
486 |
|
486 | |||
487 | other 3</msg> |
|
487 | other 3</msg> | |
488 | <paths> |
|
488 | <paths> | |
489 | <path action="A">b</path> |
|
489 | <path action="A">b</path> | |
490 | </paths> |
|
490 | </paths> | |
491 | </logentry> |
|
491 | </logentry> | |
492 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
492 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
493 | <author email="user@hostname">User Name</author> |
|
493 | <author email="user@hostname">User Name</author> | |
494 | <date>1970-01-12T13:46:40+00:00</date> |
|
494 | <date>1970-01-12T13:46:40+00:00</date> | |
495 | <msg xml:space="preserve">line 1 |
|
495 | <msg xml:space="preserve">line 1 | |
496 | line 2</msg> |
|
496 | line 2</msg> | |
497 | <paths> |
|
497 | <paths> | |
498 | <path action="A">a</path> |
|
498 | <path action="A">a</path> | |
499 | </paths> |
|
499 | </paths> | |
500 | </logentry> |
|
500 | </logentry> | |
501 | </log> |
|
501 | </log> | |
502 |
|
502 | |||
503 | $ hg log --debug --style xml |
|
503 | $ hg log --debug --style xml | |
504 | <?xml version="1.0"?> |
|
504 | <?xml version="1.0"?> | |
505 | <log> |
|
505 | <log> | |
506 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> |
|
506 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
507 | <tag>tip</tag> |
|
507 | <tag>tip</tag> | |
508 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> |
|
508 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> | |
509 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
509 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
510 | <author email="test">test</author> |
|
510 | <author email="test">test</author> | |
511 | <date>2020-01-01T10:01:00+00:00</date> |
|
511 | <date>2020-01-01T10:01:00+00:00</date> | |
512 | <msg xml:space="preserve">third</msg> |
|
512 | <msg xml:space="preserve">third</msg> | |
513 | <paths> |
|
513 | <paths> | |
514 | <path action="A">fourth</path> |
|
514 | <path action="A">fourth</path> | |
515 | <path action="A">third</path> |
|
515 | <path action="A">third</path> | |
516 | <path action="R">second</path> |
|
516 | <path action="R">second</path> | |
517 | </paths> |
|
517 | </paths> | |
518 | <copies> |
|
518 | <copies> | |
519 | <copy source="second">fourth</copy> |
|
519 | <copy source="second">fourth</copy> | |
520 | </copies> |
|
520 | </copies> | |
521 | <extra key="branch">default</extra> |
|
521 | <extra key="branch">default</extra> | |
522 | </logentry> |
|
522 | </logentry> | |
523 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
523 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
524 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
524 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
525 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
525 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
526 | <author email="user@hostname">User Name</author> |
|
526 | <author email="user@hostname">User Name</author> | |
527 | <date>1970-01-12T13:46:40+00:00</date> |
|
527 | <date>1970-01-12T13:46:40+00:00</date> | |
528 | <msg xml:space="preserve">second</msg> |
|
528 | <msg xml:space="preserve">second</msg> | |
529 | <paths> |
|
529 | <paths> | |
530 | <path action="A">second</path> |
|
530 | <path action="A">second</path> | |
531 | </paths> |
|
531 | </paths> | |
532 | <extra key="branch">default</extra> |
|
532 | <extra key="branch">default</extra> | |
533 | </logentry> |
|
533 | </logentry> | |
534 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> |
|
534 | <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b"> | |
535 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
535 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
536 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> |
|
536 | <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" /> | |
537 | <author email="person">person</author> |
|
537 | <author email="person">person</author> | |
538 | <date>1970-01-18T08:40:01+00:00</date> |
|
538 | <date>1970-01-18T08:40:01+00:00</date> | |
539 | <msg xml:space="preserve">merge</msg> |
|
539 | <msg xml:space="preserve">merge</msg> | |
540 | <paths> |
|
540 | <paths> | |
541 | </paths> |
|
541 | </paths> | |
542 | <extra key="branch">default</extra> |
|
542 | <extra key="branch">default</extra> | |
543 | </logentry> |
|
543 | </logentry> | |
544 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
544 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
545 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
545 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
546 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
546 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
547 | <author email="person">person</author> |
|
547 | <author email="person">person</author> | |
548 | <date>1970-01-18T08:40:00+00:00</date> |
|
548 | <date>1970-01-18T08:40:00+00:00</date> | |
549 | <msg xml:space="preserve">new head</msg> |
|
549 | <msg xml:space="preserve">new head</msg> | |
550 | <paths> |
|
550 | <paths> | |
551 | <path action="A">d</path> |
|
551 | <path action="A">d</path> | |
552 | </paths> |
|
552 | </paths> | |
553 | <extra key="branch">default</extra> |
|
553 | <extra key="branch">default</extra> | |
554 | </logentry> |
|
554 | </logentry> | |
555 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> |
|
555 | <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74"> | |
556 | <branch>foo</branch> |
|
556 | <branch>foo</branch> | |
557 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
557 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
558 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
558 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
559 | <author email="person">person</author> |
|
559 | <author email="person">person</author> | |
560 | <date>1970-01-17T04:53:20+00:00</date> |
|
560 | <date>1970-01-17T04:53:20+00:00</date> | |
561 | <msg xml:space="preserve">new branch</msg> |
|
561 | <msg xml:space="preserve">new branch</msg> | |
562 | <paths> |
|
562 | <paths> | |
563 | </paths> |
|
563 | </paths> | |
564 | <extra key="branch">foo</extra> |
|
564 | <extra key="branch">foo</extra> | |
565 | </logentry> |
|
565 | </logentry> | |
566 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
566 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
567 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> |
|
567 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> | |
568 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
568 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
569 | <author email="person">person</author> |
|
569 | <author email="person">person</author> | |
570 | <date>1970-01-16T01:06:40+00:00</date> |
|
570 | <date>1970-01-16T01:06:40+00:00</date> | |
571 | <msg xml:space="preserve">no user, no domain</msg> |
|
571 | <msg xml:space="preserve">no user, no domain</msg> | |
572 | <paths> |
|
572 | <paths> | |
573 | <path action="M">c</path> |
|
573 | <path action="M">c</path> | |
574 | </paths> |
|
574 | </paths> | |
575 | <extra key="branch">default</extra> |
|
575 | <extra key="branch">default</extra> | |
576 | </logentry> |
|
576 | </logentry> | |
577 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
577 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
578 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> |
|
578 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> | |
579 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
579 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
580 | <author email="other@place">other</author> |
|
580 | <author email="other@place">other</author> | |
581 | <date>1970-01-14T21:20:00+00:00</date> |
|
581 | <date>1970-01-14T21:20:00+00:00</date> | |
582 | <msg xml:space="preserve">no person</msg> |
|
582 | <msg xml:space="preserve">no person</msg> | |
583 | <paths> |
|
583 | <paths> | |
584 | <path action="A">c</path> |
|
584 | <path action="A">c</path> | |
585 | </paths> |
|
585 | </paths> | |
586 | <extra key="branch">default</extra> |
|
586 | <extra key="branch">default</extra> | |
587 | </logentry> |
|
587 | </logentry> | |
588 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
588 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
589 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> |
|
589 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> | |
590 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
590 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
591 | <author email="other@place">A. N. Other</author> |
|
591 | <author email="other@place">A. N. Other</author> | |
592 | <date>1970-01-13T17:33:20+00:00</date> |
|
592 | <date>1970-01-13T17:33:20+00:00</date> | |
593 | <msg xml:space="preserve">other 1 |
|
593 | <msg xml:space="preserve">other 1 | |
594 | other 2 |
|
594 | other 2 | |
595 |
|
595 | |||
596 | other 3</msg> |
|
596 | other 3</msg> | |
597 | <paths> |
|
597 | <paths> | |
598 | <path action="A">b</path> |
|
598 | <path action="A">b</path> | |
599 | </paths> |
|
599 | </paths> | |
600 | <extra key="branch">default</extra> |
|
600 | <extra key="branch">default</extra> | |
601 | </logentry> |
|
601 | </logentry> | |
602 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
602 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
603 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
603 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
604 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
604 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
605 | <author email="user@hostname">User Name</author> |
|
605 | <author email="user@hostname">User Name</author> | |
606 | <date>1970-01-12T13:46:40+00:00</date> |
|
606 | <date>1970-01-12T13:46:40+00:00</date> | |
607 | <msg xml:space="preserve">line 1 |
|
607 | <msg xml:space="preserve">line 1 | |
608 | line 2</msg> |
|
608 | line 2</msg> | |
609 | <paths> |
|
609 | <paths> | |
610 | <path action="A">a</path> |
|
610 | <path action="A">a</path> | |
611 | </paths> |
|
611 | </paths> | |
612 | <extra key="branch">default</extra> |
|
612 | <extra key="branch">default</extra> | |
613 | </logentry> |
|
613 | </logentry> | |
614 | </log> |
|
614 | </log> | |
615 |
|
615 | |||
616 |
|
616 | |||
617 | Test JSON style: |
|
617 | Test JSON style: | |
618 |
|
618 | |||
619 | $ hg log -k nosuch -Tjson |
|
619 | $ hg log -k nosuch -Tjson | |
620 | [] |
|
620 | [] | |
621 |
|
621 | |||
622 | $ hg log -qr . -Tjson |
|
622 | $ hg log -qr . -Tjson | |
623 | [ |
|
623 | [ | |
624 | { |
|
624 | { | |
625 | "rev": 8, |
|
625 | "rev": 8, | |
626 | "node": "95c24699272ef57d062b8bccc32c878bf841784a" |
|
626 | "node": "95c24699272ef57d062b8bccc32c878bf841784a" | |
627 | } |
|
627 | } | |
628 | ] |
|
628 | ] | |
629 |
|
629 | |||
630 | $ hg log -vpr . -Tjson --stat |
|
630 | $ hg log -vpr . -Tjson --stat | |
631 | [ |
|
631 | [ | |
632 | { |
|
632 | { | |
633 | "rev": 8, |
|
633 | "rev": 8, | |
634 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
634 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
635 | "branch": "default", |
|
635 | "branch": "default", | |
636 | "phase": "draft", |
|
636 | "phase": "draft", | |
637 | "user": "test", |
|
637 | "user": "test", | |
638 | "date": [1577872860, 0], |
|
638 | "date": [1577872860, 0], | |
639 | "desc": "third", |
|
639 | "desc": "third", | |
640 | "bookmarks": [], |
|
640 | "bookmarks": [], | |
641 | "tags": ["tip"], |
|
641 | "tags": ["tip"], | |
642 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
642 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | |
643 | "files": ["fourth", "second", "third"], |
|
643 | "files": ["fourth", "second", "third"], | |
644 | "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", |
|
644 | "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", | |
645 | "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" |
|
645 | "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" | |
646 | } |
|
646 | } | |
647 | ] |
|
647 | ] | |
648 |
|
648 | |||
649 | honor --git but not format-breaking diffopts |
|
649 | honor --git but not format-breaking diffopts | |
650 | $ hg --config diff.noprefix=True log --git -vpr . -Tjson |
|
650 | $ hg --config diff.noprefix=True log --git -vpr . -Tjson | |
651 | [ |
|
651 | [ | |
652 | { |
|
652 | { | |
653 | "rev": 8, |
|
653 | "rev": 8, | |
654 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
654 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
655 | "branch": "default", |
|
655 | "branch": "default", | |
656 | "phase": "draft", |
|
656 | "phase": "draft", | |
657 | "user": "test", |
|
657 | "user": "test", | |
658 | "date": [1577872860, 0], |
|
658 | "date": [1577872860, 0], | |
659 | "desc": "third", |
|
659 | "desc": "third", | |
660 | "bookmarks": [], |
|
660 | "bookmarks": [], | |
661 | "tags": ["tip"], |
|
661 | "tags": ["tip"], | |
662 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
662 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | |
663 | "files": ["fourth", "second", "third"], |
|
663 | "files": ["fourth", "second", "third"], | |
664 | "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" |
|
664 | "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" | |
665 | } |
|
665 | } | |
666 | ] |
|
666 | ] | |
667 |
|
667 | |||
668 | $ hg log -T json |
|
668 | $ hg log -T json | |
669 | [ |
|
669 | [ | |
670 | { |
|
670 | { | |
671 | "rev": 8, |
|
671 | "rev": 8, | |
672 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
672 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
673 | "branch": "default", |
|
673 | "branch": "default", | |
674 | "phase": "draft", |
|
674 | "phase": "draft", | |
675 | "user": "test", |
|
675 | "user": "test", | |
676 | "date": [1577872860, 0], |
|
676 | "date": [1577872860, 0], | |
677 | "desc": "third", |
|
677 | "desc": "third", | |
678 | "bookmarks": [], |
|
678 | "bookmarks": [], | |
679 | "tags": ["tip"], |
|
679 | "tags": ["tip"], | |
680 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"] |
|
680 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"] | |
681 | }, |
|
681 | }, | |
682 | { |
|
682 | { | |
683 | "rev": 7, |
|
683 | "rev": 7, | |
684 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
684 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", | |
685 | "branch": "default", |
|
685 | "branch": "default", | |
686 | "phase": "draft", |
|
686 | "phase": "draft", | |
687 | "user": "User Name <user@hostname>", |
|
687 | "user": "User Name <user@hostname>", | |
688 | "date": [1000000, 0], |
|
688 | "date": [1000000, 0], | |
689 | "desc": "second", |
|
689 | "desc": "second", | |
690 | "bookmarks": [], |
|
690 | "bookmarks": [], | |
691 | "tags": [], |
|
691 | "tags": [], | |
692 | "parents": ["0000000000000000000000000000000000000000"] |
|
692 | "parents": ["0000000000000000000000000000000000000000"] | |
693 | }, |
|
693 | }, | |
694 | { |
|
694 | { | |
695 | "rev": 6, |
|
695 | "rev": 6, | |
696 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
696 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", | |
697 | "branch": "default", |
|
697 | "branch": "default", | |
698 | "phase": "draft", |
|
698 | "phase": "draft", | |
699 | "user": "person", |
|
699 | "user": "person", | |
700 | "date": [1500001, 0], |
|
700 | "date": [1500001, 0], | |
701 | "desc": "merge", |
|
701 | "desc": "merge", | |
702 | "bookmarks": [], |
|
702 | "bookmarks": [], | |
703 | "tags": [], |
|
703 | "tags": [], | |
704 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"] |
|
704 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"] | |
705 | }, |
|
705 | }, | |
706 | { |
|
706 | { | |
707 | "rev": 5, |
|
707 | "rev": 5, | |
708 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
708 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", | |
709 | "branch": "default", |
|
709 | "branch": "default", | |
710 | "phase": "draft", |
|
710 | "phase": "draft", | |
711 | "user": "person", |
|
711 | "user": "person", | |
712 | "date": [1500000, 0], |
|
712 | "date": [1500000, 0], | |
713 | "desc": "new head", |
|
713 | "desc": "new head", | |
714 | "bookmarks": [], |
|
714 | "bookmarks": [], | |
715 | "tags": [], |
|
715 | "tags": [], | |
716 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
716 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] | |
717 | }, |
|
717 | }, | |
718 | { |
|
718 | { | |
719 | "rev": 4, |
|
719 | "rev": 4, | |
720 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
720 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", | |
721 | "branch": "foo", |
|
721 | "branch": "foo", | |
722 | "phase": "draft", |
|
722 | "phase": "draft", | |
723 | "user": "person", |
|
723 | "user": "person", | |
724 | "date": [1400000, 0], |
|
724 | "date": [1400000, 0], | |
725 | "desc": "new branch", |
|
725 | "desc": "new branch", | |
726 | "bookmarks": [], |
|
726 | "bookmarks": [], | |
727 | "tags": [], |
|
727 | "tags": [], | |
728 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] |
|
728 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"] | |
729 | }, |
|
729 | }, | |
730 | { |
|
730 | { | |
731 | "rev": 3, |
|
731 | "rev": 3, | |
732 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
732 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", | |
733 | "branch": "default", |
|
733 | "branch": "default", | |
734 | "phase": "draft", |
|
734 | "phase": "draft", | |
735 | "user": "person", |
|
735 | "user": "person", | |
736 | "date": [1300000, 0], |
|
736 | "date": [1300000, 0], | |
737 | "desc": "no user, no domain", |
|
737 | "desc": "no user, no domain", | |
738 | "bookmarks": [], |
|
738 | "bookmarks": [], | |
739 | "tags": [], |
|
739 | "tags": [], | |
740 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"] |
|
740 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"] | |
741 | }, |
|
741 | }, | |
742 | { |
|
742 | { | |
743 | "rev": 2, |
|
743 | "rev": 2, | |
744 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
744 | "node": "97054abb4ab824450e9164180baf491ae0078465", | |
745 | "branch": "default", |
|
745 | "branch": "default", | |
746 | "phase": "draft", |
|
746 | "phase": "draft", | |
747 | "user": "other@place", |
|
747 | "user": "other@place", | |
748 | "date": [1200000, 0], |
|
748 | "date": [1200000, 0], | |
749 | "desc": "no person", |
|
749 | "desc": "no person", | |
750 | "bookmarks": [], |
|
750 | "bookmarks": [], | |
751 | "tags": [], |
|
751 | "tags": [], | |
752 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"] |
|
752 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"] | |
753 | }, |
|
753 | }, | |
754 | { |
|
754 | { | |
755 | "rev": 1, |
|
755 | "rev": 1, | |
756 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
756 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", | |
757 | "branch": "default", |
|
757 | "branch": "default", | |
758 | "phase": "draft", |
|
758 | "phase": "draft", | |
759 | "user": "A. N. Other <other@place>", |
|
759 | "user": "A. N. Other <other@place>", | |
760 | "date": [1100000, 0], |
|
760 | "date": [1100000, 0], | |
761 | "desc": "other 1\nother 2\n\nother 3", |
|
761 | "desc": "other 1\nother 2\n\nother 3", | |
762 | "bookmarks": [], |
|
762 | "bookmarks": [], | |
763 | "tags": [], |
|
763 | "tags": [], | |
764 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"] |
|
764 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"] | |
765 | }, |
|
765 | }, | |
766 | { |
|
766 | { | |
767 | "rev": 0, |
|
767 | "rev": 0, | |
768 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
768 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", | |
769 | "branch": "default", |
|
769 | "branch": "default", | |
770 | "phase": "draft", |
|
770 | "phase": "draft", | |
771 | "user": "User Name <user@hostname>", |
|
771 | "user": "User Name <user@hostname>", | |
772 | "date": [1000000, 0], |
|
772 | "date": [1000000, 0], | |
773 | "desc": "line 1\nline 2", |
|
773 | "desc": "line 1\nline 2", | |
774 | "bookmarks": [], |
|
774 | "bookmarks": [], | |
775 | "tags": [], |
|
775 | "tags": [], | |
776 | "parents": ["0000000000000000000000000000000000000000"] |
|
776 | "parents": ["0000000000000000000000000000000000000000"] | |
777 | } |
|
777 | } | |
778 | ] |
|
778 | ] | |
779 |
|
779 | |||
780 | $ hg heads -v -Tjson |
|
780 | $ hg heads -v -Tjson | |
781 | [ |
|
781 | [ | |
782 | { |
|
782 | { | |
783 | "rev": 8, |
|
783 | "rev": 8, | |
784 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
784 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
785 | "branch": "default", |
|
785 | "branch": "default", | |
786 | "phase": "draft", |
|
786 | "phase": "draft", | |
787 | "user": "test", |
|
787 | "user": "test", | |
788 | "date": [1577872860, 0], |
|
788 | "date": [1577872860, 0], | |
789 | "desc": "third", |
|
789 | "desc": "third", | |
790 | "bookmarks": [], |
|
790 | "bookmarks": [], | |
791 | "tags": ["tip"], |
|
791 | "tags": ["tip"], | |
792 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
792 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | |
793 | "files": ["fourth", "second", "third"] |
|
793 | "files": ["fourth", "second", "third"] | |
794 | }, |
|
794 | }, | |
795 | { |
|
795 | { | |
796 | "rev": 6, |
|
796 | "rev": 6, | |
797 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
797 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", | |
798 | "branch": "default", |
|
798 | "branch": "default", | |
799 | "phase": "draft", |
|
799 | "phase": "draft", | |
800 | "user": "person", |
|
800 | "user": "person", | |
801 | "date": [1500001, 0], |
|
801 | "date": [1500001, 0], | |
802 | "desc": "merge", |
|
802 | "desc": "merge", | |
803 | "bookmarks": [], |
|
803 | "bookmarks": [], | |
804 | "tags": [], |
|
804 | "tags": [], | |
805 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
805 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], | |
806 | "files": [] |
|
806 | "files": [] | |
807 | }, |
|
807 | }, | |
808 | { |
|
808 | { | |
809 | "rev": 4, |
|
809 | "rev": 4, | |
810 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
810 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", | |
811 | "branch": "foo", |
|
811 | "branch": "foo", | |
812 | "phase": "draft", |
|
812 | "phase": "draft", | |
813 | "user": "person", |
|
813 | "user": "person", | |
814 | "date": [1400000, 0], |
|
814 | "date": [1400000, 0], | |
815 | "desc": "new branch", |
|
815 | "desc": "new branch", | |
816 | "bookmarks": [], |
|
816 | "bookmarks": [], | |
817 | "tags": [], |
|
817 | "tags": [], | |
818 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
818 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], | |
819 | "files": [] |
|
819 | "files": [] | |
820 | } |
|
820 | } | |
821 | ] |
|
821 | ] | |
822 |
|
822 | |||
823 | $ hg log --debug -Tjson |
|
823 | $ hg log --debug -Tjson | |
824 | [ |
|
824 | [ | |
825 | { |
|
825 | { | |
826 | "rev": 8, |
|
826 | "rev": 8, | |
827 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", |
|
827 | "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
828 | "branch": "default", |
|
828 | "branch": "default", | |
829 | "phase": "draft", |
|
829 | "phase": "draft", | |
830 | "user": "test", |
|
830 | "user": "test", | |
831 | "date": [1577872860, 0], |
|
831 | "date": [1577872860, 0], | |
832 | "desc": "third", |
|
832 | "desc": "third", | |
833 | "bookmarks": [], |
|
833 | "bookmarks": [], | |
834 | "tags": ["tip"], |
|
834 | "tags": ["tip"], | |
835 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
|
835 | "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | |
836 | "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64", |
|
836 | "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64", | |
837 | "extra": {"branch": "default"}, |
|
837 | "extra": {"branch": "default"}, | |
838 | "modified": [], |
|
838 | "modified": [], | |
839 | "added": ["fourth", "third"], |
|
839 | "added": ["fourth", "third"], | |
840 | "removed": ["second"] |
|
840 | "removed": ["second"] | |
841 | }, |
|
841 | }, | |
842 | { |
|
842 | { | |
843 | "rev": 7, |
|
843 | "rev": 7, | |
844 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", |
|
844 | "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453", | |
845 | "branch": "default", |
|
845 | "branch": "default", | |
846 | "phase": "draft", |
|
846 | "phase": "draft", | |
847 | "user": "User Name <user@hostname>", |
|
847 | "user": "User Name <user@hostname>", | |
848 | "date": [1000000, 0], |
|
848 | "date": [1000000, 0], | |
849 | "desc": "second", |
|
849 | "desc": "second", | |
850 | "bookmarks": [], |
|
850 | "bookmarks": [], | |
851 | "tags": [], |
|
851 | "tags": [], | |
852 | "parents": ["0000000000000000000000000000000000000000"], |
|
852 | "parents": ["0000000000000000000000000000000000000000"], | |
853 | "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf", |
|
853 | "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf", | |
854 | "extra": {"branch": "default"}, |
|
854 | "extra": {"branch": "default"}, | |
855 | "modified": [], |
|
855 | "modified": [], | |
856 | "added": ["second"], |
|
856 | "added": ["second"], | |
857 | "removed": [] |
|
857 | "removed": [] | |
858 | }, |
|
858 | }, | |
859 | { |
|
859 | { | |
860 | "rev": 6, |
|
860 | "rev": 6, | |
861 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", |
|
861 | "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b", | |
862 | "branch": "default", |
|
862 | "branch": "default", | |
863 | "phase": "draft", |
|
863 | "phase": "draft", | |
864 | "user": "person", |
|
864 | "user": "person", | |
865 | "date": [1500001, 0], |
|
865 | "date": [1500001, 0], | |
866 | "desc": "merge", |
|
866 | "desc": "merge", | |
867 | "bookmarks": [], |
|
867 | "bookmarks": [], | |
868 | "tags": [], |
|
868 | "tags": [], | |
869 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], |
|
869 | "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"], | |
870 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
870 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", | |
871 | "extra": {"branch": "default"}, |
|
871 | "extra": {"branch": "default"}, | |
872 | "modified": [], |
|
872 | "modified": [], | |
873 | "added": [], |
|
873 | "added": [], | |
874 | "removed": [] |
|
874 | "removed": [] | |
875 | }, |
|
875 | }, | |
876 | { |
|
876 | { | |
877 | "rev": 5, |
|
877 | "rev": 5, | |
878 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", |
|
878 | "node": "13207e5a10d9fd28ec424934298e176197f2c67f", | |
879 | "branch": "default", |
|
879 | "branch": "default", | |
880 | "phase": "draft", |
|
880 | "phase": "draft", | |
881 | "user": "person", |
|
881 | "user": "person", | |
882 | "date": [1500000, 0], |
|
882 | "date": [1500000, 0], | |
883 | "desc": "new head", |
|
883 | "desc": "new head", | |
884 | "bookmarks": [], |
|
884 | "bookmarks": [], | |
885 | "tags": [], |
|
885 | "tags": [], | |
886 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
886 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], | |
887 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", |
|
887 | "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216", | |
888 | "extra": {"branch": "default"}, |
|
888 | "extra": {"branch": "default"}, | |
889 | "modified": [], |
|
889 | "modified": [], | |
890 | "added": ["d"], |
|
890 | "added": ["d"], | |
891 | "removed": [] |
|
891 | "removed": [] | |
892 | }, |
|
892 | }, | |
893 | { |
|
893 | { | |
894 | "rev": 4, |
|
894 | "rev": 4, | |
895 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", |
|
895 | "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74", | |
896 | "branch": "foo", |
|
896 | "branch": "foo", | |
897 | "phase": "draft", |
|
897 | "phase": "draft", | |
898 | "user": "person", |
|
898 | "user": "person", | |
899 | "date": [1400000, 0], |
|
899 | "date": [1400000, 0], | |
900 | "desc": "new branch", |
|
900 | "desc": "new branch", | |
901 | "bookmarks": [], |
|
901 | "bookmarks": [], | |
902 | "tags": [], |
|
902 | "tags": [], | |
903 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], |
|
903 | "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"], | |
904 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
904 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", | |
905 | "extra": {"branch": "foo"}, |
|
905 | "extra": {"branch": "foo"}, | |
906 | "modified": [], |
|
906 | "modified": [], | |
907 | "added": [], |
|
907 | "added": [], | |
908 | "removed": [] |
|
908 | "removed": [] | |
909 | }, |
|
909 | }, | |
910 | { |
|
910 | { | |
911 | "rev": 3, |
|
911 | "rev": 3, | |
912 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", |
|
912 | "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47", | |
913 | "branch": "default", |
|
913 | "branch": "default", | |
914 | "phase": "draft", |
|
914 | "phase": "draft", | |
915 | "user": "person", |
|
915 | "user": "person", | |
916 | "date": [1300000, 0], |
|
916 | "date": [1300000, 0], | |
917 | "desc": "no user, no domain", |
|
917 | "desc": "no user, no domain", | |
918 | "bookmarks": [], |
|
918 | "bookmarks": [], | |
919 | "tags": [], |
|
919 | "tags": [], | |
920 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"], |
|
920 | "parents": ["97054abb4ab824450e9164180baf491ae0078465"], | |
921 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", |
|
921 | "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc", | |
922 | "extra": {"branch": "default"}, |
|
922 | "extra": {"branch": "default"}, | |
923 | "modified": ["c"], |
|
923 | "modified": ["c"], | |
924 | "added": [], |
|
924 | "added": [], | |
925 | "removed": [] |
|
925 | "removed": [] | |
926 | }, |
|
926 | }, | |
927 | { |
|
927 | { | |
928 | "rev": 2, |
|
928 | "rev": 2, | |
929 | "node": "97054abb4ab824450e9164180baf491ae0078465", |
|
929 | "node": "97054abb4ab824450e9164180baf491ae0078465", | |
930 | "branch": "default", |
|
930 | "branch": "default", | |
931 | "phase": "draft", |
|
931 | "phase": "draft", | |
932 | "user": "other@place", |
|
932 | "user": "other@place", | |
933 | "date": [1200000, 0], |
|
933 | "date": [1200000, 0], | |
934 | "desc": "no person", |
|
934 | "desc": "no person", | |
935 | "bookmarks": [], |
|
935 | "bookmarks": [], | |
936 | "tags": [], |
|
936 | "tags": [], | |
937 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"], |
|
937 | "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"], | |
938 | "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1", |
|
938 | "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1", | |
939 | "extra": {"branch": "default"}, |
|
939 | "extra": {"branch": "default"}, | |
940 | "modified": [], |
|
940 | "modified": [], | |
941 | "added": ["c"], |
|
941 | "added": ["c"], | |
942 | "removed": [] |
|
942 | "removed": [] | |
943 | }, |
|
943 | }, | |
944 | { |
|
944 | { | |
945 | "rev": 1, |
|
945 | "rev": 1, | |
946 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", |
|
946 | "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965", | |
947 | "branch": "default", |
|
947 | "branch": "default", | |
948 | "phase": "draft", |
|
948 | "phase": "draft", | |
949 | "user": "A. N. Other <other@place>", |
|
949 | "user": "A. N. Other <other@place>", | |
950 | "date": [1100000, 0], |
|
950 | "date": [1100000, 0], | |
951 | "desc": "other 1\nother 2\n\nother 3", |
|
951 | "desc": "other 1\nother 2\n\nother 3", | |
952 | "bookmarks": [], |
|
952 | "bookmarks": [], | |
953 | "tags": [], |
|
953 | "tags": [], | |
954 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"], |
|
954 | "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"], | |
955 | "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55", |
|
955 | "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55", | |
956 | "extra": {"branch": "default"}, |
|
956 | "extra": {"branch": "default"}, | |
957 | "modified": [], |
|
957 | "modified": [], | |
958 | "added": ["b"], |
|
958 | "added": ["b"], | |
959 | "removed": [] |
|
959 | "removed": [] | |
960 | }, |
|
960 | }, | |
961 | { |
|
961 | { | |
962 | "rev": 0, |
|
962 | "rev": 0, | |
963 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", |
|
963 | "node": "1e4e1b8f71e05681d422154f5421e385fec3454f", | |
964 | "branch": "default", |
|
964 | "branch": "default", | |
965 | "phase": "draft", |
|
965 | "phase": "draft", | |
966 | "user": "User Name <user@hostname>", |
|
966 | "user": "User Name <user@hostname>", | |
967 | "date": [1000000, 0], |
|
967 | "date": [1000000, 0], | |
968 | "desc": "line 1\nline 2", |
|
968 | "desc": "line 1\nline 2", | |
969 | "bookmarks": [], |
|
969 | "bookmarks": [], | |
970 | "tags": [], |
|
970 | "tags": [], | |
971 | "parents": ["0000000000000000000000000000000000000000"], |
|
971 | "parents": ["0000000000000000000000000000000000000000"], | |
972 | "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0", |
|
972 | "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0", | |
973 | "extra": {"branch": "default"}, |
|
973 | "extra": {"branch": "default"}, | |
974 | "modified": [], |
|
974 | "modified": [], | |
975 | "added": ["a"], |
|
975 | "added": ["a"], | |
976 | "removed": [] |
|
976 | "removed": [] | |
977 | } |
|
977 | } | |
978 | ] |
|
978 | ] | |
979 |
|
979 | |||
980 | Error if style not readable: |
|
980 | Error if style not readable: | |
981 |
|
981 | |||
982 | #if unix-permissions no-root |
|
982 | #if unix-permissions no-root | |
983 | $ touch q |
|
983 | $ touch q | |
984 | $ chmod 0 q |
|
984 | $ chmod 0 q | |
985 | $ hg log --style ./q |
|
985 | $ hg log --style ./q | |
986 | abort: Permission denied: ./q |
|
986 | abort: Permission denied: ./q | |
987 | [255] |
|
987 | [255] | |
988 | #endif |
|
988 | #endif | |
989 |
|
989 | |||
990 | Error if no style: |
|
990 | Error if no style: | |
991 |
|
991 | |||
992 | $ hg log --style notexist |
|
992 | $ hg log --style notexist | |
993 | abort: style 'notexist' not found |
|
993 | abort: style 'notexist' not found | |
994 | (available styles: bisect, changelog, compact, default, phases, status, xml) |
|
994 | (available styles: bisect, changelog, compact, default, phases, status, xml) | |
995 | [255] |
|
995 | [255] | |
996 |
|
996 | |||
997 | $ hg log -T list |
|
997 | $ hg log -T list | |
998 | available styles: bisect, changelog, compact, default, phases, status, xml |
|
998 | available styles: bisect, changelog, compact, default, phases, status, xml | |
999 | abort: specify a template |
|
999 | abort: specify a template | |
1000 | [255] |
|
1000 | [255] | |
1001 |
|
1001 | |||
1002 | Error if style missing key: |
|
1002 | Error if style missing key: | |
1003 |
|
1003 | |||
1004 | $ echo 'q = q' > t |
|
1004 | $ echo 'q = q' > t | |
1005 | $ hg log --style ./t |
|
1005 | $ hg log --style ./t | |
1006 | abort: "changeset" not in template map |
|
1006 | abort: "changeset" not in template map | |
1007 | [255] |
|
1007 | [255] | |
1008 |
|
1008 | |||
1009 | Error if style missing value: |
|
1009 | Error if style missing value: | |
1010 |
|
1010 | |||
1011 | $ echo 'changeset =' > t |
|
1011 | $ echo 'changeset =' > t | |
1012 | $ hg log --style t |
|
1012 | $ hg log --style t | |
1013 | hg: parse error at t:1: missing value |
|
1013 | hg: parse error at t:1: missing value | |
1014 | [255] |
|
1014 | [255] | |
1015 |
|
1015 | |||
1016 | Error if include fails: |
|
1016 | Error if include fails: | |
1017 |
|
1017 | |||
1018 | $ echo 'changeset = q' >> t |
|
1018 | $ echo 'changeset = q' >> t | |
1019 | #if unix-permissions no-root |
|
1019 | #if unix-permissions no-root | |
1020 | $ hg log --style ./t |
|
1020 | $ hg log --style ./t | |
1021 | abort: template file ./q: Permission denied |
|
1021 | abort: template file ./q: Permission denied | |
1022 | [255] |
|
1022 | [255] | |
1023 | $ rm -f q |
|
1023 | $ rm -f q | |
1024 | #endif |
|
1024 | #endif | |
1025 |
|
1025 | |||
1026 | Include works: |
|
1026 | Include works: | |
1027 |
|
1027 | |||
1028 | $ echo '{rev}' > q |
|
1028 | $ echo '{rev}' > q | |
1029 | $ hg log --style ./t |
|
1029 | $ hg log --style ./t | |
1030 | 8 |
|
1030 | 8 | |
1031 | 7 |
|
1031 | 7 | |
1032 | 6 |
|
1032 | 6 | |
1033 | 5 |
|
1033 | 5 | |
1034 | 4 |
|
1034 | 4 | |
1035 | 3 |
|
1035 | 3 | |
1036 | 2 |
|
1036 | 2 | |
1037 | 1 |
|
1037 | 1 | |
1038 | 0 |
|
1038 | 0 | |
1039 |
|
1039 | |||
1040 | Check that recursive reference does not fall into RuntimeError (issue4758): |
|
1040 | Check that recursive reference does not fall into RuntimeError (issue4758): | |
1041 |
|
1041 | |||
1042 | common mistake: |
|
1042 | common mistake: | |
1043 |
|
1043 | |||
1044 | $ hg log -T '{changeset}\n' |
|
1044 | $ hg log -T '{changeset}\n' | |
1045 | abort: recursive reference 'changeset' in template |
|
1045 | abort: recursive reference 'changeset' in template | |
1046 | [255] |
|
1046 | [255] | |
1047 |
|
1047 | |||
1048 | circular reference: |
|
1048 | circular reference: | |
1049 |
|
1049 | |||
1050 | $ cat << EOF > issue4758 |
|
1050 | $ cat << EOF > issue4758 | |
1051 | > changeset = '{foo}' |
|
1051 | > changeset = '{foo}' | |
1052 | > foo = '{changeset}' |
|
1052 | > foo = '{changeset}' | |
1053 | > EOF |
|
1053 | > EOF | |
1054 | $ hg log --style ./issue4758 |
|
1054 | $ hg log --style ./issue4758 | |
1055 | abort: recursive reference 'foo' in template |
|
1055 | abort: recursive reference 'foo' in template | |
1056 | [255] |
|
1056 | [255] | |
1057 |
|
1057 | |||
1058 | buildmap() -> gettemplate(), where no thunk was made: |
|
1058 | buildmap() -> gettemplate(), where no thunk was made: | |
1059 |
|
1059 | |||
1060 | $ hg log -T '{files % changeset}\n' |
|
1060 | $ hg log -T '{files % changeset}\n' | |
1061 | abort: recursive reference 'changeset' in template |
|
1061 | abort: recursive reference 'changeset' in template | |
1062 | [255] |
|
1062 | [255] | |
1063 |
|
1063 | |||
1064 | not a recursion if a keyword of the same name exists: |
|
1064 | not a recursion if a keyword of the same name exists: | |
1065 |
|
1065 | |||
1066 | $ cat << EOF > issue4758 |
|
1066 | $ cat << EOF > issue4758 | |
1067 | > changeset = '{tags % rev}' |
|
1067 | > changeset = '{tags % rev}' | |
1068 | > rev = '{rev} {tag}\n' |
|
1068 | > rev = '{rev} {tag}\n' | |
1069 | > EOF |
|
1069 | > EOF | |
1070 | $ hg log --style ./issue4758 -r tip |
|
1070 | $ hg log --style ./issue4758 -r tip | |
1071 | 8 tip |
|
1071 | 8 tip | |
1072 |
|
1072 | |||
1073 | Check that {phase} works correctly on parents: |
|
1073 | Check that {phase} works correctly on parents: | |
1074 |
|
1074 | |||
1075 | $ cat << EOF > parentphase |
|
1075 | $ cat << EOF > parentphase | |
1076 | > changeset_debug = '{rev} ({phase}):{parents}\n' |
|
1076 | > changeset_debug = '{rev} ({phase}):{parents}\n' | |
1077 | > parent = ' {rev} ({phase})' |
|
1077 | > parent = ' {rev} ({phase})' | |
1078 | > EOF |
|
1078 | > EOF | |
1079 | $ hg phase -r 5 --public |
|
1079 | $ hg phase -r 5 --public | |
1080 | $ hg phase -r 7 --secret --force |
|
1080 | $ hg phase -r 7 --secret --force | |
1081 | $ hg log --debug -G --style ./parentphase |
|
1081 | $ hg log --debug -G --style ./parentphase | |
1082 | @ 8 (secret): 7 (secret) -1 (public) |
|
1082 | @ 8 (secret): 7 (secret) -1 (public) | |
1083 | | |
|
1083 | | | |
1084 | o 7 (secret): -1 (public) -1 (public) |
|
1084 | o 7 (secret): -1 (public) -1 (public) | |
1085 |
|
1085 | |||
1086 | o 6 (draft): 5 (public) 4 (draft) |
|
1086 | o 6 (draft): 5 (public) 4 (draft) | |
1087 | |\ |
|
1087 | |\ | |
1088 | | o 5 (public): 3 (public) -1 (public) |
|
1088 | | o 5 (public): 3 (public) -1 (public) | |
1089 | | | |
|
1089 | | | | |
1090 | o | 4 (draft): 3 (public) -1 (public) |
|
1090 | o | 4 (draft): 3 (public) -1 (public) | |
1091 | |/ |
|
1091 | |/ | |
1092 | o 3 (public): 2 (public) -1 (public) |
|
1092 | o 3 (public): 2 (public) -1 (public) | |
1093 | | |
|
1093 | | | |
1094 | o 2 (public): 1 (public) -1 (public) |
|
1094 | o 2 (public): 1 (public) -1 (public) | |
1095 | | |
|
1095 | | | |
1096 | o 1 (public): 0 (public) -1 (public) |
|
1096 | o 1 (public): 0 (public) -1 (public) | |
1097 | | |
|
1097 | | | |
1098 | o 0 (public): -1 (public) -1 (public) |
|
1098 | o 0 (public): -1 (public) -1 (public) | |
1099 |
|
1099 | |||
1100 |
|
1100 | |||
1101 | Missing non-standard names give no error (backward compatibility): |
|
1101 | Missing non-standard names give no error (backward compatibility): | |
1102 |
|
1102 | |||
1103 | $ echo "changeset = '{c}'" > t |
|
1103 | $ echo "changeset = '{c}'" > t | |
1104 | $ hg log --style ./t |
|
1104 | $ hg log --style ./t | |
1105 |
|
1105 | |||
1106 | Defining non-standard name works: |
|
1106 | Defining non-standard name works: | |
1107 |
|
1107 | |||
1108 | $ cat <<EOF > t |
|
1108 | $ cat <<EOF > t | |
1109 | > changeset = '{c}' |
|
1109 | > changeset = '{c}' | |
1110 | > c = q |
|
1110 | > c = q | |
1111 | > EOF |
|
1111 | > EOF | |
1112 | $ hg log --style ./t |
|
1112 | $ hg log --style ./t | |
1113 | 8 |
|
1113 | 8 | |
1114 | 7 |
|
1114 | 7 | |
1115 | 6 |
|
1115 | 6 | |
1116 | 5 |
|
1116 | 5 | |
1117 | 4 |
|
1117 | 4 | |
1118 | 3 |
|
1118 | 3 | |
1119 | 2 |
|
1119 | 2 | |
1120 | 1 |
|
1120 | 1 | |
1121 | 0 |
|
1121 | 0 | |
1122 |
|
1122 | |||
1123 | ui.style works: |
|
1123 | ui.style works: | |
1124 |
|
1124 | |||
1125 | $ echo '[ui]' > .hg/hgrc |
|
1125 | $ echo '[ui]' > .hg/hgrc | |
1126 | $ echo 'style = t' >> .hg/hgrc |
|
1126 | $ echo 'style = t' >> .hg/hgrc | |
1127 | $ hg log |
|
1127 | $ hg log | |
1128 | 8 |
|
1128 | 8 | |
1129 | 7 |
|
1129 | 7 | |
1130 | 6 |
|
1130 | 6 | |
1131 | 5 |
|
1131 | 5 | |
1132 | 4 |
|
1132 | 4 | |
1133 | 3 |
|
1133 | 3 | |
1134 | 2 |
|
1134 | 2 | |
1135 | 1 |
|
1135 | 1 | |
1136 | 0 |
|
1136 | 0 | |
1137 |
|
1137 | |||
1138 |
|
1138 | |||
1139 | Issue338: |
|
1139 | Issue338: | |
1140 |
|
1140 | |||
1141 | $ hg log --style=changelog > changelog |
|
1141 | $ hg log --style=changelog > changelog | |
1142 |
|
1142 | |||
1143 | $ cat changelog |
|
1143 | $ cat changelog | |
1144 | 2020-01-01 test <test> |
|
1144 | 2020-01-01 test <test> | |
1145 |
|
1145 | |||
1146 | * fourth, second, third: |
|
1146 | * fourth, second, third: | |
1147 | third |
|
1147 | third | |
1148 | [95c24699272e] [tip] |
|
1148 | [95c24699272e] [tip] | |
1149 |
|
1149 | |||
1150 | 1970-01-12 User Name <user@hostname> |
|
1150 | 1970-01-12 User Name <user@hostname> | |
1151 |
|
1151 | |||
1152 | * second: |
|
1152 | * second: | |
1153 | second |
|
1153 | second | |
1154 | [29114dbae42b] |
|
1154 | [29114dbae42b] | |
1155 |
|
1155 | |||
1156 | 1970-01-18 person <person> |
|
1156 | 1970-01-18 person <person> | |
1157 |
|
1157 | |||
1158 | * merge |
|
1158 | * merge | |
1159 | [d41e714fe50d] |
|
1159 | [d41e714fe50d] | |
1160 |
|
1160 | |||
1161 | * d: |
|
1161 | * d: | |
1162 | new head |
|
1162 | new head | |
1163 | [13207e5a10d9] |
|
1163 | [13207e5a10d9] | |
1164 |
|
1164 | |||
1165 | 1970-01-17 person <person> |
|
1165 | 1970-01-17 person <person> | |
1166 |
|
1166 | |||
1167 | * new branch |
|
1167 | * new branch | |
1168 | [bbe44766e73d] <foo> |
|
1168 | [bbe44766e73d] <foo> | |
1169 |
|
1169 | |||
1170 | 1970-01-16 person <person> |
|
1170 | 1970-01-16 person <person> | |
1171 |
|
1171 | |||
1172 | * c: |
|
1172 | * c: | |
1173 | no user, no domain |
|
1173 | no user, no domain | |
1174 | [10e46f2dcbf4] |
|
1174 | [10e46f2dcbf4] | |
1175 |
|
1175 | |||
1176 | 1970-01-14 other <other@place> |
|
1176 | 1970-01-14 other <other@place> | |
1177 |
|
1177 | |||
1178 | * c: |
|
1178 | * c: | |
1179 | no person |
|
1179 | no person | |
1180 | [97054abb4ab8] |
|
1180 | [97054abb4ab8] | |
1181 |
|
1181 | |||
1182 | 1970-01-13 A. N. Other <other@place> |
|
1182 | 1970-01-13 A. N. Other <other@place> | |
1183 |
|
1183 | |||
1184 | * b: |
|
1184 | * b: | |
1185 | other 1 other 2 |
|
1185 | other 1 other 2 | |
1186 |
|
1186 | |||
1187 | other 3 |
|
1187 | other 3 | |
1188 | [b608e9d1a3f0] |
|
1188 | [b608e9d1a3f0] | |
1189 |
|
1189 | |||
1190 | 1970-01-12 User Name <user@hostname> |
|
1190 | 1970-01-12 User Name <user@hostname> | |
1191 |
|
1191 | |||
1192 | * a: |
|
1192 | * a: | |
1193 | line 1 line 2 |
|
1193 | line 1 line 2 | |
1194 | [1e4e1b8f71e0] |
|
1194 | [1e4e1b8f71e0] | |
1195 |
|
1195 | |||
1196 |
|
1196 | |||
1197 | Issue2130: xml output for 'hg heads' is malformed |
|
1197 | Issue2130: xml output for 'hg heads' is malformed | |
1198 |
|
1198 | |||
1199 | $ hg heads --style changelog |
|
1199 | $ hg heads --style changelog | |
1200 | 2020-01-01 test <test> |
|
1200 | 2020-01-01 test <test> | |
1201 |
|
1201 | |||
1202 | * fourth, second, third: |
|
1202 | * fourth, second, third: | |
1203 | third |
|
1203 | third | |
1204 | [95c24699272e] [tip] |
|
1204 | [95c24699272e] [tip] | |
1205 |
|
1205 | |||
1206 | 1970-01-18 person <person> |
|
1206 | 1970-01-18 person <person> | |
1207 |
|
1207 | |||
1208 | * merge |
|
1208 | * merge | |
1209 | [d41e714fe50d] |
|
1209 | [d41e714fe50d] | |
1210 |
|
1210 | |||
1211 | 1970-01-17 person <person> |
|
1211 | 1970-01-17 person <person> | |
1212 |
|
1212 | |||
1213 | * new branch |
|
1213 | * new branch | |
1214 | [bbe44766e73d] <foo> |
|
1214 | [bbe44766e73d] <foo> | |
1215 |
|
1215 | |||
1216 |
|
1216 | |||
1217 | Keys work: |
|
1217 | Keys work: | |
1218 |
|
1218 | |||
1219 | $ for key in author branch branches date desc file_adds file_dels file_mods \ |
|
1219 | $ for key in author branch branches date desc file_adds file_dels file_mods \ | |
1220 | > file_copies file_copies_switch files \ |
|
1220 | > file_copies file_copies_switch files \ | |
1221 | > manifest node parents rev tags diffstat extras \ |
|
1221 | > manifest node parents rev tags diffstat extras \ | |
1222 | > p1rev p2rev p1node p2node; do |
|
1222 | > p1rev p2rev p1node p2node; do | |
1223 | > for mode in '' --verbose --debug; do |
|
1223 | > for mode in '' --verbose --debug; do | |
1224 | > hg log $mode --template "$key$mode: {$key}\n" |
|
1224 | > hg log $mode --template "$key$mode: {$key}\n" | |
1225 | > done |
|
1225 | > done | |
1226 | > done |
|
1226 | > done | |
1227 | author: test |
|
1227 | author: test | |
1228 | author: User Name <user@hostname> |
|
1228 | author: User Name <user@hostname> | |
1229 | author: person |
|
1229 | author: person | |
1230 | author: person |
|
1230 | author: person | |
1231 | author: person |
|
1231 | author: person | |
1232 | author: person |
|
1232 | author: person | |
1233 | author: other@place |
|
1233 | author: other@place | |
1234 | author: A. N. Other <other@place> |
|
1234 | author: A. N. Other <other@place> | |
1235 | author: User Name <user@hostname> |
|
1235 | author: User Name <user@hostname> | |
1236 | author--verbose: test |
|
1236 | author--verbose: test | |
1237 | author--verbose: User Name <user@hostname> |
|
1237 | author--verbose: User Name <user@hostname> | |
1238 | author--verbose: person |
|
1238 | author--verbose: person | |
1239 | author--verbose: person |
|
1239 | author--verbose: person | |
1240 | author--verbose: person |
|
1240 | author--verbose: person | |
1241 | author--verbose: person |
|
1241 | author--verbose: person | |
1242 | author--verbose: other@place |
|
1242 | author--verbose: other@place | |
1243 | author--verbose: A. N. Other <other@place> |
|
1243 | author--verbose: A. N. Other <other@place> | |
1244 | author--verbose: User Name <user@hostname> |
|
1244 | author--verbose: User Name <user@hostname> | |
1245 | author--debug: test |
|
1245 | author--debug: test | |
1246 | author--debug: User Name <user@hostname> |
|
1246 | author--debug: User Name <user@hostname> | |
1247 | author--debug: person |
|
1247 | author--debug: person | |
1248 | author--debug: person |
|
1248 | author--debug: person | |
1249 | author--debug: person |
|
1249 | author--debug: person | |
1250 | author--debug: person |
|
1250 | author--debug: person | |
1251 | author--debug: other@place |
|
1251 | author--debug: other@place | |
1252 | author--debug: A. N. Other <other@place> |
|
1252 | author--debug: A. N. Other <other@place> | |
1253 | author--debug: User Name <user@hostname> |
|
1253 | author--debug: User Name <user@hostname> | |
1254 | branch: default |
|
1254 | branch: default | |
1255 | branch: default |
|
1255 | branch: default | |
1256 | branch: default |
|
1256 | branch: default | |
1257 | branch: default |
|
1257 | branch: default | |
1258 | branch: foo |
|
1258 | branch: foo | |
1259 | branch: default |
|
1259 | branch: default | |
1260 | branch: default |
|
1260 | branch: default | |
1261 | branch: default |
|
1261 | branch: default | |
1262 | branch: default |
|
1262 | branch: default | |
1263 | branch--verbose: default |
|
1263 | branch--verbose: default | |
1264 | branch--verbose: default |
|
1264 | branch--verbose: default | |
1265 | branch--verbose: default |
|
1265 | branch--verbose: default | |
1266 | branch--verbose: default |
|
1266 | branch--verbose: default | |
1267 | branch--verbose: foo |
|
1267 | branch--verbose: foo | |
1268 | branch--verbose: default |
|
1268 | branch--verbose: default | |
1269 | branch--verbose: default |
|
1269 | branch--verbose: default | |
1270 | branch--verbose: default |
|
1270 | branch--verbose: default | |
1271 | branch--verbose: default |
|
1271 | branch--verbose: default | |
1272 | branch--debug: default |
|
1272 | branch--debug: default | |
1273 | branch--debug: default |
|
1273 | branch--debug: default | |
1274 | branch--debug: default |
|
1274 | branch--debug: default | |
1275 | branch--debug: default |
|
1275 | branch--debug: default | |
1276 | branch--debug: foo |
|
1276 | branch--debug: foo | |
1277 | branch--debug: default |
|
1277 | branch--debug: default | |
1278 | branch--debug: default |
|
1278 | branch--debug: default | |
1279 | branch--debug: default |
|
1279 | branch--debug: default | |
1280 | branch--debug: default |
|
1280 | branch--debug: default | |
1281 | branches: |
|
1281 | branches: | |
1282 | branches: |
|
1282 | branches: | |
1283 | branches: |
|
1283 | branches: | |
1284 | branches: |
|
1284 | branches: | |
1285 | branches: foo |
|
1285 | branches: foo | |
1286 | branches: |
|
1286 | branches: | |
1287 | branches: |
|
1287 | branches: | |
1288 | branches: |
|
1288 | branches: | |
1289 | branches: |
|
1289 | branches: | |
1290 | branches--verbose: |
|
1290 | branches--verbose: | |
1291 | branches--verbose: |
|
1291 | branches--verbose: | |
1292 | branches--verbose: |
|
1292 | branches--verbose: | |
1293 | branches--verbose: |
|
1293 | branches--verbose: | |
1294 | branches--verbose: foo |
|
1294 | branches--verbose: foo | |
1295 | branches--verbose: |
|
1295 | branches--verbose: | |
1296 | branches--verbose: |
|
1296 | branches--verbose: | |
1297 | branches--verbose: |
|
1297 | branches--verbose: | |
1298 | branches--verbose: |
|
1298 | branches--verbose: | |
1299 | branches--debug: |
|
1299 | branches--debug: | |
1300 | branches--debug: |
|
1300 | branches--debug: | |
1301 | branches--debug: |
|
1301 | branches--debug: | |
1302 | branches--debug: |
|
1302 | branches--debug: | |
1303 | branches--debug: foo |
|
1303 | branches--debug: foo | |
1304 | branches--debug: |
|
1304 | branches--debug: | |
1305 | branches--debug: |
|
1305 | branches--debug: | |
1306 | branches--debug: |
|
1306 | branches--debug: | |
1307 | branches--debug: |
|
1307 | branches--debug: | |
1308 | date: 1577872860.00 |
|
1308 | date: 1577872860.00 | |
1309 | date: 1000000.00 |
|
1309 | date: 1000000.00 | |
1310 | date: 1500001.00 |
|
1310 | date: 1500001.00 | |
1311 | date: 1500000.00 |
|
1311 | date: 1500000.00 | |
1312 | date: 1400000.00 |
|
1312 | date: 1400000.00 | |
1313 | date: 1300000.00 |
|
1313 | date: 1300000.00 | |
1314 | date: 1200000.00 |
|
1314 | date: 1200000.00 | |
1315 | date: 1100000.00 |
|
1315 | date: 1100000.00 | |
1316 | date: 1000000.00 |
|
1316 | date: 1000000.00 | |
1317 | date--verbose: 1577872860.00 |
|
1317 | date--verbose: 1577872860.00 | |
1318 | date--verbose: 1000000.00 |
|
1318 | date--verbose: 1000000.00 | |
1319 | date--verbose: 1500001.00 |
|
1319 | date--verbose: 1500001.00 | |
1320 | date--verbose: 1500000.00 |
|
1320 | date--verbose: 1500000.00 | |
1321 | date--verbose: 1400000.00 |
|
1321 | date--verbose: 1400000.00 | |
1322 | date--verbose: 1300000.00 |
|
1322 | date--verbose: 1300000.00 | |
1323 | date--verbose: 1200000.00 |
|
1323 | date--verbose: 1200000.00 | |
1324 | date--verbose: 1100000.00 |
|
1324 | date--verbose: 1100000.00 | |
1325 | date--verbose: 1000000.00 |
|
1325 | date--verbose: 1000000.00 | |
1326 | date--debug: 1577872860.00 |
|
1326 | date--debug: 1577872860.00 | |
1327 | date--debug: 1000000.00 |
|
1327 | date--debug: 1000000.00 | |
1328 | date--debug: 1500001.00 |
|
1328 | date--debug: 1500001.00 | |
1329 | date--debug: 1500000.00 |
|
1329 | date--debug: 1500000.00 | |
1330 | date--debug: 1400000.00 |
|
1330 | date--debug: 1400000.00 | |
1331 | date--debug: 1300000.00 |
|
1331 | date--debug: 1300000.00 | |
1332 | date--debug: 1200000.00 |
|
1332 | date--debug: 1200000.00 | |
1333 | date--debug: 1100000.00 |
|
1333 | date--debug: 1100000.00 | |
1334 | date--debug: 1000000.00 |
|
1334 | date--debug: 1000000.00 | |
1335 | desc: third |
|
1335 | desc: third | |
1336 | desc: second |
|
1336 | desc: second | |
1337 | desc: merge |
|
1337 | desc: merge | |
1338 | desc: new head |
|
1338 | desc: new head | |
1339 | desc: new branch |
|
1339 | desc: new branch | |
1340 | desc: no user, no domain |
|
1340 | desc: no user, no domain | |
1341 | desc: no person |
|
1341 | desc: no person | |
1342 | desc: other 1 |
|
1342 | desc: other 1 | |
1343 | other 2 |
|
1343 | other 2 | |
1344 |
|
1344 | |||
1345 | other 3 |
|
1345 | other 3 | |
1346 | desc: line 1 |
|
1346 | desc: line 1 | |
1347 | line 2 |
|
1347 | line 2 | |
1348 | desc--verbose: third |
|
1348 | desc--verbose: third | |
1349 | desc--verbose: second |
|
1349 | desc--verbose: second | |
1350 | desc--verbose: merge |
|
1350 | desc--verbose: merge | |
1351 | desc--verbose: new head |
|
1351 | desc--verbose: new head | |
1352 | desc--verbose: new branch |
|
1352 | desc--verbose: new branch | |
1353 | desc--verbose: no user, no domain |
|
1353 | desc--verbose: no user, no domain | |
1354 | desc--verbose: no person |
|
1354 | desc--verbose: no person | |
1355 | desc--verbose: other 1 |
|
1355 | desc--verbose: other 1 | |
1356 | other 2 |
|
1356 | other 2 | |
1357 |
|
1357 | |||
1358 | other 3 |
|
1358 | other 3 | |
1359 | desc--verbose: line 1 |
|
1359 | desc--verbose: line 1 | |
1360 | line 2 |
|
1360 | line 2 | |
1361 | desc--debug: third |
|
1361 | desc--debug: third | |
1362 | desc--debug: second |
|
1362 | desc--debug: second | |
1363 | desc--debug: merge |
|
1363 | desc--debug: merge | |
1364 | desc--debug: new head |
|
1364 | desc--debug: new head | |
1365 | desc--debug: new branch |
|
1365 | desc--debug: new branch | |
1366 | desc--debug: no user, no domain |
|
1366 | desc--debug: no user, no domain | |
1367 | desc--debug: no person |
|
1367 | desc--debug: no person | |
1368 | desc--debug: other 1 |
|
1368 | desc--debug: other 1 | |
1369 | other 2 |
|
1369 | other 2 | |
1370 |
|
1370 | |||
1371 | other 3 |
|
1371 | other 3 | |
1372 | desc--debug: line 1 |
|
1372 | desc--debug: line 1 | |
1373 | line 2 |
|
1373 | line 2 | |
1374 | file_adds: fourth third |
|
1374 | file_adds: fourth third | |
1375 | file_adds: second |
|
1375 | file_adds: second | |
1376 | file_adds: |
|
1376 | file_adds: | |
1377 | file_adds: d |
|
1377 | file_adds: d | |
1378 | file_adds: |
|
1378 | file_adds: | |
1379 | file_adds: |
|
1379 | file_adds: | |
1380 | file_adds: c |
|
1380 | file_adds: c | |
1381 | file_adds: b |
|
1381 | file_adds: b | |
1382 | file_adds: a |
|
1382 | file_adds: a | |
1383 | file_adds--verbose: fourth third |
|
1383 | file_adds--verbose: fourth third | |
1384 | file_adds--verbose: second |
|
1384 | file_adds--verbose: second | |
1385 | file_adds--verbose: |
|
1385 | file_adds--verbose: | |
1386 | file_adds--verbose: d |
|
1386 | file_adds--verbose: d | |
1387 | file_adds--verbose: |
|
1387 | file_adds--verbose: | |
1388 | file_adds--verbose: |
|
1388 | file_adds--verbose: | |
1389 | file_adds--verbose: c |
|
1389 | file_adds--verbose: c | |
1390 | file_adds--verbose: b |
|
1390 | file_adds--verbose: b | |
1391 | file_adds--verbose: a |
|
1391 | file_adds--verbose: a | |
1392 | file_adds--debug: fourth third |
|
1392 | file_adds--debug: fourth third | |
1393 | file_adds--debug: second |
|
1393 | file_adds--debug: second | |
1394 | file_adds--debug: |
|
1394 | file_adds--debug: | |
1395 | file_adds--debug: d |
|
1395 | file_adds--debug: d | |
1396 | file_adds--debug: |
|
1396 | file_adds--debug: | |
1397 | file_adds--debug: |
|
1397 | file_adds--debug: | |
1398 | file_adds--debug: c |
|
1398 | file_adds--debug: c | |
1399 | file_adds--debug: b |
|
1399 | file_adds--debug: b | |
1400 | file_adds--debug: a |
|
1400 | file_adds--debug: a | |
1401 | file_dels: second |
|
1401 | file_dels: second | |
1402 | file_dels: |
|
1402 | file_dels: | |
1403 | file_dels: |
|
1403 | file_dels: | |
1404 | file_dels: |
|
1404 | file_dels: | |
1405 | file_dels: |
|
1405 | file_dels: | |
1406 | file_dels: |
|
1406 | file_dels: | |
1407 | file_dels: |
|
1407 | file_dels: | |
1408 | file_dels: |
|
1408 | file_dels: | |
1409 | file_dels: |
|
1409 | file_dels: | |
1410 | file_dels--verbose: second |
|
1410 | file_dels--verbose: second | |
1411 | file_dels--verbose: |
|
1411 | file_dels--verbose: | |
1412 | file_dels--verbose: |
|
1412 | file_dels--verbose: | |
1413 | file_dels--verbose: |
|
1413 | file_dels--verbose: | |
1414 | file_dels--verbose: |
|
1414 | file_dels--verbose: | |
1415 | file_dels--verbose: |
|
1415 | file_dels--verbose: | |
1416 | file_dels--verbose: |
|
1416 | file_dels--verbose: | |
1417 | file_dels--verbose: |
|
1417 | file_dels--verbose: | |
1418 | file_dels--verbose: |
|
1418 | file_dels--verbose: | |
1419 | file_dels--debug: second |
|
1419 | file_dels--debug: second | |
1420 | file_dels--debug: |
|
1420 | file_dels--debug: | |
1421 | file_dels--debug: |
|
1421 | file_dels--debug: | |
1422 | file_dels--debug: |
|
1422 | file_dels--debug: | |
1423 | file_dels--debug: |
|
1423 | file_dels--debug: | |
1424 | file_dels--debug: |
|
1424 | file_dels--debug: | |
1425 | file_dels--debug: |
|
1425 | file_dels--debug: | |
1426 | file_dels--debug: |
|
1426 | file_dels--debug: | |
1427 | file_dels--debug: |
|
1427 | file_dels--debug: | |
1428 | file_mods: |
|
1428 | file_mods: | |
1429 | file_mods: |
|
1429 | file_mods: | |
1430 | file_mods: |
|
1430 | file_mods: | |
1431 | file_mods: |
|
1431 | file_mods: | |
1432 | file_mods: |
|
1432 | file_mods: | |
1433 | file_mods: c |
|
1433 | file_mods: c | |
1434 | file_mods: |
|
1434 | file_mods: | |
1435 | file_mods: |
|
1435 | file_mods: | |
1436 | file_mods: |
|
1436 | file_mods: | |
1437 | file_mods--verbose: |
|
1437 | file_mods--verbose: | |
1438 | file_mods--verbose: |
|
1438 | file_mods--verbose: | |
1439 | file_mods--verbose: |
|
1439 | file_mods--verbose: | |
1440 | file_mods--verbose: |
|
1440 | file_mods--verbose: | |
1441 | file_mods--verbose: |
|
1441 | file_mods--verbose: | |
1442 | file_mods--verbose: c |
|
1442 | file_mods--verbose: c | |
1443 | file_mods--verbose: |
|
1443 | file_mods--verbose: | |
1444 | file_mods--verbose: |
|
1444 | file_mods--verbose: | |
1445 | file_mods--verbose: |
|
1445 | file_mods--verbose: | |
1446 | file_mods--debug: |
|
1446 | file_mods--debug: | |
1447 | file_mods--debug: |
|
1447 | file_mods--debug: | |
1448 | file_mods--debug: |
|
1448 | file_mods--debug: | |
1449 | file_mods--debug: |
|
1449 | file_mods--debug: | |
1450 | file_mods--debug: |
|
1450 | file_mods--debug: | |
1451 | file_mods--debug: c |
|
1451 | file_mods--debug: c | |
1452 | file_mods--debug: |
|
1452 | file_mods--debug: | |
1453 | file_mods--debug: |
|
1453 | file_mods--debug: | |
1454 | file_mods--debug: |
|
1454 | file_mods--debug: | |
1455 | file_copies: fourth (second) |
|
1455 | file_copies: fourth (second) | |
1456 | file_copies: |
|
1456 | file_copies: | |
1457 | file_copies: |
|
1457 | file_copies: | |
1458 | file_copies: |
|
1458 | file_copies: | |
1459 | file_copies: |
|
1459 | file_copies: | |
1460 | file_copies: |
|
1460 | file_copies: | |
1461 | file_copies: |
|
1461 | file_copies: | |
1462 | file_copies: |
|
1462 | file_copies: | |
1463 | file_copies: |
|
1463 | file_copies: | |
1464 | file_copies--verbose: fourth (second) |
|
1464 | file_copies--verbose: fourth (second) | |
1465 | file_copies--verbose: |
|
1465 | file_copies--verbose: | |
1466 | file_copies--verbose: |
|
1466 | file_copies--verbose: | |
1467 | file_copies--verbose: |
|
1467 | file_copies--verbose: | |
1468 | file_copies--verbose: |
|
1468 | file_copies--verbose: | |
1469 | file_copies--verbose: |
|
1469 | file_copies--verbose: | |
1470 | file_copies--verbose: |
|
1470 | file_copies--verbose: | |
1471 | file_copies--verbose: |
|
1471 | file_copies--verbose: | |
1472 | file_copies--verbose: |
|
1472 | file_copies--verbose: | |
1473 | file_copies--debug: fourth (second) |
|
1473 | file_copies--debug: fourth (second) | |
1474 | file_copies--debug: |
|
1474 | file_copies--debug: | |
1475 | file_copies--debug: |
|
1475 | file_copies--debug: | |
1476 | file_copies--debug: |
|
1476 | file_copies--debug: | |
1477 | file_copies--debug: |
|
1477 | file_copies--debug: | |
1478 | file_copies--debug: |
|
1478 | file_copies--debug: | |
1479 | file_copies--debug: |
|
1479 | file_copies--debug: | |
1480 | file_copies--debug: |
|
1480 | file_copies--debug: | |
1481 | file_copies--debug: |
|
1481 | file_copies--debug: | |
1482 | file_copies_switch: |
|
1482 | file_copies_switch: | |
1483 | file_copies_switch: |
|
1483 | file_copies_switch: | |
1484 | file_copies_switch: |
|
1484 | file_copies_switch: | |
1485 | file_copies_switch: |
|
1485 | file_copies_switch: | |
1486 | file_copies_switch: |
|
1486 | file_copies_switch: | |
1487 | file_copies_switch: |
|
1487 | file_copies_switch: | |
1488 | file_copies_switch: |
|
1488 | file_copies_switch: | |
1489 | file_copies_switch: |
|
1489 | file_copies_switch: | |
1490 | file_copies_switch: |
|
1490 | file_copies_switch: | |
1491 | file_copies_switch--verbose: |
|
1491 | file_copies_switch--verbose: | |
1492 | file_copies_switch--verbose: |
|
1492 | file_copies_switch--verbose: | |
1493 | file_copies_switch--verbose: |
|
1493 | file_copies_switch--verbose: | |
1494 | file_copies_switch--verbose: |
|
1494 | file_copies_switch--verbose: | |
1495 | file_copies_switch--verbose: |
|
1495 | file_copies_switch--verbose: | |
1496 | file_copies_switch--verbose: |
|
1496 | file_copies_switch--verbose: | |
1497 | file_copies_switch--verbose: |
|
1497 | file_copies_switch--verbose: | |
1498 | file_copies_switch--verbose: |
|
1498 | file_copies_switch--verbose: | |
1499 | file_copies_switch--verbose: |
|
1499 | file_copies_switch--verbose: | |
1500 | file_copies_switch--debug: |
|
1500 | file_copies_switch--debug: | |
1501 | file_copies_switch--debug: |
|
1501 | file_copies_switch--debug: | |
1502 | file_copies_switch--debug: |
|
1502 | file_copies_switch--debug: | |
1503 | file_copies_switch--debug: |
|
1503 | file_copies_switch--debug: | |
1504 | file_copies_switch--debug: |
|
1504 | file_copies_switch--debug: | |
1505 | file_copies_switch--debug: |
|
1505 | file_copies_switch--debug: | |
1506 | file_copies_switch--debug: |
|
1506 | file_copies_switch--debug: | |
1507 | file_copies_switch--debug: |
|
1507 | file_copies_switch--debug: | |
1508 | file_copies_switch--debug: |
|
1508 | file_copies_switch--debug: | |
1509 | files: fourth second third |
|
1509 | files: fourth second third | |
1510 | files: second |
|
1510 | files: second | |
1511 | files: |
|
1511 | files: | |
1512 | files: d |
|
1512 | files: d | |
1513 | files: |
|
1513 | files: | |
1514 | files: c |
|
1514 | files: c | |
1515 | files: c |
|
1515 | files: c | |
1516 | files: b |
|
1516 | files: b | |
1517 | files: a |
|
1517 | files: a | |
1518 | files--verbose: fourth second third |
|
1518 | files--verbose: fourth second third | |
1519 | files--verbose: second |
|
1519 | files--verbose: second | |
1520 | files--verbose: |
|
1520 | files--verbose: | |
1521 | files--verbose: d |
|
1521 | files--verbose: d | |
1522 | files--verbose: |
|
1522 | files--verbose: | |
1523 | files--verbose: c |
|
1523 | files--verbose: c | |
1524 | files--verbose: c |
|
1524 | files--verbose: c | |
1525 | files--verbose: b |
|
1525 | files--verbose: b | |
1526 | files--verbose: a |
|
1526 | files--verbose: a | |
1527 | files--debug: fourth second third |
|
1527 | files--debug: fourth second third | |
1528 | files--debug: second |
|
1528 | files--debug: second | |
1529 | files--debug: |
|
1529 | files--debug: | |
1530 | files--debug: d |
|
1530 | files--debug: d | |
1531 | files--debug: |
|
1531 | files--debug: | |
1532 | files--debug: c |
|
1532 | files--debug: c | |
1533 | files--debug: c |
|
1533 | files--debug: c | |
1534 | files--debug: b |
|
1534 | files--debug: b | |
1535 | files--debug: a |
|
1535 | files--debug: a | |
1536 | manifest: 6:94961b75a2da |
|
1536 | manifest: 6:94961b75a2da | |
1537 | manifest: 5:f2dbc354b94e |
|
1537 | manifest: 5:f2dbc354b94e | |
1538 | manifest: 4:4dc3def4f9b4 |
|
1538 | manifest: 4:4dc3def4f9b4 | |
1539 | manifest: 4:4dc3def4f9b4 |
|
1539 | manifest: 4:4dc3def4f9b4 | |
1540 | manifest: 3:cb5a1327723b |
|
1540 | manifest: 3:cb5a1327723b | |
1541 | manifest: 3:cb5a1327723b |
|
1541 | manifest: 3:cb5a1327723b | |
1542 | manifest: 2:6e0e82995c35 |
|
1542 | manifest: 2:6e0e82995c35 | |
1543 | manifest: 1:4e8d705b1e53 |
|
1543 | manifest: 1:4e8d705b1e53 | |
1544 | manifest: 0:a0c8bcbbb45c |
|
1544 | manifest: 0:a0c8bcbbb45c | |
1545 | manifest--verbose: 6:94961b75a2da |
|
1545 | manifest--verbose: 6:94961b75a2da | |
1546 | manifest--verbose: 5:f2dbc354b94e |
|
1546 | manifest--verbose: 5:f2dbc354b94e | |
1547 | manifest--verbose: 4:4dc3def4f9b4 |
|
1547 | manifest--verbose: 4:4dc3def4f9b4 | |
1548 | manifest--verbose: 4:4dc3def4f9b4 |
|
1548 | manifest--verbose: 4:4dc3def4f9b4 | |
1549 | manifest--verbose: 3:cb5a1327723b |
|
1549 | manifest--verbose: 3:cb5a1327723b | |
1550 | manifest--verbose: 3:cb5a1327723b |
|
1550 | manifest--verbose: 3:cb5a1327723b | |
1551 | manifest--verbose: 2:6e0e82995c35 |
|
1551 | manifest--verbose: 2:6e0e82995c35 | |
1552 | manifest--verbose: 1:4e8d705b1e53 |
|
1552 | manifest--verbose: 1:4e8d705b1e53 | |
1553 | manifest--verbose: 0:a0c8bcbbb45c |
|
1553 | manifest--verbose: 0:a0c8bcbbb45c | |
1554 | manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64 |
|
1554 | manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64 | |
1555 | manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf |
|
1555 | manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf | |
1556 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1556 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 | |
1557 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
1557 | manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 | |
1558 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1558 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc | |
1559 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
1559 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc | |
1560 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
1560 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 | |
1561 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
1561 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 | |
1562 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
1562 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
1563 | node: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1563 | node: 95c24699272ef57d062b8bccc32c878bf841784a | |
1564 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1564 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1565 | node: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1565 | node: d41e714fe50d9e4a5f11b4d595d543481b5f980b | |
1566 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1566 | node: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1567 | node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1567 | node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1568 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1568 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1569 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
1569 | node: 97054abb4ab824450e9164180baf491ae0078465 | |
1570 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1570 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1571 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1571 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1572 | node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1572 | node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a | |
1573 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1573 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1574 | node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1574 | node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b | |
1575 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1575 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1576 | node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1576 | node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1577 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1577 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1578 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
1578 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
1579 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1579 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1580 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1580 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1581 | node--debug: 95c24699272ef57d062b8bccc32c878bf841784a |
|
1581 | node--debug: 95c24699272ef57d062b8bccc32c878bf841784a | |
1582 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1582 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1583 | node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b |
|
1583 | node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b | |
1584 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1584 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1585 | node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1585 | node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1586 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1586 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1587 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
1587 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
1588 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1588 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1589 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1589 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1590 | parents: |
|
1590 | parents: | |
1591 | parents: -1:000000000000 |
|
1591 | parents: -1:000000000000 | |
1592 | parents: 5:13207e5a10d9 4:bbe44766e73d |
|
1592 | parents: 5:13207e5a10d9 4:bbe44766e73d | |
1593 | parents: 3:10e46f2dcbf4 |
|
1593 | parents: 3:10e46f2dcbf4 | |
1594 | parents: |
|
1594 | parents: | |
1595 | parents: |
|
1595 | parents: | |
1596 | parents: |
|
1596 | parents: | |
1597 | parents: |
|
1597 | parents: | |
1598 | parents: |
|
1598 | parents: | |
1599 | parents--verbose: |
|
1599 | parents--verbose: | |
1600 | parents--verbose: -1:000000000000 |
|
1600 | parents--verbose: -1:000000000000 | |
1601 | parents--verbose: 5:13207e5a10d9 4:bbe44766e73d |
|
1601 | parents--verbose: 5:13207e5a10d9 4:bbe44766e73d | |
1602 | parents--verbose: 3:10e46f2dcbf4 |
|
1602 | parents--verbose: 3:10e46f2dcbf4 | |
1603 | parents--verbose: |
|
1603 | parents--verbose: | |
1604 | parents--verbose: |
|
1604 | parents--verbose: | |
1605 | parents--verbose: |
|
1605 | parents--verbose: | |
1606 | parents--verbose: |
|
1606 | parents--verbose: | |
1607 | parents--verbose: |
|
1607 | parents--verbose: | |
1608 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 |
|
1608 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 | |
1609 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1609 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |
1610 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1610 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1611 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1611 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
1612 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
1612 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
1613 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 |
|
1613 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 | |
1614 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
1614 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 | |
1615 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
1615 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 | |
1616 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
1616 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |
1617 | rev: 8 |
|
1617 | rev: 8 | |
1618 | rev: 7 |
|
1618 | rev: 7 | |
1619 | rev: 6 |
|
1619 | rev: 6 | |
1620 | rev: 5 |
|
1620 | rev: 5 | |
1621 | rev: 4 |
|
1621 | rev: 4 | |
1622 | rev: 3 |
|
1622 | rev: 3 | |
1623 | rev: 2 |
|
1623 | rev: 2 | |
1624 | rev: 1 |
|
1624 | rev: 1 | |
1625 | rev: 0 |
|
1625 | rev: 0 | |
1626 | rev--verbose: 8 |
|
1626 | rev--verbose: 8 | |
1627 | rev--verbose: 7 |
|
1627 | rev--verbose: 7 | |
1628 | rev--verbose: 6 |
|
1628 | rev--verbose: 6 | |
1629 | rev--verbose: 5 |
|
1629 | rev--verbose: 5 | |
1630 | rev--verbose: 4 |
|
1630 | rev--verbose: 4 | |
1631 | rev--verbose: 3 |
|
1631 | rev--verbose: 3 | |
1632 | rev--verbose: 2 |
|
1632 | rev--verbose: 2 | |
1633 | rev--verbose: 1 |
|
1633 | rev--verbose: 1 | |
1634 | rev--verbose: 0 |
|
1634 | rev--verbose: 0 | |
1635 | rev--debug: 8 |
|
1635 | rev--debug: 8 | |
1636 | rev--debug: 7 |
|
1636 | rev--debug: 7 | |
1637 | rev--debug: 6 |
|
1637 | rev--debug: 6 | |
1638 | rev--debug: 5 |
|
1638 | rev--debug: 5 | |
1639 | rev--debug: 4 |
|
1639 | rev--debug: 4 | |
1640 | rev--debug: 3 |
|
1640 | rev--debug: 3 | |
1641 | rev--debug: 2 |
|
1641 | rev--debug: 2 | |
1642 | rev--debug: 1 |
|
1642 | rev--debug: 1 | |
1643 | rev--debug: 0 |
|
1643 | rev--debug: 0 | |
1644 | tags: tip |
|
1644 | tags: tip | |
1645 | tags: |
|
1645 | tags: | |
1646 | tags: |
|
1646 | tags: | |
1647 | tags: |
|
1647 | tags: | |
1648 | tags: |
|
1648 | tags: | |
1649 | tags: |
|
1649 | tags: | |
1650 | tags: |
|
1650 | tags: | |
1651 | tags: |
|
1651 | tags: | |
1652 | tags: |
|
1652 | tags: | |
1653 | tags--verbose: tip |
|
1653 | tags--verbose: tip | |
1654 | tags--verbose: |
|
1654 | tags--verbose: | |
1655 | tags--verbose: |
|
1655 | tags--verbose: | |
1656 | tags--verbose: |
|
1656 | tags--verbose: | |
1657 | tags--verbose: |
|
1657 | tags--verbose: | |
1658 | tags--verbose: |
|
1658 | tags--verbose: | |
1659 | tags--verbose: |
|
1659 | tags--verbose: | |
1660 | tags--verbose: |
|
1660 | tags--verbose: | |
1661 | tags--verbose: |
|
1661 | tags--verbose: | |
1662 | tags--debug: tip |
|
1662 | tags--debug: tip | |
1663 | tags--debug: |
|
1663 | tags--debug: | |
1664 | tags--debug: |
|
1664 | tags--debug: | |
1665 | tags--debug: |
|
1665 | tags--debug: | |
1666 | tags--debug: |
|
1666 | tags--debug: | |
1667 | tags--debug: |
|
1667 | tags--debug: | |
1668 | tags--debug: |
|
1668 | tags--debug: | |
1669 | tags--debug: |
|
1669 | tags--debug: | |
1670 | tags--debug: |
|
1670 | tags--debug: | |
1671 | diffstat: 3: +2/-1 |
|
1671 | diffstat: 3: +2/-1 | |
1672 | diffstat: 1: +1/-0 |
|
1672 | diffstat: 1: +1/-0 | |
1673 | diffstat: 0: +0/-0 |
|
1673 | diffstat: 0: +0/-0 | |
1674 | diffstat: 1: +1/-0 |
|
1674 | diffstat: 1: +1/-0 | |
1675 | diffstat: 0: +0/-0 |
|
1675 | diffstat: 0: +0/-0 | |
1676 | diffstat: 1: +1/-0 |
|
1676 | diffstat: 1: +1/-0 | |
1677 | diffstat: 1: +4/-0 |
|
1677 | diffstat: 1: +4/-0 | |
1678 | diffstat: 1: +2/-0 |
|
1678 | diffstat: 1: +2/-0 | |
1679 | diffstat: 1: +1/-0 |
|
1679 | diffstat: 1: +1/-0 | |
1680 | diffstat--verbose: 3: +2/-1 |
|
1680 | diffstat--verbose: 3: +2/-1 | |
1681 | diffstat--verbose: 1: +1/-0 |
|
1681 | diffstat--verbose: 1: +1/-0 | |
1682 | diffstat--verbose: 0: +0/-0 |
|
1682 | diffstat--verbose: 0: +0/-0 | |
1683 | diffstat--verbose: 1: +1/-0 |
|
1683 | diffstat--verbose: 1: +1/-0 | |
1684 | diffstat--verbose: 0: +0/-0 |
|
1684 | diffstat--verbose: 0: +0/-0 | |
1685 | diffstat--verbose: 1: +1/-0 |
|
1685 | diffstat--verbose: 1: +1/-0 | |
1686 | diffstat--verbose: 1: +4/-0 |
|
1686 | diffstat--verbose: 1: +4/-0 | |
1687 | diffstat--verbose: 1: +2/-0 |
|
1687 | diffstat--verbose: 1: +2/-0 | |
1688 | diffstat--verbose: 1: +1/-0 |
|
1688 | diffstat--verbose: 1: +1/-0 | |
1689 | diffstat--debug: 3: +2/-1 |
|
1689 | diffstat--debug: 3: +2/-1 | |
1690 | diffstat--debug: 1: +1/-0 |
|
1690 | diffstat--debug: 1: +1/-0 | |
1691 | diffstat--debug: 0: +0/-0 |
|
1691 | diffstat--debug: 0: +0/-0 | |
1692 | diffstat--debug: 1: +1/-0 |
|
1692 | diffstat--debug: 1: +1/-0 | |
1693 | diffstat--debug: 0: +0/-0 |
|
1693 | diffstat--debug: 0: +0/-0 | |
1694 | diffstat--debug: 1: +1/-0 |
|
1694 | diffstat--debug: 1: +1/-0 | |
1695 | diffstat--debug: 1: +4/-0 |
|
1695 | diffstat--debug: 1: +4/-0 | |
1696 | diffstat--debug: 1: +2/-0 |
|
1696 | diffstat--debug: 1: +2/-0 | |
1697 | diffstat--debug: 1: +1/-0 |
|
1697 | diffstat--debug: 1: +1/-0 | |
1698 | extras: branch=default |
|
1698 | extras: branch=default | |
1699 | extras: branch=default |
|
1699 | extras: branch=default | |
1700 | extras: branch=default |
|
1700 | extras: branch=default | |
1701 | extras: branch=default |
|
1701 | extras: branch=default | |
1702 | extras: branch=foo |
|
1702 | extras: branch=foo | |
1703 | extras: branch=default |
|
1703 | extras: branch=default | |
1704 | extras: branch=default |
|
1704 | extras: branch=default | |
1705 | extras: branch=default |
|
1705 | extras: branch=default | |
1706 | extras: branch=default |
|
1706 | extras: branch=default | |
1707 | extras--verbose: branch=default |
|
1707 | extras--verbose: branch=default | |
1708 | extras--verbose: branch=default |
|
1708 | extras--verbose: branch=default | |
1709 | extras--verbose: branch=default |
|
1709 | extras--verbose: branch=default | |
1710 | extras--verbose: branch=default |
|
1710 | extras--verbose: branch=default | |
1711 | extras--verbose: branch=foo |
|
1711 | extras--verbose: branch=foo | |
1712 | extras--verbose: branch=default |
|
1712 | extras--verbose: branch=default | |
1713 | extras--verbose: branch=default |
|
1713 | extras--verbose: branch=default | |
1714 | extras--verbose: branch=default |
|
1714 | extras--verbose: branch=default | |
1715 | extras--verbose: branch=default |
|
1715 | extras--verbose: branch=default | |
1716 | extras--debug: branch=default |
|
1716 | extras--debug: branch=default | |
1717 | extras--debug: branch=default |
|
1717 | extras--debug: branch=default | |
1718 | extras--debug: branch=default |
|
1718 | extras--debug: branch=default | |
1719 | extras--debug: branch=default |
|
1719 | extras--debug: branch=default | |
1720 | extras--debug: branch=foo |
|
1720 | extras--debug: branch=foo | |
1721 | extras--debug: branch=default |
|
1721 | extras--debug: branch=default | |
1722 | extras--debug: branch=default |
|
1722 | extras--debug: branch=default | |
1723 | extras--debug: branch=default |
|
1723 | extras--debug: branch=default | |
1724 | extras--debug: branch=default |
|
1724 | extras--debug: branch=default | |
1725 | p1rev: 7 |
|
1725 | p1rev: 7 | |
1726 | p1rev: -1 |
|
1726 | p1rev: -1 | |
1727 | p1rev: 5 |
|
1727 | p1rev: 5 | |
1728 | p1rev: 3 |
|
1728 | p1rev: 3 | |
1729 | p1rev: 3 |
|
1729 | p1rev: 3 | |
1730 | p1rev: 2 |
|
1730 | p1rev: 2 | |
1731 | p1rev: 1 |
|
1731 | p1rev: 1 | |
1732 | p1rev: 0 |
|
1732 | p1rev: 0 | |
1733 | p1rev: -1 |
|
1733 | p1rev: -1 | |
1734 | p1rev--verbose: 7 |
|
1734 | p1rev--verbose: 7 | |
1735 | p1rev--verbose: -1 |
|
1735 | p1rev--verbose: -1 | |
1736 | p1rev--verbose: 5 |
|
1736 | p1rev--verbose: 5 | |
1737 | p1rev--verbose: 3 |
|
1737 | p1rev--verbose: 3 | |
1738 | p1rev--verbose: 3 |
|
1738 | p1rev--verbose: 3 | |
1739 | p1rev--verbose: 2 |
|
1739 | p1rev--verbose: 2 | |
1740 | p1rev--verbose: 1 |
|
1740 | p1rev--verbose: 1 | |
1741 | p1rev--verbose: 0 |
|
1741 | p1rev--verbose: 0 | |
1742 | p1rev--verbose: -1 |
|
1742 | p1rev--verbose: -1 | |
1743 | p1rev--debug: 7 |
|
1743 | p1rev--debug: 7 | |
1744 | p1rev--debug: -1 |
|
1744 | p1rev--debug: -1 | |
1745 | p1rev--debug: 5 |
|
1745 | p1rev--debug: 5 | |
1746 | p1rev--debug: 3 |
|
1746 | p1rev--debug: 3 | |
1747 | p1rev--debug: 3 |
|
1747 | p1rev--debug: 3 | |
1748 | p1rev--debug: 2 |
|
1748 | p1rev--debug: 2 | |
1749 | p1rev--debug: 1 |
|
1749 | p1rev--debug: 1 | |
1750 | p1rev--debug: 0 |
|
1750 | p1rev--debug: 0 | |
1751 | p1rev--debug: -1 |
|
1751 | p1rev--debug: -1 | |
1752 | p2rev: -1 |
|
1752 | p2rev: -1 | |
1753 | p2rev: -1 |
|
1753 | p2rev: -1 | |
1754 | p2rev: 4 |
|
1754 | p2rev: 4 | |
1755 | p2rev: -1 |
|
1755 | p2rev: -1 | |
1756 | p2rev: -1 |
|
1756 | p2rev: -1 | |
1757 | p2rev: -1 |
|
1757 | p2rev: -1 | |
1758 | p2rev: -1 |
|
1758 | p2rev: -1 | |
1759 | p2rev: -1 |
|
1759 | p2rev: -1 | |
1760 | p2rev: -1 |
|
1760 | p2rev: -1 | |
1761 | p2rev--verbose: -1 |
|
1761 | p2rev--verbose: -1 | |
1762 | p2rev--verbose: -1 |
|
1762 | p2rev--verbose: -1 | |
1763 | p2rev--verbose: 4 |
|
1763 | p2rev--verbose: 4 | |
1764 | p2rev--verbose: -1 |
|
1764 | p2rev--verbose: -1 | |
1765 | p2rev--verbose: -1 |
|
1765 | p2rev--verbose: -1 | |
1766 | p2rev--verbose: -1 |
|
1766 | p2rev--verbose: -1 | |
1767 | p2rev--verbose: -1 |
|
1767 | p2rev--verbose: -1 | |
1768 | p2rev--verbose: -1 |
|
1768 | p2rev--verbose: -1 | |
1769 | p2rev--verbose: -1 |
|
1769 | p2rev--verbose: -1 | |
1770 | p2rev--debug: -1 |
|
1770 | p2rev--debug: -1 | |
1771 | p2rev--debug: -1 |
|
1771 | p2rev--debug: -1 | |
1772 | p2rev--debug: 4 |
|
1772 | p2rev--debug: 4 | |
1773 | p2rev--debug: -1 |
|
1773 | p2rev--debug: -1 | |
1774 | p2rev--debug: -1 |
|
1774 | p2rev--debug: -1 | |
1775 | p2rev--debug: -1 |
|
1775 | p2rev--debug: -1 | |
1776 | p2rev--debug: -1 |
|
1776 | p2rev--debug: -1 | |
1777 | p2rev--debug: -1 |
|
1777 | p2rev--debug: -1 | |
1778 | p2rev--debug: -1 |
|
1778 | p2rev--debug: -1 | |
1779 | p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1779 | p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1780 | p1node: 0000000000000000000000000000000000000000 |
|
1780 | p1node: 0000000000000000000000000000000000000000 | |
1781 | p1node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1781 | p1node: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1782 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1782 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1783 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1783 | p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1784 | p1node: 97054abb4ab824450e9164180baf491ae0078465 |
|
1784 | p1node: 97054abb4ab824450e9164180baf491ae0078465 | |
1785 | p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1785 | p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1786 | p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1786 | p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1787 | p1node: 0000000000000000000000000000000000000000 |
|
1787 | p1node: 0000000000000000000000000000000000000000 | |
1788 | p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1788 | p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1789 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
1789 | p1node--verbose: 0000000000000000000000000000000000000000 | |
1790 | p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1790 | p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1791 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1791 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1792 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1792 | p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1793 | p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
1793 | p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
1794 | p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1794 | p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1795 | p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1795 | p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1796 | p1node--verbose: 0000000000000000000000000000000000000000 |
|
1796 | p1node--verbose: 0000000000000000000000000000000000000000 | |
1797 | p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
1797 | p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
1798 | p1node--debug: 0000000000000000000000000000000000000000 |
|
1798 | p1node--debug: 0000000000000000000000000000000000000000 | |
1799 | p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
1799 | p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f | |
1800 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1800 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1801 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
1801 | p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
1802 | p1node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
1802 | p1node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
1803 | p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
1803 | p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
1804 | p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1804 | p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1805 | p1node--debug: 0000000000000000000000000000000000000000 |
|
1805 | p1node--debug: 0000000000000000000000000000000000000000 | |
1806 | p2node: 0000000000000000000000000000000000000000 |
|
1806 | p2node: 0000000000000000000000000000000000000000 | |
1807 | p2node: 0000000000000000000000000000000000000000 |
|
1807 | p2node: 0000000000000000000000000000000000000000 | |
1808 | p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1808 | p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1809 | p2node: 0000000000000000000000000000000000000000 |
|
1809 | p2node: 0000000000000000000000000000000000000000 | |
1810 | p2node: 0000000000000000000000000000000000000000 |
|
1810 | p2node: 0000000000000000000000000000000000000000 | |
1811 | p2node: 0000000000000000000000000000000000000000 |
|
1811 | p2node: 0000000000000000000000000000000000000000 | |
1812 | p2node: 0000000000000000000000000000000000000000 |
|
1812 | p2node: 0000000000000000000000000000000000000000 | |
1813 | p2node: 0000000000000000000000000000000000000000 |
|
1813 | p2node: 0000000000000000000000000000000000000000 | |
1814 | p2node: 0000000000000000000000000000000000000000 |
|
1814 | p2node: 0000000000000000000000000000000000000000 | |
1815 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1815 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1816 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1816 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1817 | p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1817 | p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1818 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1818 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1819 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1819 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1820 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1820 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1821 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1821 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1822 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1822 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1823 | p2node--verbose: 0000000000000000000000000000000000000000 |
|
1823 | p2node--verbose: 0000000000000000000000000000000000000000 | |
1824 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1824 | p2node--debug: 0000000000000000000000000000000000000000 | |
1825 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1825 | p2node--debug: 0000000000000000000000000000000000000000 | |
1826 | p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
1826 | p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
1827 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1827 | p2node--debug: 0000000000000000000000000000000000000000 | |
1828 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1828 | p2node--debug: 0000000000000000000000000000000000000000 | |
1829 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1829 | p2node--debug: 0000000000000000000000000000000000000000 | |
1830 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1830 | p2node--debug: 0000000000000000000000000000000000000000 | |
1831 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1831 | p2node--debug: 0000000000000000000000000000000000000000 | |
1832 | p2node--debug: 0000000000000000000000000000000000000000 |
|
1832 | p2node--debug: 0000000000000000000000000000000000000000 | |
1833 |
|
1833 | |||
1834 | Filters work: |
|
1834 | Filters work: | |
1835 |
|
1835 | |||
1836 | $ hg log --template '{author|domain}\n' |
|
1836 | $ hg log --template '{author|domain}\n' | |
1837 |
|
1837 | |||
1838 | hostname |
|
1838 | hostname | |
1839 |
|
1839 | |||
1840 |
|
1840 | |||
1841 |
|
1841 | |||
1842 |
|
1842 | |||
1843 | place |
|
1843 | place | |
1844 | place |
|
1844 | place | |
1845 | hostname |
|
1845 | hostname | |
1846 |
|
1846 | |||
1847 | $ hg log --template '{author|person}\n' |
|
1847 | $ hg log --template '{author|person}\n' | |
1848 | test |
|
1848 | test | |
1849 | User Name |
|
1849 | User Name | |
1850 | person |
|
1850 | person | |
1851 | person |
|
1851 | person | |
1852 | person |
|
1852 | person | |
1853 | person |
|
1853 | person | |
1854 | other |
|
1854 | other | |
1855 | A. N. Other |
|
1855 | A. N. Other | |
1856 | User Name |
|
1856 | User Name | |
1857 |
|
1857 | |||
1858 | $ hg log --template '{author|user}\n' |
|
1858 | $ hg log --template '{author|user}\n' | |
1859 | test |
|
1859 | test | |
1860 | user |
|
1860 | user | |
1861 | person |
|
1861 | person | |
1862 | person |
|
1862 | person | |
1863 | person |
|
1863 | person | |
1864 | person |
|
1864 | person | |
1865 | other |
|
1865 | other | |
1866 | other |
|
1866 | other | |
1867 | user |
|
1867 | user | |
1868 |
|
1868 | |||
1869 | $ hg log --template '{date|date}\n' |
|
1869 | $ hg log --template '{date|date}\n' | |
1870 | Wed Jan 01 10:01:00 2020 +0000 |
|
1870 | Wed Jan 01 10:01:00 2020 +0000 | |
1871 | Mon Jan 12 13:46:40 1970 +0000 |
|
1871 | Mon Jan 12 13:46:40 1970 +0000 | |
1872 | Sun Jan 18 08:40:01 1970 +0000 |
|
1872 | Sun Jan 18 08:40:01 1970 +0000 | |
1873 | Sun Jan 18 08:40:00 1970 +0000 |
|
1873 | Sun Jan 18 08:40:00 1970 +0000 | |
1874 | Sat Jan 17 04:53:20 1970 +0000 |
|
1874 | Sat Jan 17 04:53:20 1970 +0000 | |
1875 | Fri Jan 16 01:06:40 1970 +0000 |
|
1875 | Fri Jan 16 01:06:40 1970 +0000 | |
1876 | Wed Jan 14 21:20:00 1970 +0000 |
|
1876 | Wed Jan 14 21:20:00 1970 +0000 | |
1877 | Tue Jan 13 17:33:20 1970 +0000 |
|
1877 | Tue Jan 13 17:33:20 1970 +0000 | |
1878 | Mon Jan 12 13:46:40 1970 +0000 |
|
1878 | Mon Jan 12 13:46:40 1970 +0000 | |
1879 |
|
1879 | |||
1880 | $ hg log --template '{date|isodate}\n' |
|
1880 | $ hg log --template '{date|isodate}\n' | |
1881 | 2020-01-01 10:01 +0000 |
|
1881 | 2020-01-01 10:01 +0000 | |
1882 | 1970-01-12 13:46 +0000 |
|
1882 | 1970-01-12 13:46 +0000 | |
1883 | 1970-01-18 08:40 +0000 |
|
1883 | 1970-01-18 08:40 +0000 | |
1884 | 1970-01-18 08:40 +0000 |
|
1884 | 1970-01-18 08:40 +0000 | |
1885 | 1970-01-17 04:53 +0000 |
|
1885 | 1970-01-17 04:53 +0000 | |
1886 | 1970-01-16 01:06 +0000 |
|
1886 | 1970-01-16 01:06 +0000 | |
1887 | 1970-01-14 21:20 +0000 |
|
1887 | 1970-01-14 21:20 +0000 | |
1888 | 1970-01-13 17:33 +0000 |
|
1888 | 1970-01-13 17:33 +0000 | |
1889 | 1970-01-12 13:46 +0000 |
|
1889 | 1970-01-12 13:46 +0000 | |
1890 |
|
1890 | |||
1891 | $ hg log --template '{date|isodatesec}\n' |
|
1891 | $ hg log --template '{date|isodatesec}\n' | |
1892 | 2020-01-01 10:01:00 +0000 |
|
1892 | 2020-01-01 10:01:00 +0000 | |
1893 | 1970-01-12 13:46:40 +0000 |
|
1893 | 1970-01-12 13:46:40 +0000 | |
1894 | 1970-01-18 08:40:01 +0000 |
|
1894 | 1970-01-18 08:40:01 +0000 | |
1895 | 1970-01-18 08:40:00 +0000 |
|
1895 | 1970-01-18 08:40:00 +0000 | |
1896 | 1970-01-17 04:53:20 +0000 |
|
1896 | 1970-01-17 04:53:20 +0000 | |
1897 | 1970-01-16 01:06:40 +0000 |
|
1897 | 1970-01-16 01:06:40 +0000 | |
1898 | 1970-01-14 21:20:00 +0000 |
|
1898 | 1970-01-14 21:20:00 +0000 | |
1899 | 1970-01-13 17:33:20 +0000 |
|
1899 | 1970-01-13 17:33:20 +0000 | |
1900 | 1970-01-12 13:46:40 +0000 |
|
1900 | 1970-01-12 13:46:40 +0000 | |
1901 |
|
1901 | |||
1902 | $ hg log --template '{date|rfc822date}\n' |
|
1902 | $ hg log --template '{date|rfc822date}\n' | |
1903 | Wed, 01 Jan 2020 10:01:00 +0000 |
|
1903 | Wed, 01 Jan 2020 10:01:00 +0000 | |
1904 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
1904 | Mon, 12 Jan 1970 13:46:40 +0000 | |
1905 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
1905 | Sun, 18 Jan 1970 08:40:01 +0000 | |
1906 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
1906 | Sun, 18 Jan 1970 08:40:00 +0000 | |
1907 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
1907 | Sat, 17 Jan 1970 04:53:20 +0000 | |
1908 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
1908 | Fri, 16 Jan 1970 01:06:40 +0000 | |
1909 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
1909 | Wed, 14 Jan 1970 21:20:00 +0000 | |
1910 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
1910 | Tue, 13 Jan 1970 17:33:20 +0000 | |
1911 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
1911 | Mon, 12 Jan 1970 13:46:40 +0000 | |
1912 |
|
1912 | |||
1913 | $ hg log --template '{desc|firstline}\n' |
|
1913 | $ hg log --template '{desc|firstline}\n' | |
1914 | third |
|
1914 | third | |
1915 | second |
|
1915 | second | |
1916 | merge |
|
1916 | merge | |
1917 | new head |
|
1917 | new head | |
1918 | new branch |
|
1918 | new branch | |
1919 | no user, no domain |
|
1919 | no user, no domain | |
1920 | no person |
|
1920 | no person | |
1921 | other 1 |
|
1921 | other 1 | |
1922 | line 1 |
|
1922 | line 1 | |
1923 |
|
1923 | |||
1924 | $ hg log --template '{node|short}\n' |
|
1924 | $ hg log --template '{node|short}\n' | |
1925 | 95c24699272e |
|
1925 | 95c24699272e | |
1926 | 29114dbae42b |
|
1926 | 29114dbae42b | |
1927 | d41e714fe50d |
|
1927 | d41e714fe50d | |
1928 | 13207e5a10d9 |
|
1928 | 13207e5a10d9 | |
1929 | bbe44766e73d |
|
1929 | bbe44766e73d | |
1930 | 10e46f2dcbf4 |
|
1930 | 10e46f2dcbf4 | |
1931 | 97054abb4ab8 |
|
1931 | 97054abb4ab8 | |
1932 | b608e9d1a3f0 |
|
1932 | b608e9d1a3f0 | |
1933 | 1e4e1b8f71e0 |
|
1933 | 1e4e1b8f71e0 | |
1934 |
|
1934 | |||
1935 | $ hg log --template '<changeset author="{author|xmlescape}"/>\n' |
|
1935 | $ hg log --template '<changeset author="{author|xmlescape}"/>\n' | |
1936 | <changeset author="test"/> |
|
1936 | <changeset author="test"/> | |
1937 | <changeset author="User Name <user@hostname>"/> |
|
1937 | <changeset author="User Name <user@hostname>"/> | |
1938 | <changeset author="person"/> |
|
1938 | <changeset author="person"/> | |
1939 | <changeset author="person"/> |
|
1939 | <changeset author="person"/> | |
1940 | <changeset author="person"/> |
|
1940 | <changeset author="person"/> | |
1941 | <changeset author="person"/> |
|
1941 | <changeset author="person"/> | |
1942 | <changeset author="other@place"/> |
|
1942 | <changeset author="other@place"/> | |
1943 | <changeset author="A. N. Other <other@place>"/> |
|
1943 | <changeset author="A. N. Other <other@place>"/> | |
1944 | <changeset author="User Name <user@hostname>"/> |
|
1944 | <changeset author="User Name <user@hostname>"/> | |
1945 |
|
1945 | |||
1946 | $ hg log --template '{rev}: {children}\n' |
|
1946 | $ hg log --template '{rev}: {children}\n' | |
1947 | 8: |
|
1947 | 8: | |
1948 | 7: 8:95c24699272e |
|
1948 | 7: 8:95c24699272e | |
1949 | 6: |
|
1949 | 6: | |
1950 | 5: 6:d41e714fe50d |
|
1950 | 5: 6:d41e714fe50d | |
1951 | 4: 6:d41e714fe50d |
|
1951 | 4: 6:d41e714fe50d | |
1952 | 3: 4:bbe44766e73d 5:13207e5a10d9 |
|
1952 | 3: 4:bbe44766e73d 5:13207e5a10d9 | |
1953 | 2: 3:10e46f2dcbf4 |
|
1953 | 2: 3:10e46f2dcbf4 | |
1954 | 1: 2:97054abb4ab8 |
|
1954 | 1: 2:97054abb4ab8 | |
1955 | 0: 1:b608e9d1a3f0 |
|
1955 | 0: 1:b608e9d1a3f0 | |
1956 |
|
1956 | |||
1957 | Formatnode filter works: |
|
1957 | Formatnode filter works: | |
1958 |
|
1958 | |||
1959 | $ hg -q log -r 0 --template '{node|formatnode}\n' |
|
1959 | $ hg -q log -r 0 --template '{node|formatnode}\n' | |
1960 | 1e4e1b8f71e0 |
|
1960 | 1e4e1b8f71e0 | |
1961 |
|
1961 | |||
1962 | $ hg log -r 0 --template '{node|formatnode}\n' |
|
1962 | $ hg log -r 0 --template '{node|formatnode}\n' | |
1963 | 1e4e1b8f71e0 |
|
1963 | 1e4e1b8f71e0 | |
1964 |
|
1964 | |||
1965 | $ hg -v log -r 0 --template '{node|formatnode}\n' |
|
1965 | $ hg -v log -r 0 --template '{node|formatnode}\n' | |
1966 | 1e4e1b8f71e0 |
|
1966 | 1e4e1b8f71e0 | |
1967 |
|
1967 | |||
1968 | $ hg --debug log -r 0 --template '{node|formatnode}\n' |
|
1968 | $ hg --debug log -r 0 --template '{node|formatnode}\n' | |
1969 | 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1969 | 1e4e1b8f71e05681d422154f5421e385fec3454f | |
1970 |
|
1970 | |||
1971 | Age filter: |
|
1971 | Age filter: | |
1972 |
|
1972 | |||
1973 | $ hg init unstable-hash |
|
1973 | $ hg init unstable-hash | |
1974 | $ cd unstable-hash |
|
1974 | $ cd unstable-hash | |
1975 | $ hg log --template '{date|age}\n' > /dev/null || exit 1 |
|
1975 | $ hg log --template '{date|age}\n' > /dev/null || exit 1 | |
1976 |
|
1976 | |||
1977 | >>> from datetime import datetime, timedelta |
|
1977 | >>> from datetime import datetime, timedelta | |
1978 | >>> fp = open('a', 'w') |
|
1978 | >>> fp = open('a', 'w') | |
1979 | >>> n = datetime.now() + timedelta(366 * 7) |
|
1979 | >>> n = datetime.now() + timedelta(366 * 7) | |
1980 | >>> fp.write('%d-%d-%d 00:00' % (n.year, n.month, n.day)) |
|
1980 | >>> fp.write('%d-%d-%d 00:00' % (n.year, n.month, n.day)) | |
1981 | >>> fp.close() |
|
1981 | >>> fp.close() | |
1982 | $ hg add a |
|
1982 | $ hg add a | |
1983 | $ hg commit -m future -d "`cat a`" |
|
1983 | $ hg commit -m future -d "`cat a`" | |
1984 |
|
1984 | |||
1985 | $ hg log -l1 --template '{date|age}\n' |
|
1985 | $ hg log -l1 --template '{date|age}\n' | |
1986 | 7 years from now |
|
1986 | 7 years from now | |
1987 |
|
1987 | |||
1988 | $ cd .. |
|
1988 | $ cd .. | |
1989 | $ rm -rf unstable-hash |
|
1989 | $ rm -rf unstable-hash | |
1990 |
|
1990 | |||
1991 | Add a dummy commit to make up for the instability of the above: |
|
1991 | Add a dummy commit to make up for the instability of the above: | |
1992 |
|
1992 | |||
1993 | $ echo a > a |
|
1993 | $ echo a > a | |
1994 | $ hg add a |
|
1994 | $ hg add a | |
1995 | $ hg ci -m future |
|
1995 | $ hg ci -m future | |
1996 |
|
1996 | |||
1997 | Count filter: |
|
1997 | Count filter: | |
1998 |
|
1998 | |||
1999 | $ hg log -l1 --template '{node|count} {node|short|count}\n' |
|
1999 | $ hg log -l1 --template '{node|count} {node|short|count}\n' | |
2000 | 40 12 |
|
2000 | 40 12 | |
2001 |
|
2001 | |||
2002 | $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n' |
|
2002 | $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n' | |
2003 | 0 1 4 |
|
2003 | 0 1 4 | |
2004 |
|
2004 | |||
2005 | $ hg log -G --template '{rev}: children: {children|count}, \ |
|
2005 | $ hg log -G --template '{rev}: children: {children|count}, \ | |
2006 | > tags: {tags|count}, file_adds: {file_adds|count}, \ |
|
2006 | > tags: {tags|count}, file_adds: {file_adds|count}, \ | |
2007 | > ancestors: {revset("ancestors(%s)", rev)|count}' |
|
2007 | > ancestors: {revset("ancestors(%s)", rev)|count}' | |
2008 | @ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3 |
|
2008 | @ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3 | |
2009 | | |
|
2009 | | | |
2010 | o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2 |
|
2010 | o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2 | |
2011 | | |
|
2011 | | | |
2012 | o 7: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2012 | o 7: children: 1, tags: 0, file_adds: 1, ancestors: 1 | |
2013 |
|
2013 | |||
2014 | o 6: children: 0, tags: 0, file_adds: 0, ancestors: 7 |
|
2014 | o 6: children: 0, tags: 0, file_adds: 0, ancestors: 7 | |
2015 | |\ |
|
2015 | |\ | |
2016 | | o 5: children: 1, tags: 0, file_adds: 1, ancestors: 5 |
|
2016 | | o 5: children: 1, tags: 0, file_adds: 1, ancestors: 5 | |
2017 | | | |
|
2017 | | | | |
2018 | o | 4: children: 1, tags: 0, file_adds: 0, ancestors: 5 |
|
2018 | o | 4: children: 1, tags: 0, file_adds: 0, ancestors: 5 | |
2019 | |/ |
|
2019 | |/ | |
2020 | o 3: children: 2, tags: 0, file_adds: 0, ancestors: 4 |
|
2020 | o 3: children: 2, tags: 0, file_adds: 0, ancestors: 4 | |
2021 | | |
|
2021 | | | |
2022 | o 2: children: 1, tags: 0, file_adds: 1, ancestors: 3 |
|
2022 | o 2: children: 1, tags: 0, file_adds: 1, ancestors: 3 | |
2023 | | |
|
2023 | | | |
2024 | o 1: children: 1, tags: 0, file_adds: 1, ancestors: 2 |
|
2024 | o 1: children: 1, tags: 0, file_adds: 1, ancestors: 2 | |
2025 | | |
|
2025 | | | |
2026 | o 0: children: 1, tags: 0, file_adds: 1, ancestors: 1 |
|
2026 | o 0: children: 1, tags: 0, file_adds: 1, ancestors: 1 | |
2027 |
|
2027 | |||
2028 |
|
2028 | |||
2029 | Upper/lower filters: |
|
2029 | Upper/lower filters: | |
2030 |
|
2030 | |||
2031 | $ hg log -r0 --template '{branch|upper}\n' |
|
2031 | $ hg log -r0 --template '{branch|upper}\n' | |
2032 | DEFAULT |
|
2032 | DEFAULT | |
2033 | $ hg log -r0 --template '{author|lower}\n' |
|
2033 | $ hg log -r0 --template '{author|lower}\n' | |
2034 | user name <user@hostname> |
|
2034 | user name <user@hostname> | |
2035 | $ hg log -r0 --template '{date|upper}\n' |
|
2035 | $ hg log -r0 --template '{date|upper}\n' | |
2036 | abort: template filter 'upper' is not compatible with keyword 'date' |
|
2036 | abort: template filter 'upper' is not compatible with keyword 'date' | |
2037 | [255] |
|
2037 | [255] | |
2038 |
|
2038 | |||
2039 | Add a commit that does all possible modifications at once |
|
2039 | Add a commit that does all possible modifications at once | |
2040 |
|
2040 | |||
2041 | $ echo modify >> third |
|
2041 | $ echo modify >> third | |
2042 | $ touch b |
|
2042 | $ touch b | |
2043 | $ hg add b |
|
2043 | $ hg add b | |
2044 | $ hg mv fourth fifth |
|
2044 | $ hg mv fourth fifth | |
2045 | $ hg rm a |
|
2045 | $ hg rm a | |
2046 | $ hg ci -m "Modify, add, remove, rename" |
|
2046 | $ hg ci -m "Modify, add, remove, rename" | |
2047 |
|
2047 | |||
2048 | Check the status template |
|
2048 | Check the status template | |
2049 |
|
2049 | |||
2050 | $ cat <<EOF >> $HGRCPATH |
|
2050 | $ cat <<EOF >> $HGRCPATH | |
2051 | > [extensions] |
|
2051 | > [extensions] | |
2052 | > color= |
|
2052 | > color= | |
2053 | > EOF |
|
2053 | > EOF | |
2054 |
|
2054 | |||
2055 | $ hg log -T status -r 10 |
|
2055 | $ hg log -T status -r 10 | |
2056 | changeset: 10:0f9759ec227a |
|
2056 | changeset: 10:0f9759ec227a | |
2057 | tag: tip |
|
2057 | tag: tip | |
2058 | user: test |
|
2058 | user: test | |
2059 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2059 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2060 | summary: Modify, add, remove, rename |
|
2060 | summary: Modify, add, remove, rename | |
2061 | files: |
|
2061 | files: | |
2062 | M third |
|
2062 | M third | |
2063 | A b |
|
2063 | A b | |
2064 | A fifth |
|
2064 | A fifth | |
2065 | R a |
|
2065 | R a | |
2066 | R fourth |
|
2066 | R fourth | |
2067 |
|
2067 | |||
2068 | $ hg log -T status -C -r 10 |
|
2068 | $ hg log -T status -C -r 10 | |
2069 | changeset: 10:0f9759ec227a |
|
2069 | changeset: 10:0f9759ec227a | |
2070 | tag: tip |
|
2070 | tag: tip | |
2071 | user: test |
|
2071 | user: test | |
2072 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2072 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2073 | summary: Modify, add, remove, rename |
|
2073 | summary: Modify, add, remove, rename | |
2074 | files: |
|
2074 | files: | |
2075 | M third |
|
2075 | M third | |
2076 | A b |
|
2076 | A b | |
2077 | A fifth |
|
2077 | A fifth | |
2078 | fourth |
|
2078 | fourth | |
2079 | R a |
|
2079 | R a | |
2080 | R fourth |
|
2080 | R fourth | |
2081 |
|
2081 | |||
2082 | $ hg log -T status -C -r 10 -v |
|
2082 | $ hg log -T status -C -r 10 -v | |
2083 | changeset: 10:0f9759ec227a |
|
2083 | changeset: 10:0f9759ec227a | |
2084 | tag: tip |
|
2084 | tag: tip | |
2085 | user: test |
|
2085 | user: test | |
2086 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2086 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2087 | description: |
|
2087 | description: | |
2088 | Modify, add, remove, rename |
|
2088 | Modify, add, remove, rename | |
2089 |
|
2089 | |||
2090 | files: |
|
2090 | files: | |
2091 | M third |
|
2091 | M third | |
2092 | A b |
|
2092 | A b | |
2093 | A fifth |
|
2093 | A fifth | |
2094 | fourth |
|
2094 | fourth | |
2095 | R a |
|
2095 | R a | |
2096 | R fourth |
|
2096 | R fourth | |
2097 |
|
2097 | |||
2098 | $ hg log -T status -C -r 10 --debug |
|
2098 | $ hg log -T status -C -r 10 --debug | |
2099 | changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c |
|
2099 | changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c | |
2100 | tag: tip |
|
2100 | tag: tip | |
2101 | phase: secret |
|
2101 | phase: secret | |
2102 | parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066 |
|
2102 | parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066 | |
2103 | parent: -1:0000000000000000000000000000000000000000 |
|
2103 | parent: -1:0000000000000000000000000000000000000000 | |
2104 | manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567 |
|
2104 | manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567 | |
2105 | user: test |
|
2105 | user: test | |
2106 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2106 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2107 | extra: branch=default |
|
2107 | extra: branch=default | |
2108 | description: |
|
2108 | description: | |
2109 | Modify, add, remove, rename |
|
2109 | Modify, add, remove, rename | |
2110 |
|
2110 | |||
2111 | files: |
|
2111 | files: | |
2112 | M third |
|
2112 | M third | |
2113 | A b |
|
2113 | A b | |
2114 | A fifth |
|
2114 | A fifth | |
2115 | fourth |
|
2115 | fourth | |
2116 | R a |
|
2116 | R a | |
2117 | R fourth |
|
2117 | R fourth | |
2118 |
|
2118 | |||
2119 | $ hg log -T status -C -r 10 --quiet |
|
2119 | $ hg log -T status -C -r 10 --quiet | |
2120 | 10:0f9759ec227a |
|
2120 | 10:0f9759ec227a | |
2121 | $ hg --color=debug log -T status -r 10 |
|
2121 | $ hg --color=debug log -T status -r 10 | |
2122 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2122 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] | |
2123 | [log.tag|tag: tip] |
|
2123 | [log.tag|tag: tip] | |
2124 | [log.user|user: test] |
|
2124 | [log.user|user: test] | |
2125 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2125 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
2126 | [log.summary|summary: Modify, add, remove, rename] |
|
2126 | [log.summary|summary: Modify, add, remove, rename] | |
2127 | [ui.note log.files|files:] |
|
2127 | [ui.note log.files|files:] | |
2128 | [status.modified|M third] |
|
2128 | [status.modified|M third] | |
2129 | [status.added|A b] |
|
2129 | [status.added|A b] | |
2130 | [status.added|A fifth] |
|
2130 | [status.added|A fifth] | |
2131 | [status.removed|R a] |
|
2131 | [status.removed|R a] | |
2132 | [status.removed|R fourth] |
|
2132 | [status.removed|R fourth] | |
2133 |
|
2133 | |||
2134 | $ hg --color=debug log -T status -C -r 10 |
|
2134 | $ hg --color=debug log -T status -C -r 10 | |
2135 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2135 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] | |
2136 | [log.tag|tag: tip] |
|
2136 | [log.tag|tag: tip] | |
2137 | [log.user|user: test] |
|
2137 | [log.user|user: test] | |
2138 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2138 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
2139 | [log.summary|summary: Modify, add, remove, rename] |
|
2139 | [log.summary|summary: Modify, add, remove, rename] | |
2140 | [ui.note log.files|files:] |
|
2140 | [ui.note log.files|files:] | |
2141 | [status.modified|M third] |
|
2141 | [status.modified|M third] | |
2142 | [status.added|A b] |
|
2142 | [status.added|A b] | |
2143 | [status.added|A fifth] |
|
2143 | [status.added|A fifth] | |
2144 | [status.copied| fourth] |
|
2144 | [status.copied| fourth] | |
2145 | [status.removed|R a] |
|
2145 | [status.removed|R a] | |
2146 | [status.removed|R fourth] |
|
2146 | [status.removed|R fourth] | |
2147 |
|
2147 | |||
2148 | $ hg --color=debug log -T status -C -r 10 -v |
|
2148 | $ hg --color=debug log -T status -C -r 10 -v | |
2149 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] |
|
2149 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a] | |
2150 | [log.tag|tag: tip] |
|
2150 | [log.tag|tag: tip] | |
2151 | [log.user|user: test] |
|
2151 | [log.user|user: test] | |
2152 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2152 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
2153 | [ui.note log.description|description:] |
|
2153 | [ui.note log.description|description:] | |
2154 | [ui.note log.description|Modify, add, remove, rename] |
|
2154 | [ui.note log.description|Modify, add, remove, rename] | |
2155 |
|
2155 | |||
2156 | [ui.note log.files|files:] |
|
2156 | [ui.note log.files|files:] | |
2157 | [status.modified|M third] |
|
2157 | [status.modified|M third] | |
2158 | [status.added|A b] |
|
2158 | [status.added|A b] | |
2159 | [status.added|A fifth] |
|
2159 | [status.added|A fifth] | |
2160 | [status.copied| fourth] |
|
2160 | [status.copied| fourth] | |
2161 | [status.removed|R a] |
|
2161 | [status.removed|R a] | |
2162 | [status.removed|R fourth] |
|
2162 | [status.removed|R fourth] | |
2163 |
|
2163 | |||
2164 | $ hg --color=debug log -T status -C -r 10 --debug |
|
2164 | $ hg --color=debug log -T status -C -r 10 --debug | |
2165 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c] |
|
2165 | [log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c] | |
2166 | [log.tag|tag: tip] |
|
2166 | [log.tag|tag: tip] | |
2167 | [log.phase|phase: secret] |
|
2167 | [log.phase|phase: secret] | |
2168 | [log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066] |
|
2168 | [log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066] | |
2169 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2169 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2170 | [ui.debug log.manifest|manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567] |
|
2170 | [ui.debug log.manifest|manifest: 8:89dd546f2de0a9d6d664f58d86097eb97baba567] | |
2171 | [log.user|user: test] |
|
2171 | [log.user|user: test] | |
2172 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
|
2172 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
2173 | [ui.debug log.extra|extra: branch=default] |
|
2173 | [ui.debug log.extra|extra: branch=default] | |
2174 | [ui.note log.description|description:] |
|
2174 | [ui.note log.description|description:] | |
2175 | [ui.note log.description|Modify, add, remove, rename] |
|
2175 | [ui.note log.description|Modify, add, remove, rename] | |
2176 |
|
2176 | |||
2177 | [ui.note log.files|files:] |
|
2177 | [ui.note log.files|files:] | |
2178 | [status.modified|M third] |
|
2178 | [status.modified|M third] | |
2179 | [status.added|A b] |
|
2179 | [status.added|A b] | |
2180 | [status.added|A fifth] |
|
2180 | [status.added|A fifth] | |
2181 | [status.copied| fourth] |
|
2181 | [status.copied| fourth] | |
2182 | [status.removed|R a] |
|
2182 | [status.removed|R a] | |
2183 | [status.removed|R fourth] |
|
2183 | [status.removed|R fourth] | |
2184 |
|
2184 | |||
2185 | $ hg --color=debug log -T status -C -r 10 --quiet |
|
2185 | $ hg --color=debug log -T status -C -r 10 --quiet | |
2186 | [log.node|10:0f9759ec227a] |
|
2186 | [log.node|10:0f9759ec227a] | |
2187 |
|
2187 | |||
2188 | Check the bisect template |
|
2188 | Check the bisect template | |
2189 |
|
2189 | |||
2190 | $ hg bisect -g 1 |
|
2190 | $ hg bisect -g 1 | |
2191 | $ hg bisect -b 3 --noupdate |
|
2191 | $ hg bisect -b 3 --noupdate | |
2192 | Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) |
|
2192 | Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) | |
2193 | $ hg log -T bisect -r 0:4 |
|
2193 | $ hg log -T bisect -r 0:4 | |
2194 | changeset: 0:1e4e1b8f71e0 |
|
2194 | changeset: 0:1e4e1b8f71e0 | |
2195 | bisect: good (implicit) |
|
2195 | bisect: good (implicit) | |
2196 | user: User Name <user@hostname> |
|
2196 | user: User Name <user@hostname> | |
2197 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2197 | date: Mon Jan 12 13:46:40 1970 +0000 | |
2198 | summary: line 1 |
|
2198 | summary: line 1 | |
2199 |
|
2199 | |||
2200 | changeset: 1:b608e9d1a3f0 |
|
2200 | changeset: 1:b608e9d1a3f0 | |
2201 | bisect: good |
|
2201 | bisect: good | |
2202 | user: A. N. Other <other@place> |
|
2202 | user: A. N. Other <other@place> | |
2203 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2203 | date: Tue Jan 13 17:33:20 1970 +0000 | |
2204 | summary: other 1 |
|
2204 | summary: other 1 | |
2205 |
|
2205 | |||
2206 | changeset: 2:97054abb4ab8 |
|
2206 | changeset: 2:97054abb4ab8 | |
2207 | bisect: untested |
|
2207 | bisect: untested | |
2208 | user: other@place |
|
2208 | user: other@place | |
2209 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2209 | date: Wed Jan 14 21:20:00 1970 +0000 | |
2210 | summary: no person |
|
2210 | summary: no person | |
2211 |
|
2211 | |||
2212 | changeset: 3:10e46f2dcbf4 |
|
2212 | changeset: 3:10e46f2dcbf4 | |
2213 | bisect: bad |
|
2213 | bisect: bad | |
2214 | user: person |
|
2214 | user: person | |
2215 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2215 | date: Fri Jan 16 01:06:40 1970 +0000 | |
2216 | summary: no user, no domain |
|
2216 | summary: no user, no domain | |
2217 |
|
2217 | |||
2218 | changeset: 4:bbe44766e73d |
|
2218 | changeset: 4:bbe44766e73d | |
2219 | bisect: bad (implicit) |
|
2219 | bisect: bad (implicit) | |
2220 | branch: foo |
|
2220 | branch: foo | |
2221 | user: person |
|
2221 | user: person | |
2222 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2222 | date: Sat Jan 17 04:53:20 1970 +0000 | |
2223 | summary: new branch |
|
2223 | summary: new branch | |
2224 |
|
2224 | |||
2225 | $ hg log --debug -T bisect -r 0:4 |
|
2225 | $ hg log --debug -T bisect -r 0:4 | |
2226 | changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2226 | changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f | |
2227 | bisect: good (implicit) |
|
2227 | bisect: good (implicit) | |
2228 | phase: public |
|
2228 | phase: public | |
2229 | parent: -1:0000000000000000000000000000000000000000 |
|
2229 | parent: -1:0000000000000000000000000000000000000000 | |
2230 | parent: -1:0000000000000000000000000000000000000000 |
|
2230 | parent: -1:0000000000000000000000000000000000000000 | |
2231 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
2231 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
2232 | user: User Name <user@hostname> |
|
2232 | user: User Name <user@hostname> | |
2233 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2233 | date: Mon Jan 12 13:46:40 1970 +0000 | |
2234 | files+: a |
|
2234 | files+: a | |
2235 | extra: branch=default |
|
2235 | extra: branch=default | |
2236 | description: |
|
2236 | description: | |
2237 | line 1 |
|
2237 | line 1 | |
2238 | line 2 |
|
2238 | line 2 | |
2239 |
|
2239 | |||
2240 |
|
2240 | |||
2241 | changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2241 | changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
2242 | bisect: good |
|
2242 | bisect: good | |
2243 | phase: public |
|
2243 | phase: public | |
2244 | parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f |
|
2244 | parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f | |
2245 | parent: -1:0000000000000000000000000000000000000000 |
|
2245 | parent: -1:0000000000000000000000000000000000000000 | |
2246 | manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
2246 | manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 | |
2247 | user: A. N. Other <other@place> |
|
2247 | user: A. N. Other <other@place> | |
2248 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2248 | date: Tue Jan 13 17:33:20 1970 +0000 | |
2249 | files+: b |
|
2249 | files+: b | |
2250 | extra: branch=default |
|
2250 | extra: branch=default | |
2251 | description: |
|
2251 | description: | |
2252 | other 1 |
|
2252 | other 1 | |
2253 | other 2 |
|
2253 | other 2 | |
2254 |
|
2254 | |||
2255 | other 3 |
|
2255 | other 3 | |
2256 |
|
2256 | |||
2257 |
|
2257 | |||
2258 | changeset: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2258 | changeset: 2:97054abb4ab824450e9164180baf491ae0078465 | |
2259 | bisect: untested |
|
2259 | bisect: untested | |
2260 | phase: public |
|
2260 | phase: public | |
2261 | parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
2261 | parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
2262 | parent: -1:0000000000000000000000000000000000000000 |
|
2262 | parent: -1:0000000000000000000000000000000000000000 | |
2263 | manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
2263 | manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 | |
2264 | user: other@place |
|
2264 | user: other@place | |
2265 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2265 | date: Wed Jan 14 21:20:00 1970 +0000 | |
2266 | files+: c |
|
2266 | files+: c | |
2267 | extra: branch=default |
|
2267 | extra: branch=default | |
2268 | description: |
|
2268 | description: | |
2269 | no person |
|
2269 | no person | |
2270 |
|
2270 | |||
2271 |
|
2271 | |||
2272 | changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2272 | changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
2273 | bisect: bad |
|
2273 | bisect: bad | |
2274 | phase: public |
|
2274 | phase: public | |
2275 | parent: 2:97054abb4ab824450e9164180baf491ae0078465 |
|
2275 | parent: 2:97054abb4ab824450e9164180baf491ae0078465 | |
2276 | parent: -1:0000000000000000000000000000000000000000 |
|
2276 | parent: -1:0000000000000000000000000000000000000000 | |
2277 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2277 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc | |
2278 | user: person |
|
2278 | user: person | |
2279 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2279 | date: Fri Jan 16 01:06:40 1970 +0000 | |
2280 | files: c |
|
2280 | files: c | |
2281 | extra: branch=default |
|
2281 | extra: branch=default | |
2282 | description: |
|
2282 | description: | |
2283 | no user, no domain |
|
2283 | no user, no domain | |
2284 |
|
2284 | |||
2285 |
|
2285 | |||
2286 | changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 |
|
2286 | changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 | |
2287 | bisect: bad (implicit) |
|
2287 | bisect: bad (implicit) | |
2288 | branch: foo |
|
2288 | branch: foo | |
2289 | phase: draft |
|
2289 | phase: draft | |
2290 | parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
2290 | parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
2291 | parent: -1:0000000000000000000000000000000000000000 |
|
2291 | parent: -1:0000000000000000000000000000000000000000 | |
2292 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
2292 | manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc | |
2293 | user: person |
|
2293 | user: person | |
2294 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2294 | date: Sat Jan 17 04:53:20 1970 +0000 | |
2295 | extra: branch=foo |
|
2295 | extra: branch=foo | |
2296 | description: |
|
2296 | description: | |
2297 | new branch |
|
2297 | new branch | |
2298 |
|
2298 | |||
2299 |
|
2299 | |||
2300 | $ hg log -v -T bisect -r 0:4 |
|
2300 | $ hg log -v -T bisect -r 0:4 | |
2301 | changeset: 0:1e4e1b8f71e0 |
|
2301 | changeset: 0:1e4e1b8f71e0 | |
2302 | bisect: good (implicit) |
|
2302 | bisect: good (implicit) | |
2303 | user: User Name <user@hostname> |
|
2303 | user: User Name <user@hostname> | |
2304 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
2304 | date: Mon Jan 12 13:46:40 1970 +0000 | |
2305 | files: a |
|
2305 | files: a | |
2306 | description: |
|
2306 | description: | |
2307 | line 1 |
|
2307 | line 1 | |
2308 | line 2 |
|
2308 | line 2 | |
2309 |
|
2309 | |||
2310 |
|
2310 | |||
2311 | changeset: 1:b608e9d1a3f0 |
|
2311 | changeset: 1:b608e9d1a3f0 | |
2312 | bisect: good |
|
2312 | bisect: good | |
2313 | user: A. N. Other <other@place> |
|
2313 | user: A. N. Other <other@place> | |
2314 | date: Tue Jan 13 17:33:20 1970 +0000 |
|
2314 | date: Tue Jan 13 17:33:20 1970 +0000 | |
2315 | files: b |
|
2315 | files: b | |
2316 | description: |
|
2316 | description: | |
2317 | other 1 |
|
2317 | other 1 | |
2318 | other 2 |
|
2318 | other 2 | |
2319 |
|
2319 | |||
2320 | other 3 |
|
2320 | other 3 | |
2321 |
|
2321 | |||
2322 |
|
2322 | |||
2323 | changeset: 2:97054abb4ab8 |
|
2323 | changeset: 2:97054abb4ab8 | |
2324 | bisect: untested |
|
2324 | bisect: untested | |
2325 | user: other@place |
|
2325 | user: other@place | |
2326 | date: Wed Jan 14 21:20:00 1970 +0000 |
|
2326 | date: Wed Jan 14 21:20:00 1970 +0000 | |
2327 | files: c |
|
2327 | files: c | |
2328 | description: |
|
2328 | description: | |
2329 | no person |
|
2329 | no person | |
2330 |
|
2330 | |||
2331 |
|
2331 | |||
2332 | changeset: 3:10e46f2dcbf4 |
|
2332 | changeset: 3:10e46f2dcbf4 | |
2333 | bisect: bad |
|
2333 | bisect: bad | |
2334 | user: person |
|
2334 | user: person | |
2335 | date: Fri Jan 16 01:06:40 1970 +0000 |
|
2335 | date: Fri Jan 16 01:06:40 1970 +0000 | |
2336 | files: c |
|
2336 | files: c | |
2337 | description: |
|
2337 | description: | |
2338 | no user, no domain |
|
2338 | no user, no domain | |
2339 |
|
2339 | |||
2340 |
|
2340 | |||
2341 | changeset: 4:bbe44766e73d |
|
2341 | changeset: 4:bbe44766e73d | |
2342 | bisect: bad (implicit) |
|
2342 | bisect: bad (implicit) | |
2343 | branch: foo |
|
2343 | branch: foo | |
2344 | user: person |
|
2344 | user: person | |
2345 | date: Sat Jan 17 04:53:20 1970 +0000 |
|
2345 | date: Sat Jan 17 04:53:20 1970 +0000 | |
2346 | description: |
|
2346 | description: | |
2347 | new branch |
|
2347 | new branch | |
2348 |
|
2348 | |||
2349 |
|
2349 | |||
2350 | $ hg --color=debug log -T bisect -r 0:4 |
|
2350 | $ hg --color=debug log -T bisect -r 0:4 | |
2351 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2351 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] | |
2352 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2352 | [log.bisect bisect.good|bisect: good (implicit)] | |
2353 | [log.user|user: User Name <user@hostname>] |
|
2353 | [log.user|user: User Name <user@hostname>] | |
2354 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2354 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] | |
2355 | [log.summary|summary: line 1] |
|
2355 | [log.summary|summary: line 1] | |
2356 |
|
2356 | |||
2357 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2357 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] | |
2358 | [log.bisect bisect.good|bisect: good] |
|
2358 | [log.bisect bisect.good|bisect: good] | |
2359 | [log.user|user: A. N. Other <other@place>] |
|
2359 | [log.user|user: A. N. Other <other@place>] | |
2360 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2360 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] | |
2361 | [log.summary|summary: other 1] |
|
2361 | [log.summary|summary: other 1] | |
2362 |
|
2362 | |||
2363 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2363 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] | |
2364 | [log.bisect bisect.untested|bisect: untested] |
|
2364 | [log.bisect bisect.untested|bisect: untested] | |
2365 | [log.user|user: other@place] |
|
2365 | [log.user|user: other@place] | |
2366 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2366 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] | |
2367 | [log.summary|summary: no person] |
|
2367 | [log.summary|summary: no person] | |
2368 |
|
2368 | |||
2369 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2369 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] | |
2370 | [log.bisect bisect.bad|bisect: bad] |
|
2370 | [log.bisect bisect.bad|bisect: bad] | |
2371 | [log.user|user: person] |
|
2371 | [log.user|user: person] | |
2372 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2372 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] | |
2373 | [log.summary|summary: no user, no domain] |
|
2373 | [log.summary|summary: no user, no domain] | |
2374 |
|
2374 | |||
2375 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2375 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] | |
2376 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2376 | [log.bisect bisect.bad|bisect: bad (implicit)] | |
2377 | [log.branch|branch: foo] |
|
2377 | [log.branch|branch: foo] | |
2378 | [log.user|user: person] |
|
2378 | [log.user|user: person] | |
2379 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2379 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] | |
2380 | [log.summary|summary: new branch] |
|
2380 | [log.summary|summary: new branch] | |
2381 |
|
2381 | |||
2382 | $ hg --color=debug log --debug -T bisect -r 0:4 |
|
2382 | $ hg --color=debug log --debug -T bisect -r 0:4 | |
2383 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2383 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] | |
2384 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2384 | [log.bisect bisect.good|bisect: good (implicit)] | |
2385 | [log.phase|phase: public] |
|
2385 | [log.phase|phase: public] | |
2386 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2386 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2387 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2387 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2388 | [ui.debug log.manifest|manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0] |
|
2388 | [ui.debug log.manifest|manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0] | |
2389 | [log.user|user: User Name <user@hostname>] |
|
2389 | [log.user|user: User Name <user@hostname>] | |
2390 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2390 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] | |
2391 | [ui.debug log.files|files+: a] |
|
2391 | [ui.debug log.files|files+: a] | |
2392 | [ui.debug log.extra|extra: branch=default] |
|
2392 | [ui.debug log.extra|extra: branch=default] | |
2393 | [ui.note log.description|description:] |
|
2393 | [ui.note log.description|description:] | |
2394 | [ui.note log.description|line 1 |
|
2394 | [ui.note log.description|line 1 | |
2395 | line 2] |
|
2395 | line 2] | |
2396 |
|
2396 | |||
2397 |
|
2397 | |||
2398 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2398 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] | |
2399 | [log.bisect bisect.good|bisect: good] |
|
2399 | [log.bisect bisect.good|bisect: good] | |
2400 | [log.phase|phase: public] |
|
2400 | [log.phase|phase: public] | |
2401 | [log.parent changeset.public|parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] |
|
2401 | [log.parent changeset.public|parent: 0:1e4e1b8f71e05681d422154f5421e385fec3454f] | |
2402 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2402 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2403 | [ui.debug log.manifest|manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55] |
|
2403 | [ui.debug log.manifest|manifest: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55] | |
2404 | [log.user|user: A. N. Other <other@place>] |
|
2404 | [log.user|user: A. N. Other <other@place>] | |
2405 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2405 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] | |
2406 | [ui.debug log.files|files+: b] |
|
2406 | [ui.debug log.files|files+: b] | |
2407 | [ui.debug log.extra|extra: branch=default] |
|
2407 | [ui.debug log.extra|extra: branch=default] | |
2408 | [ui.note log.description|description:] |
|
2408 | [ui.note log.description|description:] | |
2409 | [ui.note log.description|other 1 |
|
2409 | [ui.note log.description|other 1 | |
2410 | other 2 |
|
2410 | other 2 | |
2411 |
|
2411 | |||
2412 | other 3] |
|
2412 | other 3] | |
2413 |
|
2413 | |||
2414 |
|
2414 | |||
2415 | [log.changeset changeset.public|changeset: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2415 | [log.changeset changeset.public|changeset: 2:97054abb4ab824450e9164180baf491ae0078465] | |
2416 | [log.bisect bisect.untested|bisect: untested] |
|
2416 | [log.bisect bisect.untested|bisect: untested] | |
2417 | [log.phase|phase: public] |
|
2417 | [log.phase|phase: public] | |
2418 | [log.parent changeset.public|parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] |
|
2418 | [log.parent changeset.public|parent: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965] | |
2419 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2419 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2420 | [ui.debug log.manifest|manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1] |
|
2420 | [ui.debug log.manifest|manifest: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1] | |
2421 | [log.user|user: other@place] |
|
2421 | [log.user|user: other@place] | |
2422 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2422 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] | |
2423 | [ui.debug log.files|files+: c] |
|
2423 | [ui.debug log.files|files+: c] | |
2424 | [ui.debug log.extra|extra: branch=default] |
|
2424 | [ui.debug log.extra|extra: branch=default] | |
2425 | [ui.note log.description|description:] |
|
2425 | [ui.note log.description|description:] | |
2426 | [ui.note log.description|no person] |
|
2426 | [ui.note log.description|no person] | |
2427 |
|
2427 | |||
2428 |
|
2428 | |||
2429 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2429 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] | |
2430 | [log.bisect bisect.bad|bisect: bad] |
|
2430 | [log.bisect bisect.bad|bisect: bad] | |
2431 | [log.phase|phase: public] |
|
2431 | [log.phase|phase: public] | |
2432 | [log.parent changeset.public|parent: 2:97054abb4ab824450e9164180baf491ae0078465] |
|
2432 | [log.parent changeset.public|parent: 2:97054abb4ab824450e9164180baf491ae0078465] | |
2433 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2433 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2434 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2434 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] | |
2435 | [log.user|user: person] |
|
2435 | [log.user|user: person] | |
2436 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2436 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] | |
2437 | [ui.debug log.files|files: c] |
|
2437 | [ui.debug log.files|files: c] | |
2438 | [ui.debug log.extra|extra: branch=default] |
|
2438 | [ui.debug log.extra|extra: branch=default] | |
2439 | [ui.note log.description|description:] |
|
2439 | [ui.note log.description|description:] | |
2440 | [ui.note log.description|no user, no domain] |
|
2440 | [ui.note log.description|no user, no domain] | |
2441 |
|
2441 | |||
2442 |
|
2442 | |||
2443 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74] |
|
2443 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74] | |
2444 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2444 | [log.bisect bisect.bad|bisect: bad (implicit)] | |
2445 | [log.branch|branch: foo] |
|
2445 | [log.branch|branch: foo] | |
2446 | [log.phase|phase: draft] |
|
2446 | [log.phase|phase: draft] | |
2447 | [log.parent changeset.public|parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] |
|
2447 | [log.parent changeset.public|parent: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47] | |
2448 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] |
|
2448 | [log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000] | |
2449 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] |
|
2449 | [ui.debug log.manifest|manifest: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc] | |
2450 | [log.user|user: person] |
|
2450 | [log.user|user: person] | |
2451 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2451 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] | |
2452 | [ui.debug log.extra|extra: branch=foo] |
|
2452 | [ui.debug log.extra|extra: branch=foo] | |
2453 | [ui.note log.description|description:] |
|
2453 | [ui.note log.description|description:] | |
2454 | [ui.note log.description|new branch] |
|
2454 | [ui.note log.description|new branch] | |
2455 |
|
2455 | |||
2456 |
|
2456 | |||
2457 | $ hg --color=debug log -v -T bisect -r 0:4 |
|
2457 | $ hg --color=debug log -v -T bisect -r 0:4 | |
2458 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] |
|
2458 | [log.changeset changeset.public|changeset: 0:1e4e1b8f71e0] | |
2459 | [log.bisect bisect.good|bisect: good (implicit)] |
|
2459 | [log.bisect bisect.good|bisect: good (implicit)] | |
2460 | [log.user|user: User Name <user@hostname>] |
|
2460 | [log.user|user: User Name <user@hostname>] | |
2461 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] |
|
2461 | [log.date|date: Mon Jan 12 13:46:40 1970 +0000] | |
2462 | [ui.note log.files|files: a] |
|
2462 | [ui.note log.files|files: a] | |
2463 | [ui.note log.description|description:] |
|
2463 | [ui.note log.description|description:] | |
2464 | [ui.note log.description|line 1 |
|
2464 | [ui.note log.description|line 1 | |
2465 | line 2] |
|
2465 | line 2] | |
2466 |
|
2466 | |||
2467 |
|
2467 | |||
2468 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] |
|
2468 | [log.changeset changeset.public|changeset: 1:b608e9d1a3f0] | |
2469 | [log.bisect bisect.good|bisect: good] |
|
2469 | [log.bisect bisect.good|bisect: good] | |
2470 | [log.user|user: A. N. Other <other@place>] |
|
2470 | [log.user|user: A. N. Other <other@place>] | |
2471 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] |
|
2471 | [log.date|date: Tue Jan 13 17:33:20 1970 +0000] | |
2472 | [ui.note log.files|files: b] |
|
2472 | [ui.note log.files|files: b] | |
2473 | [ui.note log.description|description:] |
|
2473 | [ui.note log.description|description:] | |
2474 | [ui.note log.description|other 1 |
|
2474 | [ui.note log.description|other 1 | |
2475 | other 2 |
|
2475 | other 2 | |
2476 |
|
2476 | |||
2477 | other 3] |
|
2477 | other 3] | |
2478 |
|
2478 | |||
2479 |
|
2479 | |||
2480 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] |
|
2480 | [log.changeset changeset.public|changeset: 2:97054abb4ab8] | |
2481 | [log.bisect bisect.untested|bisect: untested] |
|
2481 | [log.bisect bisect.untested|bisect: untested] | |
2482 | [log.user|user: other@place] |
|
2482 | [log.user|user: other@place] | |
2483 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] |
|
2483 | [log.date|date: Wed Jan 14 21:20:00 1970 +0000] | |
2484 | [ui.note log.files|files: c] |
|
2484 | [ui.note log.files|files: c] | |
2485 | [ui.note log.description|description:] |
|
2485 | [ui.note log.description|description:] | |
2486 | [ui.note log.description|no person] |
|
2486 | [ui.note log.description|no person] | |
2487 |
|
2487 | |||
2488 |
|
2488 | |||
2489 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] |
|
2489 | [log.changeset changeset.public|changeset: 3:10e46f2dcbf4] | |
2490 | [log.bisect bisect.bad|bisect: bad] |
|
2490 | [log.bisect bisect.bad|bisect: bad] | |
2491 | [log.user|user: person] |
|
2491 | [log.user|user: person] | |
2492 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] |
|
2492 | [log.date|date: Fri Jan 16 01:06:40 1970 +0000] | |
2493 | [ui.note log.files|files: c] |
|
2493 | [ui.note log.files|files: c] | |
2494 | [ui.note log.description|description:] |
|
2494 | [ui.note log.description|description:] | |
2495 | [ui.note log.description|no user, no domain] |
|
2495 | [ui.note log.description|no user, no domain] | |
2496 |
|
2496 | |||
2497 |
|
2497 | |||
2498 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] |
|
2498 | [log.changeset changeset.draft|changeset: 4:bbe44766e73d] | |
2499 | [log.bisect bisect.bad|bisect: bad (implicit)] |
|
2499 | [log.bisect bisect.bad|bisect: bad (implicit)] | |
2500 | [log.branch|branch: foo] |
|
2500 | [log.branch|branch: foo] | |
2501 | [log.user|user: person] |
|
2501 | [log.user|user: person] | |
2502 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] |
|
2502 | [log.date|date: Sat Jan 17 04:53:20 1970 +0000] | |
2503 | [ui.note log.description|description:] |
|
2503 | [ui.note log.description|description:] | |
2504 | [ui.note log.description|new branch] |
|
2504 | [ui.note log.description|new branch] | |
2505 |
|
2505 | |||
2506 |
|
2506 | |||
2507 | $ hg bisect --reset |
|
2507 | $ hg bisect --reset | |
2508 |
|
2508 | |||
2509 | Error on syntax: |
|
2509 | Error on syntax: | |
2510 |
|
2510 | |||
2511 | $ echo 'x = "f' >> t |
|
2511 | $ echo 'x = "f' >> t | |
2512 | $ hg log |
|
2512 | $ hg log | |
2513 | hg: parse error at t:3: unmatched quotes |
|
2513 | hg: parse error at t:3: unmatched quotes | |
2514 | [255] |
|
2514 | [255] | |
2515 |
|
2515 | |||
2516 | $ hg log -T '{date' |
|
2516 | $ hg log -T '{date' | |
2517 | hg: parse error at 1: unterminated template expansion |
|
2517 | hg: parse error at 1: unterminated template expansion | |
2518 | [255] |
|
2518 | [255] | |
2519 |
|
2519 | |||
2520 | Behind the scenes, this will throw TypeError |
|
2520 | Behind the scenes, this will throw TypeError | |
2521 |
|
2521 | |||
2522 | $ hg log -l 3 --template '{date|obfuscate}\n' |
|
2522 | $ hg log -l 3 --template '{date|obfuscate}\n' | |
2523 | abort: template filter 'obfuscate' is not compatible with keyword 'date' |
|
2523 | abort: template filter 'obfuscate' is not compatible with keyword 'date' | |
2524 | [255] |
|
2524 | [255] | |
2525 |
|
2525 | |||
2526 | Behind the scenes, this will throw a ValueError |
|
2526 | Behind the scenes, this will throw a ValueError | |
2527 |
|
2527 | |||
2528 | $ hg log -l 3 --template 'line: {desc|shortdate}\n' |
|
2528 | $ hg log -l 3 --template 'line: {desc|shortdate}\n' | |
2529 | abort: template filter 'shortdate' is not compatible with keyword 'desc' |
|
2529 | abort: template filter 'shortdate' is not compatible with keyword 'desc' | |
2530 | [255] |
|
2530 | [255] | |
2531 |
|
2531 | |||
2532 | Behind the scenes, this will throw AttributeError |
|
2532 | Behind the scenes, this will throw AttributeError | |
2533 |
|
2533 | |||
2534 | $ hg log -l 3 --template 'line: {date|escape}\n' |
|
2534 | $ hg log -l 3 --template 'line: {date|escape}\n' | |
2535 | abort: template filter 'escape' is not compatible with keyword 'date' |
|
2535 | abort: template filter 'escape' is not compatible with keyword 'date' | |
2536 | [255] |
|
2536 | [255] | |
2537 |
|
2537 | |||
2538 | $ hg log -l 3 --template 'line: {extras|localdate}\n' |
|
2538 | $ hg log -l 3 --template 'line: {extras|localdate}\n' | |
2539 | hg: parse error: localdate expects a date information |
|
2539 | hg: parse error: localdate expects a date information | |
2540 | [255] |
|
2540 | [255] | |
2541 |
|
2541 | |||
2542 | Behind the scenes, this will throw ValueError |
|
2542 | Behind the scenes, this will throw ValueError | |
2543 |
|
2543 | |||
2544 | $ hg tip --template '{author|email|date}\n' |
|
2544 | $ hg tip --template '{author|email|date}\n' | |
2545 | hg: parse error: date expects a date information |
|
2545 | hg: parse error: date expects a date information | |
2546 | [255] |
|
2546 | [255] | |
2547 |
|
2547 | |||
2548 | Error in nested template: |
|
2548 | Error in nested template: | |
2549 |
|
2549 | |||
2550 | $ hg log -T '{"date' |
|
2550 | $ hg log -T '{"date' | |
2551 | hg: parse error at 2: unterminated string |
|
2551 | hg: parse error at 2: unterminated string | |
2552 | [255] |
|
2552 | [255] | |
2553 |
|
2553 | |||
2554 | $ hg log -T '{"foo{date|=}"}' |
|
2554 | $ hg log -T '{"foo{date|=}"}' | |
2555 | hg: parse error at 11: syntax error |
|
2555 | hg: parse error at 11: syntax error | |
2556 | [255] |
|
2556 | [255] | |
2557 |
|
2557 | |||
2558 | Thrown an error if a template function doesn't exist |
|
2558 | Thrown an error if a template function doesn't exist | |
2559 |
|
2559 | |||
2560 | $ hg tip --template '{foo()}\n' |
|
2560 | $ hg tip --template '{foo()}\n' | |
2561 | hg: parse error: unknown function 'foo' |
|
2561 | hg: parse error: unknown function 'foo' | |
2562 | [255] |
|
2562 | [255] | |
2563 |
|
2563 | |||
2564 | Pass generator object created by template function to filter |
|
2564 | Pass generator object created by template function to filter | |
2565 |
|
2565 | |||
2566 | $ hg log -l 1 --template '{if(author, author)|user}\n' |
|
2566 | $ hg log -l 1 --template '{if(author, author)|user}\n' | |
2567 | test |
|
2567 | test | |
2568 |
|
2568 | |||
2569 | Test diff function: |
|
2569 | Test diff function: | |
2570 |
|
2570 | |||
2571 | $ hg diff -c 8 |
|
2571 | $ hg diff -c 8 | |
2572 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2572 | diff -r 29114dbae42b -r 95c24699272e fourth | |
2573 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2573 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2574 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2574 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 | |
2575 | @@ -0,0 +1,1 @@ |
|
2575 | @@ -0,0 +1,1 @@ | |
2576 | +second |
|
2576 | +second | |
2577 | diff -r 29114dbae42b -r 95c24699272e second |
|
2577 | diff -r 29114dbae42b -r 95c24699272e second | |
2578 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2578 | --- a/second Mon Jan 12 13:46:40 1970 +0000 | |
2579 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2579 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2580 | @@ -1,1 +0,0 @@ |
|
2580 | @@ -1,1 +0,0 @@ | |
2581 | -second |
|
2581 | -second | |
2582 | diff -r 29114dbae42b -r 95c24699272e third |
|
2582 | diff -r 29114dbae42b -r 95c24699272e third | |
2583 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2583 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2584 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2584 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 | |
2585 | @@ -0,0 +1,1 @@ |
|
2585 | @@ -0,0 +1,1 @@ | |
2586 | +third |
|
2586 | +third | |
2587 |
|
2587 | |||
2588 | $ hg log -r 8 -T "{diff()}" |
|
2588 | $ hg log -r 8 -T "{diff()}" | |
2589 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2589 | diff -r 29114dbae42b -r 95c24699272e fourth | |
2590 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2590 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2591 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2591 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 | |
2592 | @@ -0,0 +1,1 @@ |
|
2592 | @@ -0,0 +1,1 @@ | |
2593 | +second |
|
2593 | +second | |
2594 | diff -r 29114dbae42b -r 95c24699272e second |
|
2594 | diff -r 29114dbae42b -r 95c24699272e second | |
2595 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2595 | --- a/second Mon Jan 12 13:46:40 1970 +0000 | |
2596 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2596 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2597 | @@ -1,1 +0,0 @@ |
|
2597 | @@ -1,1 +0,0 @@ | |
2598 | -second |
|
2598 | -second | |
2599 | diff -r 29114dbae42b -r 95c24699272e third |
|
2599 | diff -r 29114dbae42b -r 95c24699272e third | |
2600 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2600 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2601 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2601 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 | |
2602 | @@ -0,0 +1,1 @@ |
|
2602 | @@ -0,0 +1,1 @@ | |
2603 | +third |
|
2603 | +third | |
2604 |
|
2604 | |||
2605 | $ hg log -r 8 -T "{diff('glob:f*')}" |
|
2605 | $ hg log -r 8 -T "{diff('glob:f*')}" | |
2606 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2606 | diff -r 29114dbae42b -r 95c24699272e fourth | |
2607 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2607 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2608 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2608 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 | |
2609 | @@ -0,0 +1,1 @@ |
|
2609 | @@ -0,0 +1,1 @@ | |
2610 | +second |
|
2610 | +second | |
2611 |
|
2611 | |||
2612 | $ hg log -r 8 -T "{diff('', 'glob:f*')}" |
|
2612 | $ hg log -r 8 -T "{diff('', 'glob:f*')}" | |
2613 | diff -r 29114dbae42b -r 95c24699272e second |
|
2613 | diff -r 29114dbae42b -r 95c24699272e second | |
2614 | --- a/second Mon Jan 12 13:46:40 1970 +0000 |
|
2614 | --- a/second Mon Jan 12 13:46:40 1970 +0000 | |
2615 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2615 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2616 | @@ -1,1 +0,0 @@ |
|
2616 | @@ -1,1 +0,0 @@ | |
2617 | -second |
|
2617 | -second | |
2618 | diff -r 29114dbae42b -r 95c24699272e third |
|
2618 | diff -r 29114dbae42b -r 95c24699272e third | |
2619 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2619 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2620 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 |
|
2620 | +++ b/third Wed Jan 01 10:01:00 2020 +0000 | |
2621 | @@ -0,0 +1,1 @@ |
|
2621 | @@ -0,0 +1,1 @@ | |
2622 | +third |
|
2622 | +third | |
2623 |
|
2623 | |||
2624 | $ hg log -r 8 -T "{diff('FOURTH'|lower)}" |
|
2624 | $ hg log -r 8 -T "{diff('FOURTH'|lower)}" | |
2625 | diff -r 29114dbae42b -r 95c24699272e fourth |
|
2625 | diff -r 29114dbae42b -r 95c24699272e fourth | |
2626 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2626 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
2627 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 |
|
2627 | +++ b/fourth Wed Jan 01 10:01:00 2020 +0000 | |
2628 | @@ -0,0 +1,1 @@ |
|
2628 | @@ -0,0 +1,1 @@ | |
2629 | +second |
|
2629 | +second | |
2630 |
|
2630 | |||
2631 | $ cd .. |
|
2631 | $ cd .. | |
2632 |
|
2632 | |||
2633 |
|
2633 | |||
2634 | latesttag: |
|
2634 | latesttag: | |
2635 |
|
2635 | |||
2636 | $ hg init latesttag |
|
2636 | $ hg init latesttag | |
2637 | $ cd latesttag |
|
2637 | $ cd latesttag | |
2638 |
|
2638 | |||
2639 | $ echo a > file |
|
2639 | $ echo a > file | |
2640 | $ hg ci -Am a -d '0 0' |
|
2640 | $ hg ci -Am a -d '0 0' | |
2641 | adding file |
|
2641 | adding file | |
2642 |
|
2642 | |||
2643 | $ echo b >> file |
|
2643 | $ echo b >> file | |
2644 | $ hg ci -m b -d '1 0' |
|
2644 | $ hg ci -m b -d '1 0' | |
2645 |
|
2645 | |||
2646 | $ echo c >> head1 |
|
2646 | $ echo c >> head1 | |
2647 | $ hg ci -Am h1c -d '2 0' |
|
2647 | $ hg ci -Am h1c -d '2 0' | |
2648 | adding head1 |
|
2648 | adding head1 | |
2649 |
|
2649 | |||
2650 | $ hg update -q 1 |
|
2650 | $ hg update -q 1 | |
2651 | $ echo d >> head2 |
|
2651 | $ echo d >> head2 | |
2652 | $ hg ci -Am h2d -d '3 0' |
|
2652 | $ hg ci -Am h2d -d '3 0' | |
2653 | adding head2 |
|
2653 | adding head2 | |
2654 | created new head |
|
2654 | created new head | |
2655 |
|
2655 | |||
2656 | $ echo e >> head2 |
|
2656 | $ echo e >> head2 | |
2657 | $ hg ci -m h2e -d '4 0' |
|
2657 | $ hg ci -m h2e -d '4 0' | |
2658 |
|
2658 | |||
2659 | $ hg merge -q |
|
2659 | $ hg merge -q | |
2660 | $ hg ci -m merge -d '5 -3600' |
|
2660 | $ hg ci -m merge -d '5 -3600' | |
2661 |
|
2661 | |||
2662 | No tag set: |
|
2662 | No tag set: | |
2663 |
|
2663 | |||
2664 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2664 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' | |
2665 | 5: null+5 |
|
2665 | 5: null+5 | |
2666 | 4: null+4 |
|
2666 | 4: null+4 | |
2667 | 3: null+3 |
|
2667 | 3: null+3 | |
2668 | 2: null+3 |
|
2668 | 2: null+3 | |
2669 | 1: null+2 |
|
2669 | 1: null+2 | |
2670 | 0: null+1 |
|
2670 | 0: null+1 | |
2671 |
|
2671 | |||
2672 | One common tag: longest path wins: |
|
2672 | One common tag: longest path wins: | |
2673 |
|
2673 | |||
2674 | $ hg tag -r 1 -m t1 -d '6 0' t1 |
|
2674 | $ hg tag -r 1 -m t1 -d '6 0' t1 | |
2675 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2675 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' | |
2676 | 6: t1+4 |
|
2676 | 6: t1+4 | |
2677 | 5: t1+3 |
|
2677 | 5: t1+3 | |
2678 | 4: t1+2 |
|
2678 | 4: t1+2 | |
2679 | 3: t1+1 |
|
2679 | 3: t1+1 | |
2680 | 2: t1+1 |
|
2680 | 2: t1+1 | |
2681 | 1: t1+0 |
|
2681 | 1: t1+0 | |
2682 | 0: null+1 |
|
2682 | 0: null+1 | |
2683 |
|
2683 | |||
2684 | One ancestor tag: more recent wins: |
|
2684 | One ancestor tag: more recent wins: | |
2685 |
|
2685 | |||
2686 | $ hg tag -r 2 -m t2 -d '7 0' t2 |
|
2686 | $ hg tag -r 2 -m t2 -d '7 0' t2 | |
2687 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2687 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' | |
2688 | 7: t2+3 |
|
2688 | 7: t2+3 | |
2689 | 6: t2+2 |
|
2689 | 6: t2+2 | |
2690 | 5: t2+1 |
|
2690 | 5: t2+1 | |
2691 | 4: t1+2 |
|
2691 | 4: t1+2 | |
2692 | 3: t1+1 |
|
2692 | 3: t1+1 | |
2693 | 2: t2+0 |
|
2693 | 2: t2+0 | |
2694 | 1: t1+0 |
|
2694 | 1: t1+0 | |
2695 | 0: null+1 |
|
2695 | 0: null+1 | |
2696 |
|
2696 | |||
2697 | Two branch tags: more recent wins: |
|
2697 | Two branch tags: more recent wins: | |
2698 |
|
2698 | |||
2699 | $ hg tag -r 3 -m t3 -d '8 0' t3 |
|
2699 | $ hg tag -r 3 -m t3 -d '8 0' t3 | |
2700 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2700 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' | |
2701 | 8: t3+5 |
|
2701 | 8: t3+5 | |
2702 | 7: t3+4 |
|
2702 | 7: t3+4 | |
2703 | 6: t3+3 |
|
2703 | 6: t3+3 | |
2704 | 5: t3+2 |
|
2704 | 5: t3+2 | |
2705 | 4: t3+1 |
|
2705 | 4: t3+1 | |
2706 | 3: t3+0 |
|
2706 | 3: t3+0 | |
2707 | 2: t2+0 |
|
2707 | 2: t2+0 | |
2708 | 1: t1+0 |
|
2708 | 1: t1+0 | |
2709 | 0: null+1 |
|
2709 | 0: null+1 | |
2710 |
|
2710 | |||
2711 | Merged tag overrides: |
|
2711 | Merged tag overrides: | |
2712 |
|
2712 | |||
2713 | $ hg tag -r 5 -m t5 -d '9 0' t5 |
|
2713 | $ hg tag -r 5 -m t5 -d '9 0' t5 | |
2714 | $ hg tag -r 3 -m at3 -d '10 0' at3 |
|
2714 | $ hg tag -r 3 -m at3 -d '10 0' at3 | |
2715 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
2715 | $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' | |
2716 | 10: t5+5 |
|
2716 | 10: t5+5 | |
2717 | 9: t5+4 |
|
2717 | 9: t5+4 | |
2718 | 8: t5+3 |
|
2718 | 8: t5+3 | |
2719 | 7: t5+2 |
|
2719 | 7: t5+2 | |
2720 | 6: t5+1 |
|
2720 | 6: t5+1 | |
2721 | 5: t5+0 |
|
2721 | 5: t5+0 | |
2722 | 4: at3:t3+1 |
|
2722 | 4: at3:t3+1 | |
2723 | 3: at3:t3+0 |
|
2723 | 3: at3:t3+0 | |
2724 | 2: t2+0 |
|
2724 | 2: t2+0 | |
2725 | 1: t1+0 |
|
2725 | 1: t1+0 | |
2726 | 0: null+1 |
|
2726 | 0: null+1 | |
2727 |
|
2727 | |||
2728 | $ hg log --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
|
2728 | $ hg log --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" | |
2729 | 10: t5+5,5 |
|
2729 | 10: t5+5,5 | |
2730 | 9: t5+4,4 |
|
2730 | 9: t5+4,4 | |
2731 | 8: t5+3,3 |
|
2731 | 8: t5+3,3 | |
2732 | 7: t5+2,2 |
|
2732 | 7: t5+2,2 | |
2733 | 6: t5+1,1 |
|
2733 | 6: t5+1,1 | |
2734 | 5: t5+0,0 |
|
2734 | 5: t5+0,0 | |
2735 | 4: at3+1,1 t3+1,1 |
|
2735 | 4: at3+1,1 t3+1,1 | |
2736 | 3: at3+0,0 t3+0,0 |
|
2736 | 3: at3+0,0 t3+0,0 | |
2737 | 2: t2+0,0 |
|
2737 | 2: t2+0,0 | |
2738 | 1: t1+0,0 |
|
2738 | 1: t1+0,0 | |
2739 | 0: null+1,1 |
|
2739 | 0: null+1,1 | |
2740 |
|
2740 | |||
2741 | $ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
|
2741 | $ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" | |
2742 | 10: t3, C: 8, D: 7 |
|
2742 | 10: t3, C: 8, D: 7 | |
2743 | 9: t3, C: 7, D: 6 |
|
2743 | 9: t3, C: 7, D: 6 | |
2744 | 8: t3, C: 6, D: 5 |
|
2744 | 8: t3, C: 6, D: 5 | |
2745 | 7: t3, C: 5, D: 4 |
|
2745 | 7: t3, C: 5, D: 4 | |
2746 | 6: t3, C: 4, D: 3 |
|
2746 | 6: t3, C: 4, D: 3 | |
2747 | 5: t3, C: 3, D: 2 |
|
2747 | 5: t3, C: 3, D: 2 | |
2748 | 4: t3, C: 1, D: 1 |
|
2748 | 4: t3, C: 1, D: 1 | |
2749 | 3: t3, C: 0, D: 0 |
|
2749 | 3: t3, C: 0, D: 0 | |
2750 | 2: t1, C: 1, D: 1 |
|
2750 | 2: t1, C: 1, D: 1 | |
2751 | 1: t1, C: 0, D: 0 |
|
2751 | 1: t1, C: 0, D: 0 | |
2752 | 0: null, C: 1, D: 1 |
|
2752 | 0: null, C: 1, D: 1 | |
2753 |
|
2753 | |||
2754 | $ cd .. |
|
2754 | $ cd .. | |
2755 |
|
2755 | |||
2756 |
|
2756 | |||
2757 | Style path expansion: issue1948 - ui.style option doesn't work on OSX |
|
2757 | Style path expansion: issue1948 - ui.style option doesn't work on OSX | |
2758 | if it is a relative path |
|
2758 | if it is a relative path | |
2759 |
|
2759 | |||
2760 | $ mkdir -p home/styles |
|
2760 | $ mkdir -p home/styles | |
2761 |
|
2761 | |||
2762 | $ cat > home/styles/teststyle <<EOF |
|
2762 | $ cat > home/styles/teststyle <<EOF | |
2763 | > changeset = 'test {rev}:{node|short}\n' |
|
2763 | > changeset = 'test {rev}:{node|short}\n' | |
2764 | > EOF |
|
2764 | > EOF | |
2765 |
|
2765 | |||
2766 | $ HOME=`pwd`/home; export HOME |
|
2766 | $ HOME=`pwd`/home; export HOME | |
2767 |
|
2767 | |||
2768 | $ cat > latesttag/.hg/hgrc <<EOF |
|
2768 | $ cat > latesttag/.hg/hgrc <<EOF | |
2769 | > [ui] |
|
2769 | > [ui] | |
2770 | > style = ~/styles/teststyle |
|
2770 | > style = ~/styles/teststyle | |
2771 | > EOF |
|
2771 | > EOF | |
2772 |
|
2772 | |||
2773 | $ hg -R latesttag tip |
|
2773 | $ hg -R latesttag tip | |
2774 | test 10:9b4a630e5f5f |
|
2774 | test 10:9b4a630e5f5f | |
2775 |
|
2775 | |||
2776 | Test recursive showlist template (issue1989): |
|
2776 | Test recursive showlist template (issue1989): | |
2777 |
|
2777 | |||
2778 | $ cat > style1989 <<EOF |
|
2778 | $ cat > style1989 <<EOF | |
2779 | > changeset = '{file_mods}{manifest}{extras}' |
|
2779 | > changeset = '{file_mods}{manifest}{extras}' | |
2780 | > file_mod = 'M|{author|person}\n' |
|
2780 | > file_mod = 'M|{author|person}\n' | |
2781 | > manifest = '{rev},{author}\n' |
|
2781 | > manifest = '{rev},{author}\n' | |
2782 | > extra = '{key}: {author}\n' |
|
2782 | > extra = '{key}: {author}\n' | |
2783 | > EOF |
|
2783 | > EOF | |
2784 |
|
2784 | |||
2785 | $ hg -R latesttag log -r tip --style=style1989 |
|
2785 | $ hg -R latesttag log -r tip --style=style1989 | |
2786 | M|test |
|
2786 | M|test | |
2787 | 10,test |
|
2787 | 10,test | |
2788 | branch: test |
|
2788 | branch: test | |
2789 |
|
2789 | |||
2790 | Test new-style inline templating: |
|
2790 | Test new-style inline templating: | |
2791 |
|
2791 | |||
2792 | $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' |
|
2792 | $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' | |
2793 | modified files: .hgtags |
|
2793 | modified files: .hgtags | |
2794 |
|
2794 | |||
2795 |
|
2795 | |||
2796 | $ hg log -R latesttag -r tip -T '{rev % "a"}\n' |
|
2796 | $ hg log -R latesttag -r tip -T '{rev % "a"}\n' | |
2797 | hg: parse error: keyword 'rev' is not iterable |
|
2797 | hg: parse error: keyword 'rev' is not iterable | |
2798 | [255] |
|
2798 | [255] | |
2799 | $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n' |
|
2799 | $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n' | |
2800 | hg: parse error: None is not iterable |
|
2800 | hg: parse error: None is not iterable | |
2801 | [255] |
|
2801 | [255] | |
2802 |
|
2802 | |||
2803 | Test the sub function of templating for expansion: |
|
2803 | Test the sub function of templating for expansion: | |
2804 |
|
2804 | |||
2805 | $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n' |
|
2805 | $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n' | |
2806 | xx |
|
2806 | xx | |
2807 |
|
2807 | |||
2808 | $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n' |
|
2808 | $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n' | |
2809 | hg: parse error: sub got an invalid pattern: [ |
|
2809 | hg: parse error: sub got an invalid pattern: [ | |
2810 | [255] |
|
2810 | [255] | |
2811 | $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n' |
|
2811 | $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n' | |
2812 | hg: parse error: sub got an invalid replacement: \1 |
|
2812 | hg: parse error: sub got an invalid replacement: \1 | |
2813 | [255] |
|
2813 | [255] | |
2814 |
|
2814 | |||
2815 | Test the strip function with chars specified: |
|
2815 | Test the strip function with chars specified: | |
2816 |
|
2816 | |||
2817 | $ hg log -R latesttag --template '{desc}\n' |
|
2817 | $ hg log -R latesttag --template '{desc}\n' | |
2818 | at3 |
|
2818 | at3 | |
2819 | t5 |
|
2819 | t5 | |
2820 | t3 |
|
2820 | t3 | |
2821 | t2 |
|
2821 | t2 | |
2822 | t1 |
|
2822 | t1 | |
2823 | merge |
|
2823 | merge | |
2824 | h2e |
|
2824 | h2e | |
2825 | h2d |
|
2825 | h2d | |
2826 | h1c |
|
2826 | h1c | |
2827 | b |
|
2827 | b | |
2828 | a |
|
2828 | a | |
2829 |
|
2829 | |||
2830 | $ hg log -R latesttag --template '{strip(desc, "te")}\n' |
|
2830 | $ hg log -R latesttag --template '{strip(desc, "te")}\n' | |
2831 | at3 |
|
2831 | at3 | |
2832 | 5 |
|
2832 | 5 | |
2833 | 3 |
|
2833 | 3 | |
2834 | 2 |
|
2834 | 2 | |
2835 | 1 |
|
2835 | 1 | |
2836 | merg |
|
2836 | merg | |
2837 | h2 |
|
2837 | h2 | |
2838 | h2d |
|
2838 | h2d | |
2839 | h1c |
|
2839 | h1c | |
2840 | b |
|
2840 | b | |
2841 | a |
|
2841 | a | |
2842 |
|
2842 | |||
2843 | Test date format: |
|
2843 | Test date format: | |
2844 |
|
2844 | |||
2845 | $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' |
|
2845 | $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' | |
2846 | date: 70 01 01 10 +0000 |
|
2846 | date: 70 01 01 10 +0000 | |
2847 | date: 70 01 01 09 +0000 |
|
2847 | date: 70 01 01 09 +0000 | |
2848 | date: 70 01 01 08 +0000 |
|
2848 | date: 70 01 01 08 +0000 | |
2849 | date: 70 01 01 07 +0000 |
|
2849 | date: 70 01 01 07 +0000 | |
2850 | date: 70 01 01 06 +0000 |
|
2850 | date: 70 01 01 06 +0000 | |
2851 | date: 70 01 01 05 +0100 |
|
2851 | date: 70 01 01 05 +0100 | |
2852 | date: 70 01 01 04 +0000 |
|
2852 | date: 70 01 01 04 +0000 | |
2853 | date: 70 01 01 03 +0000 |
|
2853 | date: 70 01 01 03 +0000 | |
2854 | date: 70 01 01 02 +0000 |
|
2854 | date: 70 01 01 02 +0000 | |
2855 | date: 70 01 01 01 +0000 |
|
2855 | date: 70 01 01 01 +0000 | |
2856 | date: 70 01 01 00 +0000 |
|
2856 | date: 70 01 01 00 +0000 | |
2857 |
|
2857 | |||
2858 | Test invalid date: |
|
2858 | Test invalid date: | |
2859 |
|
2859 | |||
2860 | $ hg log -R latesttag -T '{date(rev)}\n' |
|
2860 | $ hg log -R latesttag -T '{date(rev)}\n' | |
2861 | hg: parse error: date expects a date information |
|
2861 | hg: parse error: date expects a date information | |
2862 | [255] |
|
2862 | [255] | |
2863 |
|
2863 | |||
2864 | Test integer literal: |
|
2864 | Test integer literal: | |
2865 |
|
2865 | |||
2866 | $ hg debugtemplate -v '{(0)}\n' |
|
2866 | $ hg debugtemplate -v '{(0)}\n' | |
2867 | (template |
|
2867 | (template | |
2868 | (group |
|
2868 | (group | |
2869 | ('integer', '0')) |
|
2869 | ('integer', '0')) | |
2870 | ('string', '\n')) |
|
2870 | ('string', '\n')) | |
2871 | 0 |
|
2871 | 0 | |
2872 | $ hg debugtemplate -v '{(123)}\n' |
|
2872 | $ hg debugtemplate -v '{(123)}\n' | |
2873 | (template |
|
2873 | (template | |
2874 | (group |
|
2874 | (group | |
2875 | ('integer', '123')) |
|
2875 | ('integer', '123')) | |
2876 | ('string', '\n')) |
|
2876 | ('string', '\n')) | |
2877 | 123 |
|
2877 | 123 | |
2878 | $ hg debugtemplate -v '{(-4)}\n' |
|
2878 | $ hg debugtemplate -v '{(-4)}\n' | |
2879 | (template |
|
2879 | (template | |
2880 | (group |
|
2880 | (group | |
2881 | ('integer', '-4')) |
|
2881 | ('integer', '-4')) | |
2882 | ('string', '\n')) |
|
2882 | ('string', '\n')) | |
2883 | -4 |
|
2883 | -4 | |
2884 | $ hg debugtemplate '{(-)}\n' |
|
2884 | $ hg debugtemplate '{(-)}\n' | |
2885 | hg: parse error at 2: integer literal without digits |
|
2885 | hg: parse error at 2: integer literal without digits | |
2886 | [255] |
|
2886 | [255] | |
2887 | $ hg debugtemplate '{(-a)}\n' |
|
2887 | $ hg debugtemplate '{(-a)}\n' | |
2888 | hg: parse error at 2: integer literal without digits |
|
2888 | hg: parse error at 2: integer literal without digits | |
2889 | [255] |
|
2889 | [255] | |
2890 |
|
2890 | |||
2891 | top-level integer literal is interpreted as symbol (i.e. variable name): |
|
2891 | top-level integer literal is interpreted as symbol (i.e. variable name): | |
2892 |
|
2892 | |||
2893 | $ hg debugtemplate -D 1=one -v '{1}\n' |
|
2893 | $ hg debugtemplate -D 1=one -v '{1}\n' | |
2894 | (template |
|
2894 | (template | |
2895 | ('integer', '1') |
|
2895 | ('integer', '1') | |
2896 | ('string', '\n')) |
|
2896 | ('string', '\n')) | |
2897 | one |
|
2897 | one | |
2898 | $ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n' |
|
2898 | $ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n' | |
2899 | (template |
|
2899 | (template | |
2900 | (func |
|
2900 | (func | |
2901 | ('symbol', 'if') |
|
2901 | ('symbol', 'if') | |
2902 | (list |
|
2902 | (list | |
2903 | ('string', 't') |
|
2903 | ('string', 't') | |
2904 | (template |
|
2904 | (template | |
2905 | ('integer', '1')))) |
|
2905 | ('integer', '1')))) | |
2906 | ('string', '\n')) |
|
2906 | ('string', '\n')) | |
2907 | one |
|
2907 | one | |
2908 | $ hg debugtemplate -D 1=one -v '{1|stringify}\n' |
|
2908 | $ hg debugtemplate -D 1=one -v '{1|stringify}\n' | |
2909 | (template |
|
2909 | (template | |
2910 | (| |
|
2910 | (| | |
2911 | ('integer', '1') |
|
2911 | ('integer', '1') | |
2912 | ('symbol', 'stringify')) |
|
2912 | ('symbol', 'stringify')) | |
2913 | ('string', '\n')) |
|
2913 | ('string', '\n')) | |
2914 | one |
|
2914 | one | |
2915 |
|
2915 | |||
2916 | unless explicit symbol is expected: |
|
2916 | unless explicit symbol is expected: | |
2917 |
|
2917 | |||
2918 | $ hg log -Ra -r0 -T '{desc|1}\n' |
|
2918 | $ hg log -Ra -r0 -T '{desc|1}\n' | |
2919 | hg: parse error: expected a symbol, got 'integer' |
|
2919 | hg: parse error: expected a symbol, got 'integer' | |
2920 | [255] |
|
2920 | [255] | |
2921 | $ hg log -Ra -r0 -T '{1()}\n' |
|
2921 | $ hg log -Ra -r0 -T '{1()}\n' | |
2922 | hg: parse error: expected a symbol, got 'integer' |
|
2922 | hg: parse error: expected a symbol, got 'integer' | |
2923 | [255] |
|
2923 | [255] | |
2924 |
|
2924 | |||
2925 | Test string literal: |
|
2925 | Test string literal: | |
2926 |
|
2926 | |||
2927 | $ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n' |
|
2927 | $ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n' | |
2928 | (template |
|
2928 | (template | |
2929 | ('string', 'string with no template fragment') |
|
2929 | ('string', 'string with no template fragment') | |
2930 | ('string', '\n')) |
|
2930 | ('string', '\n')) | |
2931 | string with no template fragment |
|
2931 | string with no template fragment | |
2932 | $ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n' |
|
2932 | $ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n' | |
2933 | (template |
|
2933 | (template | |
2934 | (template |
|
2934 | (template | |
2935 | ('string', 'template: ') |
|
2935 | ('string', 'template: ') | |
2936 | ('symbol', 'rev')) |
|
2936 | ('symbol', 'rev')) | |
2937 | ('string', '\n')) |
|
2937 | ('string', '\n')) | |
2938 | template: 0 |
|
2938 | template: 0 | |
2939 | $ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n' |
|
2939 | $ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n' | |
2940 | (template |
|
2940 | (template | |
2941 | ('string', 'rawstring: {rev}') |
|
2941 | ('string', 'rawstring: {rev}') | |
2942 | ('string', '\n')) |
|
2942 | ('string', '\n')) | |
2943 | rawstring: {rev} |
|
2943 | rawstring: {rev} | |
2944 | $ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n' |
|
2944 | $ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n' | |
2945 | (template |
|
2945 | (template | |
2946 | (% |
|
2946 | (% | |
2947 | ('symbol', 'files') |
|
2947 | ('symbol', 'files') | |
2948 | ('string', 'rawstring: {file}')) |
|
2948 | ('string', 'rawstring: {file}')) | |
2949 | ('string', '\n')) |
|
2949 | ('string', '\n')) | |
2950 | rawstring: {file} |
|
2950 | rawstring: {file} | |
2951 |
|
2951 | |||
2952 | Test string escaping: |
|
2952 | Test string escaping: | |
2953 |
|
2953 | |||
2954 | $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2954 | $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' | |
2955 | > |
|
2955 | > | |
2956 | <>\n<[> |
|
2956 | <>\n<[> | |
2957 | <>\n<]> |
|
2957 | <>\n<]> | |
2958 | <>\n< |
|
2958 | <>\n< | |
2959 |
|
2959 | |||
2960 | $ hg log -R latesttag -r 0 \ |
|
2960 | $ hg log -R latesttag -r 0 \ | |
2961 | > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2961 | > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' | |
2962 | > |
|
2962 | > | |
2963 | <>\n<[> |
|
2963 | <>\n<[> | |
2964 | <>\n<]> |
|
2964 | <>\n<]> | |
2965 | <>\n< |
|
2965 | <>\n< | |
2966 |
|
2966 | |||
2967 | $ hg log -R latesttag -r 0 -T esc \ |
|
2967 | $ hg log -R latesttag -r 0 -T esc \ | |
2968 | > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2968 | > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' | |
2969 | > |
|
2969 | > | |
2970 | <>\n<[> |
|
2970 | <>\n<[> | |
2971 | <>\n<]> |
|
2971 | <>\n<]> | |
2972 | <>\n< |
|
2972 | <>\n< | |
2973 |
|
2973 | |||
2974 | $ cat <<'EOF' > esctmpl |
|
2974 | $ cat <<'EOF' > esctmpl | |
2975 | > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' |
|
2975 | > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n' | |
2976 | > EOF |
|
2976 | > EOF | |
2977 | $ hg log -R latesttag -r 0 --style ./esctmpl |
|
2977 | $ hg log -R latesttag -r 0 --style ./esctmpl | |
2978 | > |
|
2978 | > | |
2979 | <>\n<[> |
|
2979 | <>\n<[> | |
2980 | <>\n<]> |
|
2980 | <>\n<]> | |
2981 | <>\n< |
|
2981 | <>\n< | |
2982 |
|
2982 | |||
2983 | Test string escaping of quotes: |
|
2983 | Test string escaping of quotes: | |
2984 |
|
2984 | |||
2985 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
2985 | $ hg log -Ra -r0 -T '{"\""}\n' | |
2986 | " |
|
2986 | " | |
2987 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
2987 | $ hg log -Ra -r0 -T '{"\\\""}\n' | |
2988 | \" |
|
2988 | \" | |
2989 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
2989 | $ hg log -Ra -r0 -T '{r"\""}\n' | |
2990 | \" |
|
2990 | \" | |
2991 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
2991 | $ hg log -Ra -r0 -T '{r"\\\""}\n' | |
2992 | \\\" |
|
2992 | \\\" | |
2993 |
|
2993 | |||
2994 |
|
2994 | |||
2995 | $ hg log -Ra -r0 -T '{"\""}\n' |
|
2995 | $ hg log -Ra -r0 -T '{"\""}\n' | |
2996 | " |
|
2996 | " | |
2997 | $ hg log -Ra -r0 -T '{"\\\""}\n' |
|
2997 | $ hg log -Ra -r0 -T '{"\\\""}\n' | |
2998 | \" |
|
2998 | \" | |
2999 | $ hg log -Ra -r0 -T '{r"\""}\n' |
|
2999 | $ hg log -Ra -r0 -T '{r"\""}\n' | |
3000 | \" |
|
3000 | \" | |
3001 | $ hg log -Ra -r0 -T '{r"\\\""}\n' |
|
3001 | $ hg log -Ra -r0 -T '{r"\\\""}\n' | |
3002 | \\\" |
|
3002 | \\\" | |
3003 |
|
3003 | |||
3004 | Test exception in quoted template. single backslash before quotation mark is |
|
3004 | Test exception in quoted template. single backslash before quotation mark is | |
3005 | stripped before parsing: |
|
3005 | stripped before parsing: | |
3006 |
|
3006 | |||
3007 | $ cat <<'EOF' > escquotetmpl |
|
3007 | $ cat <<'EOF' > escquotetmpl | |
3008 | > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n" |
|
3008 | > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n" | |
3009 | > EOF |
|
3009 | > EOF | |
3010 | $ cd latesttag |
|
3010 | $ cd latesttag | |
3011 | $ hg log -r 2 --style ../escquotetmpl |
|
3011 | $ hg log -r 2 --style ../escquotetmpl | |
3012 | " \" \" \\" head1 |
|
3012 | " \" \" \\" head1 | |
3013 |
|
3013 | |||
3014 | $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"' |
|
3014 | $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"' | |
3015 | valid |
|
3015 | valid | |
3016 | $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'" |
|
3016 | $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'" | |
3017 | valid |
|
3017 | valid | |
3018 |
|
3018 | |||
3019 | Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested |
|
3019 | Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested | |
3020 | _evalifliteral() templates (issue4733): |
|
3020 | _evalifliteral() templates (issue4733): | |
3021 |
|
3021 | |||
3022 | $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n' |
|
3022 | $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n' | |
3023 | "2 |
|
3023 | "2 | |
3024 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n' |
|
3024 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n' | |
3025 | "2 |
|
3025 | "2 | |
3026 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n' |
|
3026 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n' | |
3027 | "2 |
|
3027 | "2 | |
3028 |
|
3028 | |||
3029 | $ hg log -r 2 -T '{if(rev, "\\\"")}\n' |
|
3029 | $ hg log -r 2 -T '{if(rev, "\\\"")}\n' | |
3030 | \" |
|
3030 | \" | |
3031 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n' |
|
3031 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n' | |
3032 | \" |
|
3032 | \" | |
3033 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
3033 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' | |
3034 | \" |
|
3034 | \" | |
3035 |
|
3035 | |||
3036 | $ hg log -r 2 -T '{if(rev, r"\\\"")}\n' |
|
3036 | $ hg log -r 2 -T '{if(rev, r"\\\"")}\n' | |
3037 | \\\" |
|
3037 | \\\" | |
3038 | $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n' |
|
3038 | $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n' | |
3039 | \\\" |
|
3039 | \\\" | |
3040 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' |
|
3040 | $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n' | |
3041 | \\\" |
|
3041 | \\\" | |
3042 |
|
3042 | |||
3043 | escaped single quotes and errors: |
|
3043 | escaped single quotes and errors: | |
3044 |
|
3044 | |||
3045 | $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n' |
|
3045 | $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n' | |
3046 | foo |
|
3046 | foo | |
3047 | $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n' |
|
3047 | $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n' | |
3048 | foo |
|
3048 | foo | |
3049 | $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n' |
|
3049 | $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n' | |
3050 | hg: parse error at 21: unterminated string |
|
3050 | hg: parse error at 21: unterminated string | |
3051 | [255] |
|
3051 | [255] | |
3052 | $ hg log -r 2 -T '{if(rev, \"\\"")}\n' |
|
3052 | $ hg log -r 2 -T '{if(rev, \"\\"")}\n' | |
3053 | hg: parse error: trailing \ in string |
|
3053 | hg: parse error: trailing \ in string | |
3054 | [255] |
|
3054 | [255] | |
3055 | $ hg log -r 2 -T '{if(rev, r\"\\"")}\n' |
|
3055 | $ hg log -r 2 -T '{if(rev, r\"\\"")}\n' | |
3056 | hg: parse error: trailing \ in string |
|
3056 | hg: parse error: trailing \ in string | |
3057 | [255] |
|
3057 | [255] | |
3058 |
|
3058 | |||
3059 | $ cd .. |
|
3059 | $ cd .. | |
3060 |
|
3060 | |||
3061 | Test leading backslashes: |
|
3061 | Test leading backslashes: | |
3062 |
|
3062 | |||
3063 | $ cd latesttag |
|
3063 | $ cd latesttag | |
3064 | $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n' |
|
3064 | $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n' | |
3065 | {rev} {file} |
|
3065 | {rev} {file} | |
3066 | $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n' |
|
3066 | $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n' | |
3067 | \2 \head1 |
|
3067 | \2 \head1 | |
3068 | $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n' |
|
3068 | $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n' | |
3069 | \{rev} \{file} |
|
3069 | \{rev} \{file} | |
3070 | $ cd .. |
|
3070 | $ cd .. | |
3071 |
|
3071 | |||
3072 | Test leading backslashes in "if" expression (issue4714): |
|
3072 | Test leading backslashes in "if" expression (issue4714): | |
3073 |
|
3073 | |||
3074 | $ cd latesttag |
|
3074 | $ cd latesttag | |
3075 | $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n' |
|
3075 | $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n' | |
3076 | {rev} \{rev} |
|
3076 | {rev} \{rev} | |
3077 | $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n' |
|
3077 | $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n' | |
3078 | \2 \\{rev} |
|
3078 | \2 \\{rev} | |
3079 | $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n' |
|
3079 | $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n' | |
3080 | \{rev} \\\{rev} |
|
3080 | \{rev} \\\{rev} | |
3081 | $ cd .. |
|
3081 | $ cd .. | |
3082 |
|
3082 | |||
3083 | "string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice) |
|
3083 | "string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice) | |
3084 |
|
3084 | |||
3085 | $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n' |
|
3085 | $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n' | |
3086 | \x6e |
|
3086 | \x6e | |
3087 | $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n' |
|
3087 | $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n' | |
3088 | \x5c\x786e |
|
3088 | \x5c\x786e | |
3089 | $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n' |
|
3089 | $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n' | |
3090 | \x6e |
|
3090 | \x6e | |
3091 | $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n' |
|
3091 | $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n' | |
3092 | \x5c\x786e |
|
3092 | \x5c\x786e | |
3093 |
|
3093 | |||
3094 | $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n' |
|
3094 | $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n' | |
3095 | \x6e |
|
3095 | \x6e | |
3096 | $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n' |
|
3096 | $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n' | |
3097 | \x5c\x786e |
|
3097 | \x5c\x786e | |
3098 | $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n' |
|
3098 | $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n' | |
3099 | \x6e |
|
3099 | \x6e | |
3100 | $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n' |
|
3100 | $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n' | |
3101 | \x5c\x786e |
|
3101 | \x5c\x786e | |
3102 |
|
3102 | |||
3103 | $ hg log -R a -r 8 --template '{join(files, "\n")}\n' |
|
3103 | $ hg log -R a -r 8 --template '{join(files, "\n")}\n' | |
3104 | fourth |
|
3104 | fourth | |
3105 | second |
|
3105 | second | |
3106 | third |
|
3106 | third | |
3107 | $ hg log -R a -r 8 --template '{join(files, r"\n")}\n' |
|
3107 | $ hg log -R a -r 8 --template '{join(files, r"\n")}\n' | |
3108 | fourth\nsecond\nthird |
|
3108 | fourth\nsecond\nthird | |
3109 |
|
3109 | |||
3110 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}' |
|
3110 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}' | |
3111 | <p> |
|
3111 | <p> | |
3112 | 1st |
|
3112 | 1st | |
3113 | </p> |
|
3113 | </p> | |
3114 | <p> |
|
3114 | <p> | |
3115 | 2nd |
|
3115 | 2nd | |
3116 | </p> |
|
3116 | </p> | |
3117 | $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}' |
|
3117 | $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}' | |
3118 | <p> |
|
3118 | <p> | |
3119 | 1st\n\n2nd |
|
3119 | 1st\n\n2nd | |
3120 | </p> |
|
3120 | </p> | |
3121 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}' |
|
3121 | $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}' | |
3122 | 1st |
|
3122 | 1st | |
3123 |
|
3123 | |||
3124 | 2nd |
|
3124 | 2nd | |
3125 |
|
3125 | |||
3126 | $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n' |
|
3126 | $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n' | |
3127 | o perso |
|
3127 | o perso | |
3128 | $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n' |
|
3128 | $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n' | |
3129 | no person |
|
3129 | no person | |
3130 | $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n' |
|
3130 | $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n' | |
3131 | o perso |
|
3131 | o perso | |
3132 | $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n' |
|
3132 | $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n' | |
3133 | no perso |
|
3133 | no perso | |
3134 |
|
3134 | |||
3135 | $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n' |
|
3135 | $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n' | |
3136 | -o perso- |
|
3136 | -o perso- | |
3137 | $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n' |
|
3137 | $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n' | |
3138 | no person |
|
3138 | no person | |
3139 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n' |
|
3139 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n' | |
3140 | \x2do perso\x2d |
|
3140 | \x2do perso\x2d | |
3141 | $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n' |
|
3141 | $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n' | |
3142 | -o perso- |
|
3142 | -o perso- | |
3143 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n' |
|
3143 | $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n' | |
3144 | \x2do perso\x6e |
|
3144 | \x2do perso\x6e | |
3145 |
|
3145 | |||
3146 | $ hg log -R a -r 8 --template '{files % "{file}\n"}' |
|
3146 | $ hg log -R a -r 8 --template '{files % "{file}\n"}' | |
3147 | fourth |
|
3147 | fourth | |
3148 | second |
|
3148 | second | |
3149 | third |
|
3149 | third | |
3150 |
|
3150 | |||
3151 | Test string escaping in nested expression: |
|
3151 | Test string escaping in nested expression: | |
3152 |
|
3152 | |||
3153 | $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n' |
|
3153 | $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n' | |
3154 | fourth\x6esecond\x6ethird |
|
3154 | fourth\x6esecond\x6ethird | |
3155 | $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n' |
|
3155 | $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n' | |
3156 | fourth\x6esecond\x6ethird |
|
3156 | fourth\x6esecond\x6ethird | |
3157 |
|
3157 | |||
3158 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n' |
|
3158 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n' | |
3159 | fourth\x6esecond\x6ethird |
|
3159 | fourth\x6esecond\x6ethird | |
3160 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n' |
|
3160 | $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n' | |
3161 | fourth\x5c\x786esecond\x5c\x786ethird |
|
3161 | fourth\x5c\x786esecond\x5c\x786ethird | |
3162 |
|
3162 | |||
3163 | $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n' |
|
3163 | $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n' | |
3164 | 3:\x6eo user, \x6eo domai\x6e |
|
3164 | 3:\x6eo user, \x6eo domai\x6e | |
3165 | 4:\x5c\x786eew bra\x5c\x786ech |
|
3165 | 4:\x5c\x786eew bra\x5c\x786ech | |
3166 |
|
3166 | |||
3167 | Test quotes in nested expression are evaluated just like a $(command) |
|
3167 | Test quotes in nested expression are evaluated just like a $(command) | |
3168 | substitution in POSIX shells: |
|
3168 | substitution in POSIX shells: | |
3169 |
|
3169 | |||
3170 | $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n' |
|
3170 | $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n' | |
3171 | 8:95c24699272e |
|
3171 | 8:95c24699272e | |
3172 | $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n' |
|
3172 | $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n' | |
3173 | {8} "95c24699272e" |
|
3173 | {8} "95c24699272e" | |
3174 |
|
3174 | |||
3175 | Test recursive evaluation: |
|
3175 | Test recursive evaluation: | |
3176 |
|
3176 | |||
3177 | $ hg init r |
|
3177 | $ hg init r | |
3178 | $ cd r |
|
3178 | $ cd r | |
3179 | $ echo a > a |
|
3179 | $ echo a > a | |
3180 | $ hg ci -Am '{rev}' |
|
3180 | $ hg ci -Am '{rev}' | |
3181 | adding a |
|
3181 | adding a | |
3182 | $ hg log -r 0 --template '{if(rev, desc)}\n' |
|
3182 | $ hg log -r 0 --template '{if(rev, desc)}\n' | |
3183 | {rev} |
|
3183 | {rev} | |
3184 | $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n' |
|
3184 | $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n' | |
3185 | test 0 |
|
3185 | test 0 | |
3186 |
|
3186 | |||
3187 | $ hg branch -q 'text.{rev}' |
|
3187 | $ hg branch -q 'text.{rev}' | |
3188 | $ echo aa >> aa |
|
3188 | $ echo aa >> aa | |
3189 | $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped' |
|
3189 | $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped' | |
3190 |
|
3190 | |||
3191 | $ hg log -l1 --template '{fill(desc, "20", author, branch)}' |
|
3191 | $ hg log -l1 --template '{fill(desc, "20", author, branch)}' | |
3192 | {node|short}desc to |
|
3192 | {node|short}desc to | |
3193 | text.{rev}be wrapped |
|
3193 | text.{rev}be wrapped | |
3194 | text.{rev}desc to be |
|
3194 | text.{rev}desc to be | |
3195 | text.{rev}wrapped (no-eol) |
|
3195 | text.{rev}wrapped (no-eol) | |
3196 | $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}' |
|
3196 | $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}' | |
3197 | bcc7ff960b8e:desc to |
|
3197 | bcc7ff960b8e:desc to | |
3198 | text.1:be wrapped |
|
3198 | text.1:be wrapped | |
3199 | text.1:desc to be |
|
3199 | text.1:desc to be | |
3200 | text.1:wrapped (no-eol) |
|
3200 | text.1:wrapped (no-eol) | |
3201 | $ hg log -l1 -T '{fill(desc, date, "", "")}\n' |
|
3201 | $ hg log -l1 -T '{fill(desc, date, "", "")}\n' | |
3202 | hg: parse error: fill expects an integer width |
|
3202 | hg: parse error: fill expects an integer width | |
3203 | [255] |
|
3203 | [255] | |
3204 |
|
3204 | |||
3205 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}' |
|
3205 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}' | |
3206 | {node|short} (no-eol) |
|
3206 | {node|short} (no-eol) | |
3207 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}' |
|
3207 | $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}' | |
3208 | bcc-ff---b-e (no-eol) |
|
3208 | bcc-ff---b-e (no-eol) | |
3209 |
|
3209 | |||
3210 | $ cat >> .hg/hgrc <<EOF |
|
3210 | $ cat >> .hg/hgrc <<EOF | |
3211 | > [extensions] |
|
3211 | > [extensions] | |
3212 | > color= |
|
3212 | > color= | |
3213 | > [color] |
|
3213 | > [color] | |
3214 | > mode=ansi |
|
3214 | > mode=ansi | |
3215 | > text.{rev} = red |
|
3215 | > text.{rev} = red | |
3216 | > text.1 = green |
|
3216 | > text.1 = green | |
3217 | > EOF |
|
3217 | > EOF | |
3218 | $ hg log --color=always -l 1 --template '{label(branch, "text\n")}' |
|
3218 | $ hg log --color=always -l 1 --template '{label(branch, "text\n")}' | |
3219 | \x1b[0;31mtext\x1b[0m (esc) |
|
3219 | \x1b[0;31mtext\x1b[0m (esc) | |
3220 | $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}' |
|
3220 | $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}' | |
3221 | \x1b[0;32mtext\x1b[0m (esc) |
|
3221 | \x1b[0;32mtext\x1b[0m (esc) | |
3222 |
|
3222 | |||
3223 | color effect can be specified without quoting: |
|
3223 | color effect can be specified without quoting: | |
3224 |
|
3224 | |||
3225 | $ hg log --color=always -l 1 --template '{label(red, "text\n")}' |
|
3225 | $ hg log --color=always -l 1 --template '{label(red, "text\n")}' | |
3226 | \x1b[0;31mtext\x1b[0m (esc) |
|
3226 | \x1b[0;31mtext\x1b[0m (esc) | |
3227 |
|
3227 | |||
3228 | label should be no-op if color is disabled: |
|
3228 | label should be no-op if color is disabled: | |
3229 |
|
3229 | |||
3230 | $ hg log --color=never -l 1 --template '{label(red, "text\n")}' |
|
3230 | $ hg log --color=never -l 1 --template '{label(red, "text\n")}' | |
3231 | text |
|
3231 | text | |
3232 | $ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}' |
|
3232 | $ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}' | |
3233 | text |
|
3233 | text | |
3234 |
|
3234 | |||
3235 | Test branches inside if statement: |
|
3235 | Test branches inside if statement: | |
3236 |
|
3236 | |||
3237 | $ hg log -r 0 --template '{if(branches, "yes", "no")}\n' |
|
3237 | $ hg log -r 0 --template '{if(branches, "yes", "no")}\n' | |
3238 | no |
|
3238 | no | |
3239 |
|
3239 | |||
3240 | Test get function: |
|
3240 | Test get function: | |
3241 |
|
3241 | |||
3242 | $ hg log -r 0 --template '{get(extras, "branch")}\n' |
|
3242 | $ hg log -r 0 --template '{get(extras, "branch")}\n' | |
3243 | default |
|
3243 | default | |
3244 | $ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n' |
|
3244 | $ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n' | |
3245 | default |
|
3245 | default | |
3246 | $ hg log -r 0 --template '{get(files, "should_fail")}\n' |
|
3246 | $ hg log -r 0 --template '{get(files, "should_fail")}\n' | |
3247 | hg: parse error: get() expects a dict as first argument |
|
3247 | hg: parse error: get() expects a dict as first argument | |
3248 | [255] |
|
3248 | [255] | |
3249 |
|
3249 | |||
3250 | Test localdate(date, tz) function: |
|
3250 | Test localdate(date, tz) function: | |
3251 |
|
3251 | |||
3252 | $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n' |
|
3252 | $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n' | |
3253 | 1970-01-01 09:00 +0900 |
|
3253 | 1970-01-01 09:00 +0900 | |
3254 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n' |
|
3254 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n' | |
3255 | 1970-01-01 00:00 +0000 |
|
3255 | 1970-01-01 00:00 +0000 | |
3256 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n' |
|
3256 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n' | |
3257 | 1970-01-01 02:00 +0200 |
|
3257 | 1970-01-01 02:00 +0200 | |
3258 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n' |
|
3258 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n' | |
3259 | 1970-01-01 00:00 +0000 |
|
3259 | 1970-01-01 00:00 +0000 | |
3260 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n' |
|
3260 | $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n' | |
3261 | 1970-01-01 00:00 +0000 |
|
3261 | 1970-01-01 00:00 +0000 | |
3262 | $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n' |
|
3262 | $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n' | |
3263 | hg: parse error: localdate expects a timezone |
|
3263 | hg: parse error: localdate expects a timezone | |
3264 | [255] |
|
3264 | [255] | |
3265 | $ hg log -r0 -T '{localdate(date, date)|isodate}\n' |
|
3265 | $ hg log -r0 -T '{localdate(date, date)|isodate}\n' | |
3266 | hg: parse error: localdate expects a timezone |
|
3266 | hg: parse error: localdate expects a timezone | |
3267 | [255] |
|
3267 | [255] | |
3268 |
|
3268 | |||
3269 | Test shortest(node) function: |
|
3269 | Test shortest(node) function: | |
3270 |
|
3270 | |||
3271 | $ echo b > b |
|
3271 | $ echo b > b | |
3272 | $ hg ci -qAm b |
|
3272 | $ hg ci -qAm b | |
3273 | $ hg log --template '{shortest(node)}\n' |
|
3273 | $ hg log --template '{shortest(node)}\n' | |
3274 | e777 |
|
3274 | e777 | |
3275 | bcc7 |
|
3275 | bcc7 | |
3276 | f776 |
|
3276 | f776 | |
3277 | $ hg log --template '{shortest(node, 10)}\n' |
|
3277 | $ hg log --template '{shortest(node, 10)}\n' | |
3278 | e777603221 |
|
3278 | e777603221 | |
3279 | bcc7ff960b |
|
3279 | bcc7ff960b | |
3280 | f7769ec2ab |
|
3280 | f7769ec2ab | |
3281 | $ hg log --template '{node|shortest}\n' -l1 |
|
3281 | $ hg log --template '{node|shortest}\n' -l1 | |
3282 | e777 |
|
3282 | e777 | |
3283 |
|
3283 | |||
3284 | $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n' |
|
3284 | $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n' | |
3285 | f7769ec2ab |
|
3285 | f7769ec2ab | |
3286 | $ hg log -r 0 -T '{shortest(node, "not an int")}\n' |
|
3286 | $ hg log -r 0 -T '{shortest(node, "not an int")}\n' | |
3287 | hg: parse error: shortest() expects an integer minlength |
|
3287 | hg: parse error: shortest() expects an integer minlength | |
3288 | [255] |
|
3288 | [255] | |
3289 |
|
3289 | |||
3290 | Test pad function |
|
3290 | Test pad function | |
3291 |
|
3291 | |||
3292 | $ hg log --template '{pad(rev, 20)} {author|user}\n' |
|
3292 | $ hg log --template '{pad(rev, 20)} {author|user}\n' | |
3293 | 2 test |
|
3293 | 2 test | |
3294 | 1 {node|short} |
|
3294 | 1 {node|short} | |
3295 | 0 test |
|
3295 | 0 test | |
3296 |
|
3296 | |||
3297 | $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n' |
|
3297 | $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n' | |
3298 | 2 test |
|
3298 | 2 test | |
3299 | 1 {node|short} |
|
3299 | 1 {node|short} | |
3300 | 0 test |
|
3300 | 0 test | |
3301 |
|
3301 | |||
3302 | $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n' |
|
3302 | $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n' | |
3303 | 2------------------- test |
|
3303 | 2------------------- test | |
3304 | 1------------------- {node|short} |
|
3304 | 1------------------- {node|short} | |
3305 | 0------------------- test |
|
3305 | 0------------------- test | |
3306 |
|
3306 | |||
3307 | Test template string in pad function |
|
3307 | Test template string in pad function | |
3308 |
|
3308 | |||
3309 | $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n' |
|
3309 | $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n' | |
3310 | {0} test |
|
3310 | {0} test | |
3311 |
|
3311 | |||
3312 | $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n' |
|
3312 | $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n' | |
3313 | \{rev} test |
|
3313 | \{rev} test | |
3314 |
|
3314 | |||
3315 | Test width argument passed to pad function |
|
3315 | Test width argument passed to pad function | |
3316 |
|
3316 | |||
3317 | $ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n' |
|
3317 | $ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n' | |
3318 | 0 test |
|
3318 | 0 test | |
3319 | $ hg log -r 0 -T '{pad(rev, "not an int")}\n' |
|
3319 | $ hg log -r 0 -T '{pad(rev, "not an int")}\n' | |
3320 | hg: parse error: pad() expects an integer width |
|
3320 | hg: parse error: pad() expects an integer width | |
3321 | [255] |
|
3321 | [255] | |
3322 |
|
3322 | |||
3323 | Test separate function |
|
3323 | Test separate function | |
3324 |
|
3324 | |||
3325 | $ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n' |
|
3325 | $ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n' | |
3326 | a-b-c |
|
3326 | a-b-c | |
3327 | $ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n' |
|
3327 | $ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n' | |
3328 | 0:f7769ec2ab97 test default |
|
3328 | 0:f7769ec2ab97 test default | |
3329 | $ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n' |
|
3329 | $ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n' | |
3330 | a \x1b[0;31mb\x1b[0m c d (esc) |
|
3330 | a \x1b[0;31mb\x1b[0m c d (esc) | |
3331 |
|
3331 | |||
3332 | Test ifcontains function |
|
3332 | Test ifcontains function | |
3333 |
|
3333 | |||
3334 | $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n' |
|
3334 | $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n' | |
3335 | 2 is in the string |
|
3335 | 2 is in the string | |
3336 | 1 is not |
|
3336 | 1 is not | |
3337 | 0 is in the string |
|
3337 | 0 is in the string | |
3338 |
|
3338 | |||
3339 | $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n' |
|
3339 | $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n' | |
3340 | 2 is in the string |
|
3340 | 2 is in the string | |
3341 | 1 is not |
|
3341 | 1 is not | |
3342 | 0 is in the string |
|
3342 | 0 is in the string | |
3343 |
|
3343 | |||
3344 | $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n' |
|
3344 | $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n' | |
3345 | 2 did not add a |
|
3345 | 2 did not add a | |
3346 | 1 did not add a |
|
3346 | 1 did not add a | |
3347 | 0 added a |
|
3347 | 0 added a | |
3348 |
|
3348 | |||
3349 | $ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n' |
|
3349 | $ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n' | |
3350 | 2 is parent of 1 |
|
3350 | 2 is parent of 1 | |
3351 | 1 |
|
3351 | 1 | |
3352 | 0 |
|
3352 | 0 | |
3353 |
|
3353 | |||
3354 | Test revset function |
|
3354 | Test revset function | |
3355 |
|
3355 | |||
3356 | $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n' |
|
3356 | $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n' | |
3357 | 2 current rev |
|
3357 | 2 current rev | |
3358 | 1 not current rev |
|
3358 | 1 not current rev | |
3359 | 0 not current rev |
|
3359 | 0 not current rev | |
3360 |
|
3360 | |||
3361 | $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n' |
|
3361 | $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n' | |
3362 | 2 match rev |
|
3362 | 2 match rev | |
3363 | 1 match rev |
|
3363 | 1 match rev | |
3364 | 0 not match rev |
|
3364 | 0 not match rev | |
3365 |
|
3365 | |||
3366 | $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n' |
|
3366 | $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n' | |
3367 | 2 Parents: 1 |
|
3367 | 2 Parents: 1 | |
3368 | 1 Parents: 0 |
|
3368 | 1 Parents: 0 | |
3369 | 0 Parents: |
|
3369 | 0 Parents: | |
3370 |
|
3370 | |||
3371 | $ cat >> .hg/hgrc <<EOF |
|
3371 | $ cat >> .hg/hgrc <<EOF | |
3372 | > [revsetalias] |
|
3372 | > [revsetalias] | |
3373 | > myparents(\$1) = parents(\$1) |
|
3373 | > myparents(\$1) = parents(\$1) | |
3374 | > EOF |
|
3374 | > EOF | |
3375 | $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n' |
|
3375 | $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n' | |
3376 | 2 Parents: 1 |
|
3376 | 2 Parents: 1 | |
3377 | 1 Parents: 0 |
|
3377 | 1 Parents: 0 | |
3378 | 0 Parents: |
|
3378 | 0 Parents: | |
3379 |
|
3379 | |||
3380 | $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n' |
|
3380 | $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n' | |
3381 | Rev: 2 |
|
3381 | Rev: 2 | |
3382 | Ancestor: 0 |
|
3382 | Ancestor: 0 | |
3383 | Ancestor: 1 |
|
3383 | Ancestor: 1 | |
3384 | Ancestor: 2 |
|
3384 | Ancestor: 2 | |
3385 |
|
3385 | |||
3386 | Rev: 1 |
|
3386 | Rev: 1 | |
3387 | Ancestor: 0 |
|
3387 | Ancestor: 0 | |
3388 | Ancestor: 1 |
|
3388 | Ancestor: 1 | |
3389 |
|
3389 | |||
3390 | Rev: 0 |
|
3390 | Rev: 0 | |
3391 | Ancestor: 0 |
|
3391 | Ancestor: 0 | |
3392 |
|
3392 | |||
3393 | $ hg log --template '{revset("TIP"|lower)}\n' -l1 |
|
3393 | $ hg log --template '{revset("TIP"|lower)}\n' -l1 | |
3394 | 2 |
|
3394 | 2 | |
3395 |
|
3395 | |||
3396 | $ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1 |
|
3396 | $ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1 | |
3397 | 2 |
|
3397 | 2 | |
3398 |
|
3398 | |||
3399 | a list template is evaluated for each item of revset/parents |
|
3399 | a list template is evaluated for each item of revset/parents | |
3400 |
|
3400 | |||
3401 | $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n' |
|
3401 | $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n' | |
3402 | 2 p: 1:bcc7ff960b8e |
|
3402 | 2 p: 1:bcc7ff960b8e | |
3403 | 1 p: 0:f7769ec2ab97 |
|
3403 | 1 p: 0:f7769ec2ab97 | |
3404 | 0 p: |
|
3404 | 0 p: | |
3405 |
|
3405 | |||
3406 | $ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n' |
|
3406 | $ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n' | |
3407 | 2 p: 1:bcc7ff960b8e -1:000000000000 |
|
3407 | 2 p: 1:bcc7ff960b8e -1:000000000000 | |
3408 | 1 p: 0:f7769ec2ab97 -1:000000000000 |
|
3408 | 1 p: 0:f7769ec2ab97 -1:000000000000 | |
3409 | 0 p: -1:000000000000 -1:000000000000 |
|
3409 | 0 p: -1:000000000000 -1:000000000000 | |
3410 |
|
3410 | |||
3411 | therefore, 'revcache' should be recreated for each rev |
|
3411 | therefore, 'revcache' should be recreated for each rev | |
3412 |
|
3412 | |||
3413 | $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n' |
|
3413 | $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n' | |
3414 | 2 aa b |
|
3414 | 2 aa b | |
3415 | p |
|
3415 | p | |
3416 | 1 |
|
3416 | 1 | |
3417 | p a |
|
3417 | p a | |
3418 | 0 a |
|
3418 | 0 a | |
3419 | p |
|
3419 | p | |
3420 |
|
3420 | |||
3421 | $ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n' |
|
3421 | $ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n' | |
3422 | 2 aa b |
|
3422 | 2 aa b | |
3423 | p |
|
3423 | p | |
3424 | 1 |
|
3424 | 1 | |
3425 | p a |
|
3425 | p a | |
3426 | 0 a |
|
3426 | 0 a | |
3427 | p |
|
3427 | p | |
3428 |
|
3428 | |||
3429 | a revset item must be evaluated as an integer revision, not an offset from tip |
|
3429 | a revset item must be evaluated as an integer revision, not an offset from tip | |
3430 |
|
3430 | |||
3431 | $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n' |
|
3431 | $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n' | |
3432 | -1:000000000000 |
|
3432 | -1:000000000000 | |
3433 | $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n' |
|
3433 | $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n' | |
3434 | -1:000000000000 |
|
3434 | -1:000000000000 | |
3435 |
|
3435 | |||
|
3436 | join() should pick '{rev}' from revset items: | |||
|
3437 | ||||
|
3438 | $ hg log -R ../a -T '{join(revset("parents(%d)", rev), ", ")}\n' -r6 | |||
|
3439 | 4, 5 | |||
|
3440 | ||||
3436 | Test active bookmark templating |
|
3441 | Test active bookmark templating | |
3437 |
|
3442 | |||
3438 | $ hg book foo |
|
3443 | $ hg book foo | |
3439 | $ hg book bar |
|
3444 | $ hg book bar | |
3440 | $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n" |
|
3445 | $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n" | |
3441 | 2 bar* foo |
|
3446 | 2 bar* foo | |
3442 | 1 |
|
3447 | 1 | |
3443 | 0 |
|
3448 | 0 | |
3444 | $ hg log --template "{rev} {activebookmark}\n" |
|
3449 | $ hg log --template "{rev} {activebookmark}\n" | |
3445 | 2 bar |
|
3450 | 2 bar | |
3446 | 1 |
|
3451 | 1 | |
3447 | 0 |
|
3452 | 0 | |
3448 | $ hg bookmarks --inactive bar |
|
3453 | $ hg bookmarks --inactive bar | |
3449 | $ hg log --template "{rev} {activebookmark}\n" |
|
3454 | $ hg log --template "{rev} {activebookmark}\n" | |
3450 | 2 |
|
3455 | 2 | |
3451 | 1 |
|
3456 | 1 | |
3452 | 0 |
|
3457 | 0 | |
3453 | $ hg book -r1 baz |
|
3458 | $ hg book -r1 baz | |
3454 | $ hg log --template "{rev} {join(bookmarks, ' ')}\n" |
|
3459 | $ hg log --template "{rev} {join(bookmarks, ' ')}\n" | |
3455 | 2 bar foo |
|
3460 | 2 bar foo | |
3456 | 1 baz |
|
3461 | 1 baz | |
3457 | 0 |
|
3462 | 0 | |
3458 | $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n" |
|
3463 | $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n" | |
3459 | 2 t |
|
3464 | 2 t | |
3460 | 1 f |
|
3465 | 1 f | |
3461 | 0 f |
|
3466 | 0 f | |
3462 |
|
3467 | |||
3463 | Test namespaces dict |
|
3468 | Test namespaces dict | |
3464 |
|
3469 | |||
3465 | $ hg log -T '{rev}{namespaces % " {namespace}={join(names, ",")}"}\n' |
|
3470 | $ hg log -T '{rev}{namespaces % " {namespace}={join(names, ",")}"}\n' | |
3466 | 2 bookmarks=bar,foo tags=tip branches=text.{rev} |
|
3471 | 2 bookmarks=bar,foo tags=tip branches=text.{rev} | |
3467 | 1 bookmarks=baz tags= branches=text.{rev} |
|
3472 | 1 bookmarks=baz tags= branches=text.{rev} | |
3468 | 0 bookmarks= tags= branches=default |
|
3473 | 0 bookmarks= tags= branches=default | |
3469 | $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}' |
|
3474 | $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}' | |
3470 | bookmarks: bar foo |
|
3475 | bookmarks: bar foo | |
3471 | tags: tip |
|
3476 | tags: tip | |
3472 | branches: text.{rev} |
|
3477 | branches: text.{rev} | |
3473 | $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}' |
|
3478 | $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}' | |
3474 | bookmarks: |
|
3479 | bookmarks: | |
3475 | bar |
|
3480 | bar | |
3476 | foo |
|
3481 | foo | |
3477 | tags: |
|
3482 | tags: | |
3478 | tip |
|
3483 | tip | |
3479 | branches: |
|
3484 | branches: | |
3480 | text.{rev} |
|
3485 | text.{rev} | |
3481 | $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}' |
|
3486 | $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}' | |
3482 | bar |
|
3487 | bar | |
3483 | foo |
|
3488 | foo | |
3484 |
|
3489 | |||
3485 | Test stringify on sub expressions |
|
3490 | Test stringify on sub expressions | |
3486 |
|
3491 | |||
3487 | $ cd .. |
|
3492 | $ cd .. | |
3488 | $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n' |
|
3493 | $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n' | |
3489 | fourth, second, third |
|
3494 | fourth, second, third | |
3490 | $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n' |
|
3495 | $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n' | |
3491 | abc |
|
3496 | abc | |
3492 |
|
3497 | |||
3493 | Test splitlines |
|
3498 | Test splitlines | |
3494 |
|
3499 | |||
3495 | $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}" |
|
3500 | $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}" | |
3496 | @ foo Modify, add, remove, rename |
|
3501 | @ foo Modify, add, remove, rename | |
3497 | | |
|
3502 | | | |
3498 | o foo future |
|
3503 | o foo future | |
3499 | | |
|
3504 | | | |
3500 | o foo third |
|
3505 | o foo third | |
3501 | | |
|
3506 | | | |
3502 | o foo second |
|
3507 | o foo second | |
3503 |
|
3508 | |||
3504 | o foo merge |
|
3509 | o foo merge | |
3505 | |\ |
|
3510 | |\ | |
3506 | | o foo new head |
|
3511 | | o foo new head | |
3507 | | | |
|
3512 | | | | |
3508 | o | foo new branch |
|
3513 | o | foo new branch | |
3509 | |/ |
|
3514 | |/ | |
3510 | o foo no user, no domain |
|
3515 | o foo no user, no domain | |
3511 | | |
|
3516 | | | |
3512 | o foo no person |
|
3517 | o foo no person | |
3513 | | |
|
3518 | | | |
3514 | o foo other 1 |
|
3519 | o foo other 1 | |
3515 | | foo other 2 |
|
3520 | | foo other 2 | |
3516 | | foo |
|
3521 | | foo | |
3517 | | foo other 3 |
|
3522 | | foo other 3 | |
3518 | o foo line 1 |
|
3523 | o foo line 1 | |
3519 | foo line 2 |
|
3524 | foo line 2 | |
3520 |
|
3525 | |||
3521 | Test startswith |
|
3526 | Test startswith | |
3522 | $ hg log -Gv -R a --template "{startswith(desc)}" |
|
3527 | $ hg log -Gv -R a --template "{startswith(desc)}" | |
3523 | hg: parse error: startswith expects two arguments |
|
3528 | hg: parse error: startswith expects two arguments | |
3524 | [255] |
|
3529 | [255] | |
3525 |
|
3530 | |||
3526 | $ hg log -Gv -R a --template "{startswith('line', desc)}" |
|
3531 | $ hg log -Gv -R a --template "{startswith('line', desc)}" | |
3527 | @ |
|
3532 | @ | |
3528 | | |
|
3533 | | | |
3529 | o |
|
3534 | o | |
3530 | | |
|
3535 | | | |
3531 | o |
|
3536 | o | |
3532 | | |
|
3537 | | | |
3533 | o |
|
3538 | o | |
3534 |
|
3539 | |||
3535 | o |
|
3540 | o | |
3536 | |\ |
|
3541 | |\ | |
3537 | | o |
|
3542 | | o | |
3538 | | | |
|
3543 | | | | |
3539 | o | |
|
3544 | o | | |
3540 | |/ |
|
3545 | |/ | |
3541 | o |
|
3546 | o | |
3542 | | |
|
3547 | | | |
3543 | o |
|
3548 | o | |
3544 | | |
|
3549 | | | |
3545 | o |
|
3550 | o | |
3546 | | |
|
3551 | | | |
3547 | o line 1 |
|
3552 | o line 1 | |
3548 | line 2 |
|
3553 | line 2 | |
3549 |
|
3554 | |||
3550 | Test bad template with better error message |
|
3555 | Test bad template with better error message | |
3551 |
|
3556 | |||
3552 | $ hg log -Gv -R a --template '{desc|user()}' |
|
3557 | $ hg log -Gv -R a --template '{desc|user()}' | |
3553 | hg: parse error: expected a symbol, got 'func' |
|
3558 | hg: parse error: expected a symbol, got 'func' | |
3554 | [255] |
|
3559 | [255] | |
3555 |
|
3560 | |||
3556 | Test word function (including index out of bounds graceful failure) |
|
3561 | Test word function (including index out of bounds graceful failure) | |
3557 |
|
3562 | |||
3558 | $ hg log -Gv -R a --template "{word('1', desc)}" |
|
3563 | $ hg log -Gv -R a --template "{word('1', desc)}" | |
3559 | @ add, |
|
3564 | @ add, | |
3560 | | |
|
3565 | | | |
3561 | o |
|
3566 | o | |
3562 | | |
|
3567 | | | |
3563 | o |
|
3568 | o | |
3564 | | |
|
3569 | | | |
3565 | o |
|
3570 | o | |
3566 |
|
3571 | |||
3567 | o |
|
3572 | o | |
3568 | |\ |
|
3573 | |\ | |
3569 | | o head |
|
3574 | | o head | |
3570 | | | |
|
3575 | | | | |
3571 | o | branch |
|
3576 | o | branch | |
3572 | |/ |
|
3577 | |/ | |
3573 | o user, |
|
3578 | o user, | |
3574 | | |
|
3579 | | | |
3575 | o person |
|
3580 | o person | |
3576 | | |
|
3581 | | | |
3577 | o 1 |
|
3582 | o 1 | |
3578 | | |
|
3583 | | | |
3579 | o 1 |
|
3584 | o 1 | |
3580 |
|
3585 | |||
3581 |
|
3586 | |||
3582 | Test word third parameter used as splitter |
|
3587 | Test word third parameter used as splitter | |
3583 |
|
3588 | |||
3584 | $ hg log -Gv -R a --template "{word('0', desc, 'o')}" |
|
3589 | $ hg log -Gv -R a --template "{word('0', desc, 'o')}" | |
3585 | @ M |
|
3590 | @ M | |
3586 | | |
|
3591 | | | |
3587 | o future |
|
3592 | o future | |
3588 | | |
|
3593 | | | |
3589 | o third |
|
3594 | o third | |
3590 | | |
|
3595 | | | |
3591 | o sec |
|
3596 | o sec | |
3592 |
|
3597 | |||
3593 | o merge |
|
3598 | o merge | |
3594 | |\ |
|
3599 | |\ | |
3595 | | o new head |
|
3600 | | o new head | |
3596 | | | |
|
3601 | | | | |
3597 | o | new branch |
|
3602 | o | new branch | |
3598 | |/ |
|
3603 | |/ | |
3599 | o n |
|
3604 | o n | |
3600 | | |
|
3605 | | | |
3601 | o n |
|
3606 | o n | |
3602 | | |
|
3607 | | | |
3603 | o |
|
3608 | o | |
3604 | | |
|
3609 | | | |
3605 | o line 1 |
|
3610 | o line 1 | |
3606 | line 2 |
|
3611 | line 2 | |
3607 |
|
3612 | |||
3608 | Test word error messages for not enough and too many arguments |
|
3613 | Test word error messages for not enough and too many arguments | |
3609 |
|
3614 | |||
3610 | $ hg log -Gv -R a --template "{word('0')}" |
|
3615 | $ hg log -Gv -R a --template "{word('0')}" | |
3611 | hg: parse error: word expects two or three arguments, got 1 |
|
3616 | hg: parse error: word expects two or three arguments, got 1 | |
3612 | [255] |
|
3617 | [255] | |
3613 |
|
3618 | |||
3614 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" |
|
3619 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" | |
3615 | hg: parse error: word expects two or three arguments, got 7 |
|
3620 | hg: parse error: word expects two or three arguments, got 7 | |
3616 | [255] |
|
3621 | [255] | |
3617 |
|
3622 | |||
3618 | Test word for integer literal |
|
3623 | Test word for integer literal | |
3619 |
|
3624 | |||
3620 | $ hg log -R a --template "{word(2, desc)}\n" -r0 |
|
3625 | $ hg log -R a --template "{word(2, desc)}\n" -r0 | |
3621 | line |
|
3626 | line | |
3622 |
|
3627 | |||
3623 | Test word for invalid numbers |
|
3628 | Test word for invalid numbers | |
3624 |
|
3629 | |||
3625 | $ hg log -Gv -R a --template "{word('a', desc)}" |
|
3630 | $ hg log -Gv -R a --template "{word('a', desc)}" | |
3626 | hg: parse error: word expects an integer index |
|
3631 | hg: parse error: word expects an integer index | |
3627 | [255] |
|
3632 | [255] | |
3628 |
|
3633 | |||
3629 | Test word for out of range |
|
3634 | Test word for out of range | |
3630 |
|
3635 | |||
3631 | $ hg log -R a --template "{word(10000, desc)}" |
|
3636 | $ hg log -R a --template "{word(10000, desc)}" | |
3632 | $ hg log -R a --template "{word(-10000, desc)}" |
|
3637 | $ hg log -R a --template "{word(-10000, desc)}" | |
3633 |
|
3638 | |||
3634 | Test indent and not adding to empty lines |
|
3639 | Test indent and not adding to empty lines | |
3635 |
|
3640 | |||
3636 | $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a |
|
3641 | $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a | |
3637 | ----- |
|
3642 | ----- | |
3638 | > line 1 |
|
3643 | > line 1 | |
3639 | >> line 2 |
|
3644 | >> line 2 | |
3640 | ----- |
|
3645 | ----- | |
3641 | > other 1 |
|
3646 | > other 1 | |
3642 | >> other 2 |
|
3647 | >> other 2 | |
3643 |
|
3648 | |||
3644 | >> other 3 |
|
3649 | >> other 3 | |
3645 |
|
3650 | |||
3646 | Test with non-strings like dates |
|
3651 | Test with non-strings like dates | |
3647 |
|
3652 | |||
3648 | $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a |
|
3653 | $ hg log -T "{indent(date, ' ')}\n" -r 2:3 -R a | |
3649 | 1200000.00 |
|
3654 | 1200000.00 | |
3650 | 1300000.00 |
|
3655 | 1300000.00 | |
3651 |
|
3656 | |||
3652 | Test broken string escapes: |
|
3657 | Test broken string escapes: | |
3653 |
|
3658 | |||
3654 | $ hg log -T "bogus\\" -R a |
|
3659 | $ hg log -T "bogus\\" -R a | |
3655 | hg: parse error: trailing \ in string |
|
3660 | hg: parse error: trailing \ in string | |
3656 | [255] |
|
3661 | [255] | |
3657 | $ hg log -T "\\xy" -R a |
|
3662 | $ hg log -T "\\xy" -R a | |
3658 | hg: parse error: invalid \x escape |
|
3663 | hg: parse error: invalid \x escape | |
3659 | [255] |
|
3664 | [255] | |
3660 |
|
3665 | |||
3661 | json filter should escape HTML tags so that the output can be embedded in hgweb: |
|
3666 | json filter should escape HTML tags so that the output can be embedded in hgweb: | |
3662 |
|
3667 | |||
3663 | $ hg log -T "{'<foo@example.org>'|json}\n" -R a -l1 |
|
3668 | $ hg log -T "{'<foo@example.org>'|json}\n" -R a -l1 | |
3664 | "\u003cfoo@example.org\u003e" |
|
3669 | "\u003cfoo@example.org\u003e" | |
3665 |
|
3670 | |||
3666 | Templater supports aliases of symbol and func() styles: |
|
3671 | Templater supports aliases of symbol and func() styles: | |
3667 |
|
3672 | |||
3668 | $ hg clone -q a aliases |
|
3673 | $ hg clone -q a aliases | |
3669 | $ cd aliases |
|
3674 | $ cd aliases | |
3670 | $ cat <<EOF >> .hg/hgrc |
|
3675 | $ cat <<EOF >> .hg/hgrc | |
3671 | > [templatealias] |
|
3676 | > [templatealias] | |
3672 | > r = rev |
|
3677 | > r = rev | |
3673 | > rn = "{r}:{node|short}" |
|
3678 | > rn = "{r}:{node|short}" | |
3674 | > status(c, files) = files % "{c} {file}\n" |
|
3679 | > status(c, files) = files % "{c} {file}\n" | |
3675 | > utcdate(d) = localdate(d, "UTC") |
|
3680 | > utcdate(d) = localdate(d, "UTC") | |
3676 | > EOF |
|
3681 | > EOF | |
3677 |
|
3682 | |||
3678 | $ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n' |
|
3683 | $ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n' | |
3679 | (template |
|
3684 | (template | |
3680 | ('symbol', 'rn') |
|
3685 | ('symbol', 'rn') | |
3681 | ('string', ' ') |
|
3686 | ('string', ' ') | |
3682 | (| |
|
3687 | (| | |
3683 | (func |
|
3688 | (func | |
3684 | ('symbol', 'utcdate') |
|
3689 | ('symbol', 'utcdate') | |
3685 | ('symbol', 'date')) |
|
3690 | ('symbol', 'date')) | |
3686 | ('symbol', 'isodate')) |
|
3691 | ('symbol', 'isodate')) | |
3687 | ('string', '\n')) |
|
3692 | ('string', '\n')) | |
3688 | * expanded: |
|
3693 | * expanded: | |
3689 | (template |
|
3694 | (template | |
3690 | (template |
|
3695 | (template | |
3691 | ('symbol', 'rev') |
|
3696 | ('symbol', 'rev') | |
3692 | ('string', ':') |
|
3697 | ('string', ':') | |
3693 | (| |
|
3698 | (| | |
3694 | ('symbol', 'node') |
|
3699 | ('symbol', 'node') | |
3695 | ('symbol', 'short'))) |
|
3700 | ('symbol', 'short'))) | |
3696 | ('string', ' ') |
|
3701 | ('string', ' ') | |
3697 | (| |
|
3702 | (| | |
3698 | (func |
|
3703 | (func | |
3699 | ('symbol', 'localdate') |
|
3704 | ('symbol', 'localdate') | |
3700 | (list |
|
3705 | (list | |
3701 | ('symbol', 'date') |
|
3706 | ('symbol', 'date') | |
3702 | ('string', 'UTC'))) |
|
3707 | ('string', 'UTC'))) | |
3703 | ('symbol', 'isodate')) |
|
3708 | ('symbol', 'isodate')) | |
3704 | ('string', '\n')) |
|
3709 | ('string', '\n')) | |
3705 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
3710 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 | |
3706 |
|
3711 | |||
3707 | $ hg debugtemplate -vr0 '{status("A", file_adds)}' |
|
3712 | $ hg debugtemplate -vr0 '{status("A", file_adds)}' | |
3708 | (template |
|
3713 | (template | |
3709 | (func |
|
3714 | (func | |
3710 | ('symbol', 'status') |
|
3715 | ('symbol', 'status') | |
3711 | (list |
|
3716 | (list | |
3712 | ('string', 'A') |
|
3717 | ('string', 'A') | |
3713 | ('symbol', 'file_adds')))) |
|
3718 | ('symbol', 'file_adds')))) | |
3714 | * expanded: |
|
3719 | * expanded: | |
3715 | (template |
|
3720 | (template | |
3716 | (% |
|
3721 | (% | |
3717 | ('symbol', 'file_adds') |
|
3722 | ('symbol', 'file_adds') | |
3718 | (template |
|
3723 | (template | |
3719 | ('string', 'A') |
|
3724 | ('string', 'A') | |
3720 | ('string', ' ') |
|
3725 | ('string', ' ') | |
3721 | ('symbol', 'file') |
|
3726 | ('symbol', 'file') | |
3722 | ('string', '\n')))) |
|
3727 | ('string', '\n')))) | |
3723 | A a |
|
3728 | A a | |
3724 |
|
3729 | |||
3725 | A unary function alias can be called as a filter: |
|
3730 | A unary function alias can be called as a filter: | |
3726 |
|
3731 | |||
3727 | $ hg debugtemplate -vr0 '{date|utcdate|isodate}\n' |
|
3732 | $ hg debugtemplate -vr0 '{date|utcdate|isodate}\n' | |
3728 | (template |
|
3733 | (template | |
3729 | (| |
|
3734 | (| | |
3730 | (| |
|
3735 | (| | |
3731 | ('symbol', 'date') |
|
3736 | ('symbol', 'date') | |
3732 | ('symbol', 'utcdate')) |
|
3737 | ('symbol', 'utcdate')) | |
3733 | ('symbol', 'isodate')) |
|
3738 | ('symbol', 'isodate')) | |
3734 | ('string', '\n')) |
|
3739 | ('string', '\n')) | |
3735 | * expanded: |
|
3740 | * expanded: | |
3736 | (template |
|
3741 | (template | |
3737 | (| |
|
3742 | (| | |
3738 | (func |
|
3743 | (func | |
3739 | ('symbol', 'localdate') |
|
3744 | ('symbol', 'localdate') | |
3740 | (list |
|
3745 | (list | |
3741 | ('symbol', 'date') |
|
3746 | ('symbol', 'date') | |
3742 | ('string', 'UTC'))) |
|
3747 | ('string', 'UTC'))) | |
3743 | ('symbol', 'isodate')) |
|
3748 | ('symbol', 'isodate')) | |
3744 | ('string', '\n')) |
|
3749 | ('string', '\n')) | |
3745 | 1970-01-12 13:46 +0000 |
|
3750 | 1970-01-12 13:46 +0000 | |
3746 |
|
3751 | |||
3747 | Aliases should be applied only to command arguments and templates in hgrc. |
|
3752 | Aliases should be applied only to command arguments and templates in hgrc. | |
3748 | Otherwise, our stock styles and web templates could be corrupted: |
|
3753 | Otherwise, our stock styles and web templates could be corrupted: | |
3749 |
|
3754 | |||
3750 | $ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n' |
|
3755 | $ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n' | |
3751 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
3756 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 | |
3752 |
|
3757 | |||
3753 | $ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"' |
|
3758 | $ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"' | |
3754 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 |
|
3759 | 0:1e4e1b8f71e0 1970-01-12 13:46 +0000 | |
3755 |
|
3760 | |||
3756 | $ cat <<EOF > tmpl |
|
3761 | $ cat <<EOF > tmpl | |
3757 | > changeset = 'nothing expanded:{rn}\n' |
|
3762 | > changeset = 'nothing expanded:{rn}\n' | |
3758 | > EOF |
|
3763 | > EOF | |
3759 | $ hg log -r0 --style ./tmpl |
|
3764 | $ hg log -r0 --style ./tmpl | |
3760 | nothing expanded: |
|
3765 | nothing expanded: | |
3761 |
|
3766 | |||
3762 | Aliases in formatter: |
|
3767 | Aliases in formatter: | |
3763 |
|
3768 | |||
3764 | $ hg branches -T '{pad(branch, 7)} {rn}\n' |
|
3769 | $ hg branches -T '{pad(branch, 7)} {rn}\n' | |
3765 | default 6:d41e714fe50d |
|
3770 | default 6:d41e714fe50d | |
3766 | foo 4:bbe44766e73d |
|
3771 | foo 4:bbe44766e73d | |
3767 |
|
3772 | |||
3768 | Aliases should honor HGPLAIN: |
|
3773 | Aliases should honor HGPLAIN: | |
3769 |
|
3774 | |||
3770 | $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n' |
|
3775 | $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n' | |
3771 | nothing expanded: |
|
3776 | nothing expanded: | |
3772 | $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n' |
|
3777 | $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n' | |
3773 | 0:1e4e1b8f71e0 |
|
3778 | 0:1e4e1b8f71e0 | |
3774 |
|
3779 | |||
3775 | Unparsable alias: |
|
3780 | Unparsable alias: | |
3776 |
|
3781 | |||
3777 | $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}' |
|
3782 | $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}' | |
3778 | (template |
|
3783 | (template | |
3779 | ('symbol', 'bad')) |
|
3784 | ('symbol', 'bad')) | |
3780 | abort: bad definition of template alias "bad": at 2: not a prefix: end |
|
3785 | abort: bad definition of template alias "bad": at 2: not a prefix: end | |
3781 | [255] |
|
3786 | [255] | |
3782 | $ hg log --config templatealias.bad='x(' -T '{bad}' |
|
3787 | $ hg log --config templatealias.bad='x(' -T '{bad}' | |
3783 | abort: bad definition of template alias "bad": at 2: not a prefix: end |
|
3788 | abort: bad definition of template alias "bad": at 2: not a prefix: end | |
3784 | [255] |
|
3789 | [255] | |
3785 |
|
3790 | |||
3786 | $ cd .. |
|
3791 | $ cd .. | |
3787 |
|
3792 | |||
3788 | Set up repository for non-ascii encoding tests: |
|
3793 | Set up repository for non-ascii encoding tests: | |
3789 |
|
3794 | |||
3790 | $ hg init nonascii |
|
3795 | $ hg init nonascii | |
3791 | $ cd nonascii |
|
3796 | $ cd nonascii | |
3792 | $ python <<EOF |
|
3797 | $ python <<EOF | |
3793 | > open('latin1', 'w').write('\xe9') |
|
3798 | > open('latin1', 'w').write('\xe9') | |
3794 | > open('utf-8', 'w').write('\xc3\xa9') |
|
3799 | > open('utf-8', 'w').write('\xc3\xa9') | |
3795 | > EOF |
|
3800 | > EOF | |
3796 | $ HGENCODING=utf-8 hg branch -q `cat utf-8` |
|
3801 | $ HGENCODING=utf-8 hg branch -q `cat utf-8` | |
3797 | $ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8 |
|
3802 | $ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8 | |
3798 |
|
3803 | |||
3799 | json filter should try round-trip conversion to utf-8: |
|
3804 | json filter should try round-trip conversion to utf-8: | |
3800 |
|
3805 | |||
3801 | $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0 |
|
3806 | $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0 | |
3802 | "\u00e9" |
|
3807 | "\u00e9" | |
3803 | $ HGENCODING=ascii hg log -T "{desc|json}\n" -r0 |
|
3808 | $ HGENCODING=ascii hg log -T "{desc|json}\n" -r0 | |
3804 | "non-ascii branch: \u00e9" |
|
3809 | "non-ascii branch: \u00e9" | |
3805 |
|
3810 | |||
3806 | json filter takes input as utf-8b: |
|
3811 | json filter takes input as utf-8b: | |
3807 |
|
3812 | |||
3808 | $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1 |
|
3813 | $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1 | |
3809 | "\u00e9" |
|
3814 | "\u00e9" | |
3810 | $ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1 |
|
3815 | $ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1 | |
3811 | "\udce9" |
|
3816 | "\udce9" | |
3812 |
|
3817 | |||
3813 | utf8 filter: |
|
3818 | utf8 filter: | |
3814 |
|
3819 | |||
3815 | $ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0 |
|
3820 | $ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0 | |
3816 | round-trip: c3a9 |
|
3821 | round-trip: c3a9 | |
3817 | $ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1 |
|
3822 | $ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1 | |
3818 | decoded: c3a9 |
|
3823 | decoded: c3a9 | |
3819 | $ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1 |
|
3824 | $ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1 | |
3820 | abort: decoding near * (glob) |
|
3825 | abort: decoding near * (glob) | |
3821 | [255] |
|
3826 | [255] | |
3822 | $ hg log -T "invalid type: {rev|utf8}\n" -r0 |
|
3827 | $ hg log -T "invalid type: {rev|utf8}\n" -r0 | |
3823 | abort: template filter 'utf8' is not compatible with keyword 'rev' |
|
3828 | abort: template filter 'utf8' is not compatible with keyword 'rev' | |
3824 | [255] |
|
3829 | [255] | |
3825 |
|
3830 | |||
3826 | $ cd .. |
|
3831 | $ cd .. | |
3827 |
|
3832 | |||
3828 | Test that template function in extension is registered as expected |
|
3833 | Test that template function in extension is registered as expected | |
3829 |
|
3834 | |||
3830 | $ cd a |
|
3835 | $ cd a | |
3831 |
|
3836 | |||
3832 | $ cat <<EOF > $TESTTMP/customfunc.py |
|
3837 | $ cat <<EOF > $TESTTMP/customfunc.py | |
3833 | > from mercurial import registrar |
|
3838 | > from mercurial import registrar | |
3834 | > |
|
3839 | > | |
3835 | > templatefunc = registrar.templatefunc() |
|
3840 | > templatefunc = registrar.templatefunc() | |
3836 | > |
|
3841 | > | |
3837 | > @templatefunc('custom()') |
|
3842 | > @templatefunc('custom()') | |
3838 | > def custom(context, mapping, args): |
|
3843 | > def custom(context, mapping, args): | |
3839 | > return 'custom' |
|
3844 | > return 'custom' | |
3840 | > EOF |
|
3845 | > EOF | |
3841 | $ cat <<EOF > .hg/hgrc |
|
3846 | $ cat <<EOF > .hg/hgrc | |
3842 | > [extensions] |
|
3847 | > [extensions] | |
3843 | > customfunc = $TESTTMP/customfunc.py |
|
3848 | > customfunc = $TESTTMP/customfunc.py | |
3844 | > EOF |
|
3849 | > EOF | |
3845 |
|
3850 | |||
3846 | $ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true |
|
3851 | $ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true | |
3847 | custom |
|
3852 | custom | |
3848 |
|
3853 | |||
3849 | $ cd .. |
|
3854 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now