tests: extract test-template-functions.t from test-command-template.t

I decided to not split filters and functions into two test files since
we sometimes reimplement a filter as a function.

contrib/python3-whitelist

@@ -490,6 +490,7 b' test-symlinks.t'
 test-tag.t
 test-tags.t
 test-template-filters.t
+test-template-functions.t
 test-template-map.t
 test-transplant.t
 test-treemanifest.t

tests/test-command-template.t

@@ -929,225 +929,12 b' Keys work:'
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
 
-Filters work:
-
-  $ hg log --template '{author|domain}\n'
-  
-  hostname
-  
-  
-  
-  
-  place
-  place
-  hostname
-
-  $ hg log --template '{author|person}\n'
-  test
-  User Name
-  person
-  person
-  person
-  person
-  other
-  A. N. Other
-  User Name
-
-  $ hg log --template '{author|user}\n'
-  test
-  user
-  person
-  person
-  person
-  person
-  other
-  other
-  user
-
-  $ hg log --template '{date|date}\n'
-  Wed Jan 01 10:01:00 2020 +0000
-  Mon Jan 12 13:46:40 1970 +0000
-  Sun Jan 18 08:40:01 1970 +0000
-  Sun Jan 18 08:40:00 1970 +0000
-  Sat Jan 17 04:53:20 1970 +0000
-  Fri Jan 16 01:06:40 1970 +0000
-  Wed Jan 14 21:20:00 1970 +0000
-  Tue Jan 13 17:33:20 1970 +0000
-  Mon Jan 12 13:46:40 1970 +0000
-
-  $ hg log --template '{date|isodate}\n'
-  2020-01-01 10:01 +0000
-  1970-01-12 13:46 +0000
-  1970-01-18 08:40 +0000
-  1970-01-18 08:40 +0000
-  1970-01-17 04:53 +0000
-  1970-01-16 01:06 +0000
-  1970-01-14 21:20 +0000
-  1970-01-13 17:33 +0000
-  1970-01-12 13:46 +0000
-
-  $ hg log --template '{date|isodatesec}\n'
-  2020-01-01 10:01:00 +0000
-  1970-01-12 13:46:40 +0000
-  1970-01-18 08:40:01 +0000
-  1970-01-18 08:40:00 +0000
-  1970-01-17 04:53:20 +0000
-  1970-01-16 01:06:40 +0000
-  1970-01-14 21:20:00 +0000
-  1970-01-13 17:33:20 +0000
-  1970-01-12 13:46:40 +0000
-
-  $ hg log --template '{date|rfc822date}\n'
-  Wed, 01 Jan 2020 10:01:00 +0000
-  Mon, 12 Jan 1970 13:46:40 +0000
-  Sun, 18 Jan 1970 08:40:01 +0000
-  Sun, 18 Jan 1970 08:40:00 +0000
-  Sat, 17 Jan 1970 04:53:20 +0000
-  Fri, 16 Jan 1970 01:06:40 +0000
-  Wed, 14 Jan 1970 21:20:00 +0000
-  Tue, 13 Jan 1970 17:33:20 +0000
-  Mon, 12 Jan 1970 13:46:40 +0000
-
-  $ hg log --template '{desc|firstline}\n'
-  third
-  second
-  merge
-  new head
-  new branch
-  no user, no domain
-  no person
-  other 1
-  line 1
-
-  $ hg log --template '{node|short}\n'
-  95c24699272e
-  29114dbae42b
-  d41e714fe50d
-  13207e5a10d9
-  bbe44766e73d
-  10e46f2dcbf4
-  97054abb4ab8
-  b608e9d1a3f0
-  1e4e1b8f71e0
-
-  $ hg log --template '<changeset author="{author|xmlescape}"/>\n'
-  <changeset author="test"/>
-  <changeset author="User Name &lt;user@hostname&gt;"/>
-  <changeset author="person"/>
-  <changeset author="person"/>
-  <changeset author="person"/>
-  <changeset author="person"/>
-  <changeset author="other@place"/>
-  <changeset author="A. N. Other &lt;other@place&gt;"/>
-  <changeset author="User Name &lt;user@hostname&gt;"/>
-
-  $ hg log --template '{rev}: {children}\n'
-  8: 
-  7: 8:95c24699272e
-  6: 
-  5: 6:d41e714fe50d
-  4: 6:d41e714fe50d
-  3: 4:bbe44766e73d 5:13207e5a10d9
-  2: 3:10e46f2dcbf4
-  1: 2:97054abb4ab8
-  0: 1:b608e9d1a3f0
-
-Formatnode filter works:
-
-  $ hg -q log -r 0 --template '{node|formatnode}\n'
-  1e4e1b8f71e0
-
-  $ hg log -r 0 --template '{node|formatnode}\n'
-  1e4e1b8f71e0
-
-  $ hg -v log -r 0 --template '{node|formatnode}\n'
-  1e4e1b8f71e0
-
-  $ hg --debug log -r 0 --template '{node|formatnode}\n'
-  1e4e1b8f71e05681d422154f5421e385fec3454f
-
-Age filter:
-
-  $ hg init unstable-hash
-  $ cd unstable-hash
-  $ hg log --template '{date|age}\n' > /dev/null || exit 1
-
-  >>> from __future__ import absolute_import
-  >>> import datetime
-  >>> fp = open('a', 'wb')
-  >>> n = datetime.datetime.now() + datetime.timedelta(366 * 7)
-  >>> fp.write(b'%d-%d-%d 00:00' % (n.year, n.month, n.day)) and None
-  >>> fp.close()
-  $ hg add a
-  $ hg commit -m future -d "`cat a`"
-
-  $ hg log -l1 --template '{date|age}\n'
-  7 years from now
-
-  $ cd ..
-  $ rm -rf unstable-hash
-
-Filename filters:
-
-  $ hg debugtemplate '{"foo/bar"|basename}|{"foo/"|basename}|{"foo"|basename}|\n'
-  bar||foo|
-  $ hg debugtemplate '{"foo/bar"|dirname}|{"foo/"|dirname}|{"foo"|dirname}|\n'
-  foo|foo||
-  $ hg debugtemplate '{"foo/bar"|stripdir}|{"foo/"|stripdir}|{"foo"|stripdir}|\n'
-  foo|foo|foo|
-
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a
   $ hg add a
   $ hg ci -m future
 
-Count filter:
-
-  $ hg log -l1 --template '{node|count} {node|short|count}\n'
-  40 12
-
-  $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n'
-  0 1 4
-
-  $ hg log -G --template '{rev}: children: {children|count}, \
-  > tags: {tags|count}, file_adds: {file_adds|count}, \
-  > ancestors: {revset("ancestors(%s)", rev)|count}'
-  @  9: children: 0, tags: 1, file_adds: 1, ancestors: 3
-  |
-  o  8: children: 1, tags: 0, file_adds: 2, ancestors: 2
-  |
-  o  7: children: 1, tags: 0, file_adds: 1, ancestors: 1
-  
-  o    6: children: 0, tags: 0, file_adds: 0, ancestors: 7
-  |\
-  | o  5: children: 1, tags: 0, file_adds: 1, ancestors: 5
-  | |
-  o |  4: children: 1, tags: 0, file_adds: 0, ancestors: 5
-  |/
-  o  3: children: 2, tags: 0, file_adds: 0, ancestors: 4
-  |
-  o  2: children: 1, tags: 0, file_adds: 1, ancestors: 3
-  |
-  o  1: children: 1, tags: 0, file_adds: 1, ancestors: 2
-  |
-  o  0: children: 1, tags: 0, file_adds: 1, ancestors: 1
-  
-
-  $ hg log -l1 -T '{termwidth|count}\n'
-  hg: parse error: not countable
-  (template filter 'count' is not compatible with keyword 'termwidth')
-  [255]
-
-Upper/lower filters:
-
-  $ hg log -r0 --template '{branch|upper}\n'
-  DEFAULT
-  $ hg log -r0 --template '{author|lower}\n'
-  user name <user@hostname>
-  $ hg log -r0 --template '{date|upper}\n'
-  1000000.00
-
 Add a commit that does all possible modifications at once
 
   $ echo modify >> third
@@ -1266,11 +1053,6 b' Thrown an error if a template function d'
   hg: parse error: unknown function 'foo'
   [255]
 
-Pass generator object created by template function to filter
-
-  $ hg log -l 1 --template '{if(author, author)|user}\n'
-  test
-
 Test index keyword:
 
   $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'
@@ -1281,68 +1063,6 b' Test index keyword:'
   0 default
   1 foo
 
-Test diff function:
-
-  $ hg diff -c 8
-  diff -r 29114dbae42b -r 95c24699272e fourth
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +second
-  diff -r 29114dbae42b -r 95c24699272e second
-  --- a/second	Mon Jan 12 13:46:40 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +0,0 @@
-  -second
-  diff -r 29114dbae42b -r 95c24699272e third
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/third	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +third
-
-  $ hg log -r 8 -T "{diff()}"
-  diff -r 29114dbae42b -r 95c24699272e fourth
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +second
-  diff -r 29114dbae42b -r 95c24699272e second
-  --- a/second	Mon Jan 12 13:46:40 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +0,0 @@
-  -second
-  diff -r 29114dbae42b -r 95c24699272e third
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/third	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +third
-
-  $ hg log -r 8 -T "{diff('glob:f*')}"
-  diff -r 29114dbae42b -r 95c24699272e fourth
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +second
-
-  $ hg log -r 8 -T "{diff('', 'glob:f*')}"
-  diff -r 29114dbae42b -r 95c24699272e second
-  --- a/second	Mon Jan 12 13:46:40 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +0,0 @@
-  -second
-  diff -r 29114dbae42b -r 95c24699272e third
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/third	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +third
-
-  $ hg log -r 8 -T "{diff('FOURTH'|lower)}"
-  diff -r 29114dbae42b -r 95c24699272e fourth
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
-  @@ -0,0 +1,1 @@
-  +second
-
 ui verbosity:
 
   $ hg log -l1 -T '{verbosity}\n'
@@ -1545,32 +1265,6 b' Merged tag overrides:'
   o  0: null+1,1
   
 
-  $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
-  @  11: t3, C: 9, D: 8
-  |
-  o  10: t3, C: 8, D: 7
-  |
-  o  9: t3, C: 7, D: 6
-  |
-  o  8: t3, C: 6, D: 5
-  |
-  o  7: t3, C: 5, D: 4
-  |
-  o  6: t3, C: 4, D: 3
-  |
-  o    5: t3, C: 3, D: 2
-  |\
-  | o  4: t3, C: 1, D: 1
-  | |
-  | o  3: t3, C: 0, D: 0
-  | |
-  o |  2: t1, C: 1, D: 1
-  |/
-  o  1: t1, C: 0, D: 0
-  |
-  o  0: null, C: 1, D: 1
-  
-
   $ cd ..
 
 Test new-style inline templating:
@@ -1611,122 +1305,6 b' Test new-style inline templating of non-'
   $ hg log -R latesttag -l1 -T '{max(revset("0:9")) % "{rev}:{node|short}\n"}'
   9:fbc7cd862e9c
 
-Test manifest/get() can be join()-ed as string, though it's silly:
-
-  $ hg log -R latesttag -r tip -T '{join(manifest, ".")}\n'
-  1.1.:.2.b.c.6.e.9.0.0.6.c.e.2
-  $ hg log -R latesttag -r tip -T '{join(get(extras, "branch"), ".")}\n'
-  d.e.f.a.u.l.t
-
-Test join() over string
-
-  $ hg log -R latesttag -r tip -T '{join(rev|stringify, ".")}\n'
-  1.1
-
-Test join() over uniterable
-
-  $ hg log -R latesttag -r tip -T '{join(rev, "")}\n'
-  hg: parse error: 11 is not iterable
-  [255]
-
-Test min/max of integers
-
-  $ hg log -R latesttag -l1 -T '{min(revset("9:10"))}\n'
-  9
-  $ hg log -R latesttag -l1 -T '{max(revset("9:10"))}\n'
-  10
-
-Test min/max over map operation:
-
-  $ hg log -R latesttag -r3 -T '{min(tags % "{tag}")}\n'
-  at3
-  $ hg log -R latesttag -r3 -T '{max(tags % "{tag}")}\n'
-  t3
-
-Test min/max of strings:
-
-  $ hg log -R latesttag -l1 -T '{min(desc)}\n'
-  3
-  $ hg log -R latesttag -l1 -T '{max(desc)}\n'
-  t
-
-Test min/max of non-iterable:
-
-  $ hg debugtemplate '{min(1)}'
-  hg: parse error: 1 is not iterable
-  (min first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{max(2)}'
-  hg: parse error: 2 is not iterable
-  (max first argument should be an iterable)
-  [255]
-
-  $ hg log -R latesttag -l1 -T '{min(date)}'
-  hg: parse error: date is not iterable
-  (min first argument should be an iterable)
-  [255]
-  $ hg log -R latesttag -l1 -T '{max(date)}'
-  hg: parse error: date is not iterable
-  (max first argument should be an iterable)
-  [255]
-
-Test min/max of empty sequence:
-
-  $ hg debugtemplate '{min("")}'
-  hg: parse error: empty string
-  (min first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{max("")}'
-  hg: parse error: empty string
-  (max first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{min(dict())}'
-  hg: parse error: empty sequence
-  (min first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{max(dict())}'
-  hg: parse error: empty sequence
-  (max first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{min(dict() % "")}'
-  hg: parse error: empty sequence
-  (min first argument should be an iterable)
-  [255]
-  $ hg debugtemplate '{max(dict() % "")}'
-  hg: parse error: empty sequence
-  (max first argument should be an iterable)
-  [255]
-
-Test min/max of if() result
-
-  $ cd latesttag
-  $ hg log -l1 -T '{min(if(true, revset("9:10"), ""))}\n'
-  9
-  $ hg log -l1 -T '{max(if(false, "", revset("9:10")))}\n'
-  10
-  $ hg log -l1 -T '{min(ifcontains("a", "aa", revset("9:10"), ""))}\n'
-  9
-  $ hg log -l1 -T '{max(ifcontains("a", "bb", "", revset("9:10")))}\n'
-  10
-  $ hg log -l1 -T '{min(ifeq(0, 0, revset("9:10"), ""))}\n'
-  9
-  $ hg log -l1 -T '{max(ifeq(0, 1, "", revset("9:10")))}\n'
-  10
-  $ cd ..
-
-Test laziness of if() then/else clause
-
-  $ hg debugtemplate '{count(0)}'
-  hg: parse error: not countable
-  (incompatible use of template filter 'count')
-  [255]
-  $ hg debugtemplate '{if(true, "", count(0))}'
-  $ hg debugtemplate '{if(false, count(0), "")}'
-  $ hg debugtemplate '{ifcontains("a", "aa", "", count(0))}'
-  $ hg debugtemplate '{ifcontains("a", "bb", count(0), "")}'
-  $ hg debugtemplate '{ifeq(0, 0, "", count(0))}'
-  $ hg debugtemplate '{ifeq(0, 1, count(0), "")}'
-
 Test dot operator precedence:
 
   $ hg debugtemplate -R latesttag -r0 -v '{manifest.node|short}\n'
@@ -1781,70 +1359,6 b' Test evaluation of dot operator:'
   hg: parse error: 'a' is not a dictionary
   [255]
 
-Test the sub function of templating for expansion:
-
-  $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n'
-  xx
-
-  $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n'
-  hg: parse error: sub got an invalid pattern: [
-  [255]
-  $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n'
-  hg: parse error: sub got an invalid replacement: \1
-  [255]
-
-Test the strip function with chars specified:
-
-  $ hg log -R latesttag --template '{desc}\n'
-  at3
-  t5
-  t4
-  t3
-  t2
-  t1
-  merge
-  h2e
-  h2d
-  h1c
-  b
-  a
-
-  $ hg log -R latesttag --template '{strip(desc, "te")}\n'
-  at3
-  5
-  4
-  3
-  2
-  1
-  merg
-  h2
-  h2d
-  h1c
-  b
-  a
-
-Test date format:
-
-  $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n'
-  date: 70 01 01 10 +0000
-  date: 70 01 01 09 +0000
-  date: 70 01 01 04 +0000
-  date: 70 01 01 08 +0000
-  date: 70 01 01 07 +0000
-  date: 70 01 01 06 +0000
-  date: 70 01 01 05 +0100
-  date: 70 01 01 04 +0000
-  date: 70 01 01 03 +0000
-  date: 70 01 01 02 +0000
-  date: 70 01 01 01 +0000
-  date: 70 01 01 00 +0000
-
-Test invalid date:
-
-  $ hg log -R latesttag -T '{date(rev)}\n'
-  hg: parse error: date expects a date information
-  [255]
-
 Test integer literal:
 
   $ hg debugtemplate -v '{(0)}\n'
@@ -2234,498 +1748,10 b' Test recursive evaluation:'
   $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}'
   \x1b[0;32mtext\x1b[0m (esc)
 
-color effect can be specified without quoting:
-
-  $ hg log --color=always -l 1 --template '{label(red, "text\n")}'
-  \x1b[0;31mtext\x1b[0m (esc)
-
-color effects can be nested (issue5413)
-
-  $ hg debugtemplate --color=always \
-  > '{label(red, "red{label(magenta, "ma{label(cyan, "cyan")}{label(yellow, "yellow")}genta")}")}\n'
-  \x1b[0;31mred\x1b[0;35mma\x1b[0;36mcyan\x1b[0m\x1b[0;31m\x1b[0;35m\x1b[0;33myellow\x1b[0m\x1b[0;31m\x1b[0;35mgenta\x1b[0m (esc)
-
-pad() should interact well with color codes (issue5416)
-
-  $ hg debugtemplate --color=always \
-  > '{pad(label(red, "red"), 5, label(cyan, "-"))}\n'
-  \x1b[0;31mred\x1b[0m\x1b[0;36m-\x1b[0m\x1b[0;36m-\x1b[0m (esc)
-
-label should be no-op if color is disabled:
-
-  $ hg log --color=never -l 1 --template '{label(red, "text\n")}'
-  text
-  $ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}'
-  text
-
-Test branches inside if statement:
-
-  $ hg log -r 0 --template '{if(branches, "yes", "no")}\n'
-  no
-
-Test dict constructor:
-
-  $ hg log -r 0 -T '{dict(y=node|short, x=rev)}\n'
-  y=f7769ec2ab97 x=0
-  $ hg log -r 0 -T '{dict(x=rev, y=node|short) % "{key}={value}\n"}'
-  x=0
-  y=f7769ec2ab97
-  $ hg log -r 0 -T '{dict(x=rev, y=node|short)|json}\n'
-  {"x": 0, "y": "f7769ec2ab97"}
-  $ hg log -r 0 -T '{dict()|json}\n'
-  {}
-
-  $ hg log -r 0 -T '{dict(rev, node=node|short)}\n'
-  rev=0 node=f7769ec2ab97
-  $ hg log -r 0 -T '{dict(rev, node|short)}\n'
-  rev=0 node=f7769ec2ab97
-
-  $ hg log -r 0 -T '{dict(rev, rev=rev)}\n'
-  hg: parse error: duplicated dict key 'rev' inferred
-  [255]
-  $ hg log -r 0 -T '{dict(node, node|short)}\n'
-  hg: parse error: duplicated dict key 'node' inferred
-  [255]
-  $ hg log -r 0 -T '{dict(1 + 2)}'
-  hg: parse error: dict key cannot be inferred
-  [255]
-
-  $ hg log -r 0 -T '{dict(x=rev, x=node)}'
-  hg: parse error: dict got multiple values for keyword argument 'x'
-  [255]
-
-Test get function:
-
-  $ hg log -r 0 --template '{get(extras, "branch")}\n'
-  default
-  $ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n'
-  default
-  $ hg log -r 0 --template '{get(files, "should_fail")}\n'
-  hg: parse error: not a dictionary
-  (get() expects a dict as first argument)
-  [255]
-
-Test json filter applied to wrapped object:
-
-  $ hg log -r0 -T '{files|json}\n'
-  ["a"]
-  $ hg log -r0 -T '{extras|json}\n'
-  {"branch": "default"}
-  $ hg log -r0 -T '{date|json}\n'
-  [0, 0]
-
-Test json filter applied to map result:
-
-  $ hg log -r0 -T '{json(extras % "{key}")}\n'
-  ["branch"]
-
-Test localdate(date, tz) function:
-
-  $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n'
-  1970-01-01 09:00 +0900
-  $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n'
-  1970-01-01 00:00 +0000
-  $ TZ=JST-09 hg log -r0 -T '{localdate(date, "blahUTC")|isodate}\n'
-  hg: parse error: localdate expects a timezone
-  [255]
-  $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n'
-  1970-01-01 02:00 +0200
-  $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n'
-  1970-01-01 00:00 +0000
-  $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n'
-  1970-01-01 00:00 +0000
-  $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n'
-  hg: parse error: localdate expects a timezone
-  [255]
-  $ hg log -r0 -T '{localdate(date, date)|isodate}\n'
-  hg: parse error: localdate expects a timezone
-  [255]
-
-Test shortest(node) function:
+Just one more commit:
 
   $ echo b > b
   $ hg ci -qAm b
-  $ hg log --template '{shortest(node)}\n'
-  e777
-  bcc7
-  f776
-  $ hg log --template '{shortest(node, 10)}\n'
-  e777603221
-  bcc7ff960b
-  f7769ec2ab
-  $ hg log --template '{node|shortest}\n' -l1
-  e777
-
-  $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n'
-  f7769ec2ab
-  $ hg log -r 0 -T '{shortest(node, "not an int")}\n'
-  hg: parse error: shortest() expects an integer minlength
-  [255]
-
-  $ hg log -r 'wdir()' -T '{node|shortest}\n'
-  ffff
-
-  $ hg log --template '{shortest("f")}\n' -l1
-  f
-
-  $ hg log --template '{shortest("0123456789012345678901234567890123456789")}\n' -l1
-  0123456789012345678901234567890123456789
-
-  $ hg log --template '{shortest("01234567890123456789012345678901234567890123456789")}\n' -l1
-  01234567890123456789012345678901234567890123456789
-
-  $ hg log --template '{shortest("not a hex string")}\n' -l1
-  not a hex string
-
-  $ hg log --template '{shortest("not a hex string, but it'\''s 40 bytes long")}\n' -l1
-  not a hex string, but it's 40 bytes long
-
-  $ hg log --template '{shortest("ffffffffffffffffffffffffffffffffffffffff")}\n' -l1
-  ffff
-
-  $ hg log --template '{shortest("fffffff")}\n' -l1
-  ffff
-
-  $ hg log --template '{shortest("ff")}\n' -l1
-  ffff
-
-  $ cd ..
-
-Test shortest(node) with the repo having short hash collision:
-
-  $ hg init hashcollision
-  $ cd hashcollision
-  $ cat <<EOF >> .hg/hgrc
-  > [experimental]
-  > evolution.createmarkers=True
-  > EOF
-  $ echo 0 > a
-  $ hg ci -qAm 0
-  $ for i in 17 129 248 242 480 580 617 1057 2857 4025; do
-  >   hg up -q 0
-  >   echo $i > a
-  >   hg ci -qm $i
-  > done
-  $ hg up -q null
-  $ hg log -r0: -T '{rev}:{node}\n'
-  0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
-  1:11424df6dc1dd4ea255eae2b58eaca7831973bbc
-  2:11407b3f1b9c3e76a79c1ec5373924df096f0499
-  3:11dd92fe0f39dfdaacdaa5f3997edc533875cfc4
-  4:10776689e627b465361ad5c296a20a487e153ca4
-  5:a00be79088084cb3aff086ab799f8790e01a976b
-  6:a0b0acd79b4498d0052993d35a6a748dd51d13e6
-  7:a0457b3450b8e1b778f1163b31a435802987fe5d
-  8:c56256a09cd28e5764f32e8e2810d0f01e2e357a
-  9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
-  10:c562ddd9c94164376c20b86b0b4991636a3bf84f
-  $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
-  obsoleted 1 changesets
-  $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
-  obsoleted 1 changesets
-  $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
-  obsoleted 1 changesets
-
- nodes starting with '11' (we don't have the revision number '11' though)
-
-  $ hg log -r 1:3 -T '{rev}:{shortest(node, 0)}\n'
-  1:1142
-  2:1140
-  3:11d
-
- '5:a00' is hidden, but still we have two nodes starting with 'a0'
-
-  $ hg log -r 6:7 -T '{rev}:{shortest(node, 0)}\n'
-  6:a0b
-  7:a04
-
- node '10' conflicts with the revision number '10' even if it is hidden
- (we could exclude hidden revision numbers, but currently we don't)
-
-  $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n'
-  4:107
-  $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
-  4:107
-
- node 'c562' should be unique if the other 'c562' nodes are hidden
- (but we don't try the slow path to filter out hidden nodes for now)
-
-  $ hg log -r 8 -T '{rev}:{node|shortest}\n'
-  8:c5625
-  $ hg log -r 8:10 -T '{rev}:{node|shortest}\n' --hidden
-  8:c5625
-  9:c5623
-  10:c562d
-
-  $ cd ..
-
-Test pad function
-
-  $ cd r
-
-  $ hg log --template '{pad(rev, 20)} {author|user}\n'
-  2                    test
-  1                    {node|short}
-  0                    test
-
-  $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n'
-                     2 test
-                     1 {node|short}
-                     0 test
-
-  $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n'
-  2------------------- test
-  1------------------- {node|short}
-  0------------------- test
-
-Test template string in pad function
-
-  $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n'
-  {0}        test
-
-  $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n'
-  \{rev}     test
-
-Test width argument passed to pad function
-
-  $ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n'
-  0          test
-  $ hg log -r 0 -T '{pad(rev, "not an int")}\n'
-  hg: parse error: pad() expects an integer width
-  [255]
-
-Test invalid fillchar passed to pad function
-
-  $ hg log -r 0 -T '{pad(rev, 10, "")}\n'
-  hg: parse error: pad() expects a single fill character
-  [255]
-  $ hg log -r 0 -T '{pad(rev, 10, "--")}\n'
-  hg: parse error: pad() expects a single fill character
-  [255]
-
-Test boolean argument passed to pad function
-
- no crash
-
-  $ hg log -r 0 -T '{pad(rev, 10, "-", "f{"oo"}")}\n'
-  ---------0
-
- string/literal
-
-  $ hg log -r 0 -T '{pad(rev, 10, "-", "false")}\n'
-  ---------0
-  $ hg log -r 0 -T '{pad(rev, 10, "-", false)}\n'
-  0---------
-  $ hg log -r 0 -T '{pad(rev, 10, "-", "")}\n'
-  0---------
-
- unknown keyword is evaluated to ''
-
-  $ hg log -r 0 -T '{pad(rev, 10, "-", unknownkeyword)}\n'
-  0---------
-
-Test separate function
-
-  $ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n'
-  a-b-c
-  $ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n'
-  0:f7769ec2ab97 test default
-  $ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n'
-  a \x1b[0;31mb\x1b[0m c d (esc)
-
-Test boolean expression/literal passed to if function
-
-  $ hg log -r 0 -T '{if(rev, "rev 0 is True")}\n'
-  rev 0 is True
-  $ hg log -r 0 -T '{if(0, "literal 0 is True as well")}\n'
-  literal 0 is True as well
-  $ hg log -r 0 -T '{if("", "", "empty string is False")}\n'
-  empty string is False
-  $ hg log -r 0 -T '{if(revset(r"0 - 0"), "", "empty list is False")}\n'
-  empty list is False
-  $ hg log -r 0 -T '{if(revset(r"0"), "non-empty list is True")}\n'
-  non-empty list is True
-  $ hg log -r 0 -T '{if(revset(r"0") % "", "list of empty strings is True")}\n'
-  list of empty strings is True
-  $ hg log -r 0 -T '{if(true, "true is True")}\n'
-  true is True
-  $ hg log -r 0 -T '{if(false, "", "false is False")}\n'
-  false is False
-  $ hg log -r 0 -T '{if("false", "non-empty string is True")}\n'
-  non-empty string is True
-
-Test ifcontains function
-
-  $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n'
-  2 is in the string
-  1 is not
-  0 is in the string
-
-  $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n'
-  2 is in the string
-  1 is not
-  0 is in the string
-
-  $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n'
-  2 did not add a
-  1 did not add a
-  0 added a
-
-  $ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n'
-  2 is parent of 1
-  1
-  0
-
-  $ hg log -l1 -T '{ifcontains("branch", extras, "t", "f")}\n'
-  t
-  $ hg log -l1 -T '{ifcontains("branch", extras % "{key}", "t", "f")}\n'
-  t
-  $ hg log -l1 -T '{ifcontains("branc", extras % "{key}", "t", "f")}\n'
-  f
-  $ hg log -l1 -T '{ifcontains("branc", stringify(extras % "{key}"), "t", "f")}\n'
-  t
-
-Test revset function
-
-  $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n'
-  2 current rev
-  1 not current rev
-  0 not current rev
-
-  $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n'
-  2 match rev
-  1 match rev
-  0 not match rev
-
-  $ hg log -T '{ifcontains(desc, revset(":"), "", "type not match")}\n' -l1
-  type not match
-
-  $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n'
-  2 Parents: 1
-  1 Parents: 0
-  0 Parents: 
-
-  $ cat >> .hg/hgrc <<EOF
-  > [revsetalias]
-  > myparents(\$1) = parents(\$1)
-  > EOF
-  $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n'
-  2 Parents: 1
-  1 Parents: 0
-  0 Parents: 
-
-  $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n'
-  Rev: 2
-  Ancestor: 0
-  Ancestor: 1
-  Ancestor: 2
-  
-  Rev: 1
-  Ancestor: 0
-  Ancestor: 1
-  
-  Rev: 0
-  Ancestor: 0
-  
-  $ hg log --template '{revset("TIP"|lower)}\n' -l1
-  2
-
-  $ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1
-  2
-
- a list template is evaluated for each item of revset/parents
-
-  $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n'
-  2 p: 1:bcc7ff960b8e
-  1 p: 0:f7769ec2ab97
-  0 p: 
-
-  $ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n'
-  2 p: 1:bcc7ff960b8e -1:000000000000
-  1 p: 0:f7769ec2ab97 -1:000000000000
-  0 p: -1:000000000000 -1:000000000000
-
- therefore, 'revcache' should be recreated for each rev
-
-  $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n'
-  2 aa b
-  p 
-  1 
-  p a
-  0 a
-  p 
-
-  $ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n'
-  2 aa b
-  p 
-  1 
-  p a
-  0 a
-  p 
-
-a revset item must be evaluated as an integer revision, not an offset from tip
-
-  $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n'
-  -1:000000000000
-  $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n'
-  -1:000000000000
-
-join() should pick '{rev}' from revset items:
-
-  $ hg log -R ../a -T '{join(revset("parents(%d)", rev), ", ")}\n' -r6
-  4, 5
-
-on the other hand, parents are formatted as '{rev}:{node|formatnode}' by
-default. join() should agree with the default formatting:
-
-  $ hg log -R ../a -T '{join(parents, ", ")}\n' -r6
-  5:13207e5a10d9, 4:bbe44766e73d
-
-  $ hg log -R ../a -T '{join(parents, ",\n")}\n' -r6 --debug
-  5:13207e5a10d9fd28ec424934298e176197f2c67f,
-  4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
-
-Invalid arguments passed to revset()
-
-  $ hg log -T '{revset("%whatever", 0)}\n'
-  hg: parse error: unexpected revspec format character w
-  [255]
-  $ hg log -T '{revset("%lwhatever", files)}\n'
-  hg: parse error: unexpected revspec format character w
-  [255]
-  $ hg log -T '{revset("%s %s", 0)}\n'
-  hg: parse error: missing argument for revspec
-  [255]
-  $ hg log -T '{revset("", 0)}\n'
-  hg: parse error: too many revspec arguments specified
-  [255]
-  $ hg log -T '{revset("%s", 0, 1)}\n'
-  hg: parse error: too many revspec arguments specified
-  [255]
-  $ hg log -T '{revset("%", 0)}\n'
-  hg: parse error: incomplete revspec format character
-  [255]
-  $ hg log -T '{revset("%l", 0)}\n'
-  hg: parse error: incomplete revspec format character
-  [255]
-  $ hg log -T '{revset("%d", 'foo')}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
-  $ hg log -T '{revset("%ld", files)}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
-  $ hg log -T '{revset("%ls", 0)}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
-  $ hg log -T '{revset("%b", 'foo')}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
-  $ hg log -T '{revset("%lb", files)}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
-  $ hg log -T '{revset("%r", 0)}\n'
-  hg: parse error: invalid argument for revspec
-  [255]
 
 Test 'originalnode'
 
@@ -2734,41 +1760,6 b" Test 'originalnode'"
   $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
   a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
 
-Test files function
-
-  $ hg log -T "{rev}\n{join(files('*'), '\n')}\n"
-  2
-  a
-  aa
-  b
-  1
-  a
-  0
-  a
-
-  $ hg log -T "{rev}\n{join(files('aa'), '\n')}\n"
-  2
-  aa
-  1
-  
-  0
-  
-  $ hg rm a
-  $ hg log -r "wdir()" -T "{rev}\n{join(files('*'), '\n')}\n"
-  2147483647
-  aa
-  b
-  $ hg revert a
-
-Test relpath function
-
-  $ hg log -r0 -T '{files % "{file|relpath}\n"}'
-  a
-  $ cd ..
-  $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}'
-  r/a
-  $ cd r
-
 Test active bookmark templating
 
   $ hg book foo
@@ -2848,75 +1839,7 b' Test namespaces dict'
   bar
   foo
 
-Test stringify on sub expressions
-
   $ cd ..
-  $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n'
-  fourth, second, third
-  $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n'
-  abc
-
-Test splitlines
-
-  $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}"
-  @  foo Modify, add, remove, rename
-  |
-  o  foo future
-  |
-  o  foo third
-  |
-  o  foo second
-  
-  o    foo merge
-  |\
-  | o  foo new head
-  | |
-  o |  foo new branch
-  |/
-  o  foo no user, no domain
-  |
-  o  foo no person
-  |
-  o  foo other 1
-  |  foo other 2
-  |  foo
-  |  foo other 3
-  o  foo line 1
-     foo line 2
-
-  $ hg log -R a -r0 -T '{desc|splitlines}\n'
-  line 1 line 2
-  $ hg log -R a -r0 -T '{join(desc|splitlines, "|")}\n'
-  line 1|line 2
-
-Test startswith
-  $ hg log -Gv -R a --template "{startswith(desc)}"
-  hg: parse error: startswith expects two arguments
-  [255]
-
-  $ hg log -Gv -R a --template "{startswith('line', desc)}"
-  @
-  |
-  o
-  |
-  o
-  |
-  o
-  
-  o
-  |\
-  | o
-  | |
-  o |
-  |/
-  o
-  |
-  o
-  |
-  o
-  |
-  o  line 1
-     line 2
 
 Test bad template with better error message
 
@@ -2924,102 +1847,6 b' Test bad template with better error mess'
   hg: parse error: expected a symbol, got 'func'
   [255]
 
-Test word function (including index out of bounds graceful failure)
-
-  $ hg log -Gv -R a --template "{word('1', desc)}"
-  @  add,
-  |
-  o
-  |
-  o
-  |
-  o
-  
-  o
-  |\
-  | o  head
-  | |
-  o |  branch
-  |/
-  o  user,
-  |
-  o  person
-  |
-  o  1
-  |
-  o  1
-  
-
-Test word third parameter used as splitter
-
-  $ hg log -Gv -R a --template "{word('0', desc, 'o')}"
-  @  M
-  |
-  o  future
-  |
-  o  third
-  |
-  o  sec
-  
-  o    merge
-  |\
-  | o  new head
-  | |
-  o |  new branch
-  |/
-  o  n
-  |
-  o  n
-  |
-  o
-  |
-  o  line 1
-     line 2
-
-Test word error messages for not enough and too many arguments
-
-  $ hg log -Gv -R a --template "{word('0')}"
-  hg: parse error: word expects two or three arguments, got 1
-  [255]
-
-  $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}"
-  hg: parse error: word expects two or three arguments, got 7
-  [255]
-
-Test word for integer literal
-
-  $ hg log -R a --template "{word(2, desc)}\n" -r0
-  line
-
-Test word for invalid numbers
-
-  $ hg log -Gv -R a --template "{word('a', desc)}"
-  hg: parse error: word expects an integer index
-  [255]
-
-Test word for out of range
-
-  $ hg log -R a --template "{word(10000, desc)}"
-  $ hg log -R a --template "{word(-10000, desc)}"
-
-Test indent and not adding to empty lines
-
-  $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a
-  -----
-   > line 1
-  >> line 2
-  -----
-   > other 1
-  >> other 2
-  
-  >> other 3
-
-Test with non-strings like dates
-
-  $ hg log -T "{indent(date, '   ')}\n" -r 2:3 -R a
-     1200000.00
-     1300000.00
-
 Test broken string escapes:
 
   $ hg log -T "bogus\\" -R a
@@ -3029,11 +1856,6 b' Test broken string escapes:'
   hg: parse error: invalid \x escape* (glob)
   [255]
 
-json filter should escape HTML tags so that the output can be embedded in hgweb:
-
-  $ hg log -T "{'<[e-mail]>'|json}\n" -R a -l1
-  "\[e-mail]\u003e"
-
 Templater supports aliases of symbol and func() styles:
 
   $ hg clone -q a aliases
@@ -3162,57 +1984,6 b' Unparsable alias:'
 
   $ cd ..
 
-Set up repository for non-ascii encoding tests:
-
-  $ hg init nonascii
-  $ cd nonascii
-  $ $PYTHON <<EOF
-  > open('latin1', 'wb').write(b'\xe9')
-  > open('utf-8', 'wb').write(b'\xc3\xa9')
-  > EOF
-  $ HGENCODING=utf-8 hg branch -q `cat utf-8`
-  $ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8
-
-json filter should try round-trip conversion to utf-8:
-
-  $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0
-  "\u00e9"
-  $ HGENCODING=ascii hg log -T "{desc|json}\n" -r0
-  "non-ascii branch: \u00e9"
-
-json filter should take input as utf-8 if it was converted from utf-8:
-
-  $ HGENCODING=latin-1 hg log -T "{branch|json}\n" -r0
-  "\u00e9"
-  $ HGENCODING=latin-1 hg log -T "{desc|json}\n" -r0
-  "non-ascii branch: \u00e9"
-
-json filter takes input as utf-8b:
-
-  $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1
-  "\u00e9"
-  $ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1
-  "\udce9"
-
-utf8 filter:
-
-  $ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0
-  round-trip: c3a9
-  $ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1
-  decoded: c3a9
-  $ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1
-  abort: decoding near * (glob)
-  [255]
-  $ hg log -T "coerced to string: {rev|utf8}\n" -r0
-  coerced to string: 0
-
-pad width:
-
-  $ HGENCODING=utf-8 hg debugtemplate "{pad('`cat utf-8`', 2, '-')}\n"
-  \xc3\xa9- (esc)
-
-  $ cd ..
-
 Test that template function in extension is registered as expected
 
   $ cd a

tests/test-template-functions.t

@@ -1,3 +1,6 b''
+Test template filters and functions
+===================================
+
   $ hg init a
   $ cd a
   $ echo a > a
@@ -29,165 +32,6 b''
   $ hg merge -q foo
   $ hg commit -m 'merge' -d '1500001 0' -u 'person'
 
-Test arithmetic operators have the right precedence:
-
-  $ hg log -l 1 -T '{date(date, "%Y") + 5 * 10} {date(date, "%Y") - 2 * 3}\n'
-  2020 1964
-  $ hg log -l 1 -T '{date(date, "%Y") * 5 + 10} {date(date, "%Y") * 3 - 2}\n'
-  9860 5908
-
-Test division:
-
-  $ hg debugtemplate -r0 -v '{5 / 2} {mod(5, 2)}\n'
-  (template
-    (/
-      (integer '5')
-      (integer '2'))
-    (string ' ')
-    (func
-      (symbol 'mod')
-      (list
-        (integer '5')
-        (integer '2')))
-    (string '\n'))
-  * keywords: 
-  * functions: mod
-  2 1
-  $ hg debugtemplate -r0 -v '{5 / -2} {mod(5, -2)}\n'
-  (template
-    (/
-      (integer '5')
-      (negate
-        (integer '2')))
-    (string ' ')
-    (func
-      (symbol 'mod')
-      (list
-        (integer '5')
-        (negate
-          (integer '2'))))
-    (string '\n'))
-  * keywords: 
-  * functions: mod
-  -3 -1
-  $ hg debugtemplate -r0 -v '{-5 / 2} {mod(-5, 2)}\n'
-  (template
-    (/
-      (negate
-        (integer '5'))
-      (integer '2'))
-    (string ' ')
-    (func
-      (symbol 'mod')
-      (list
-        (negate
-          (integer '5'))
-        (integer '2')))
-    (string '\n'))
-  * keywords: 
-  * functions: mod
-  -3 1
-  $ hg debugtemplate -r0 -v '{-5 / -2} {mod(-5, -2)}\n'
-  (template
-    (/
-      (negate
-        (integer '5'))
-      (negate
-        (integer '2')))
-    (string ' ')
-    (func
-      (symbol 'mod')
-      (list
-        (negate
-          (integer '5'))
-        (negate
-          (integer '2'))))
-    (string '\n'))
-  * keywords: 
-  * functions: mod
-  2 -1
-
-Filters bind closer than arithmetic:
-
-  $ hg debugtemplate -r0 -v '{revset(".")|count - 1}\n'
-  (template
-    (-
-      (|
-        (func
-          (symbol 'revset')
-          (string '.'))
-        (symbol 'count'))
-      (integer '1'))
-    (string '\n'))
-  * keywords: 
-  * functions: count, revset
-  0
-
-But negate binds closer still:
-
-  $ hg debugtemplate -r0 -v '{1-3|stringify}\n'
-  (template
-    (-
-      (integer '1')
-      (|
-        (integer '3')
-        (symbol 'stringify')))
-    (string '\n'))
-  * keywords: 
-  * functions: stringify
-  hg: parse error: arithmetic only defined on integers
-  [255]
-  $ hg debugtemplate -r0 -v '{-3|stringify}\n'
-  (template
-    (|
-      (negate
-        (integer '3'))
-      (symbol 'stringify'))
-    (string '\n'))
-  * keywords: 
-  * functions: stringify
-  -3
-
-Filters bind as close as map operator:
-
-  $ hg debugtemplate -r0 -v '{desc|splitlines % "{line}\n"}'
-  (template
-    (%
-      (|
-        (symbol 'desc')
-        (symbol 'splitlines'))
-      (template
-        (symbol 'line')
-        (string '\n'))))
-  * keywords: desc, line
-  * functions: splitlines
-  line 1
-  line 2
-
-Keyword arguments:
-
-  $ hg debugtemplate -r0 -v '{foo=bar|baz}'
-  (template
-    (keyvalue
-      (symbol 'foo')
-      (|
-        (symbol 'bar')
-        (symbol 'baz'))))
-  * keywords: bar, foo
-  * functions: baz
-  hg: parse error: can't use a key-value pair in this context
-  [255]
-
-  $ hg debugtemplate '{pad("foo", width=10, left=true)}\n'
-         foo
-
-Call function which takes named arguments by filter syntax:
-
-  $ hg debugtemplate '{" "|separate}'
-  $ hg debugtemplate '{("not", "an", "argument", "list")|separate}'
-  hg: parse error: unknown method 'list'
-  [255]
-
 Second branch starting at nullrev:
 
   $ hg update null
@@ -202,732 +46,8 b' Second branch starting at nullrev:'
   $ hg mv second fourth
   $ hg commit -m third -d "2020-01-01 10:01"
 
-  $ hg log --template '{join(file_copies, ",\n")}\n' -r .
-  fourth (second)
-  $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r .
-  second -> fourth
-  $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7
-  8 t
-  7 f
-
-Working-directory revision has special identifiers, though they are still
-experimental:
-
-  $ hg log -r 'wdir()' -T '{rev}:{node}\n'
-  2147483647:ffffffffffffffffffffffffffffffffffffffff
-
-Some keywords are invalid for working-directory revision, but they should
-never cause crash:
-
-  $ hg log -r 'wdir()' -T '{manifest}\n'
-  
-
-Internal resources shouldn't be exposed (issue5699):
-
-  $ hg log -r. -T '{cache}{ctx}{repo}{revcache}{templ}{ui}'
-
-Never crash on internal resource not available:
-
-  $ hg --cwd .. debugtemplate '{"c0bebeef"|shortest}\n'
-  abort: template resource not available: repo
-  [255]
-
-  $ hg config -T '{author}'
-
-Quoting for ui.logtemplate
-
-  $ hg tip --config "ui.logtemplate={rev}\n"
-  8
-  $ hg tip --config "ui.logtemplate='{rev}\n'"
-  8
-  $ hg tip --config 'ui.logtemplate="{rev}\n"'
-  8
-  $ hg tip --config 'ui.logtemplate=n{rev}\n'
-  n8
-
-Check that recursive reference does not fall into RuntimeError (issue4758):
-
- common mistake:
-
-  $ cat << EOF > issue4758
-  > changeset = '{changeset}\n'
-  > EOF
-  $ hg log --style ./issue4758
-  abort: recursive reference 'changeset' in template
-  [255]
-
- circular reference:
-
-  $ cat << EOF > issue4758
-  > changeset = '{foo}'
-  > foo = '{changeset}'
-  > EOF
-  $ hg log --style ./issue4758
-  abort: recursive reference 'foo' in template
-  [255]
-
- buildmap() -> gettemplate(), where no thunk was made:
-
-  $ cat << EOF > issue4758
-  > changeset = '{files % changeset}\n'
-  > EOF
-  $ hg log --style ./issue4758
-  abort: recursive reference 'changeset' in template
-  [255]
-
- not a recursion if a keyword of the same name exists:
-
-  $ cat << EOF > issue4758
-  > changeset = '{tags % rev}'
-  > rev = '{rev} {tag}\n'
-  > EOF
-  $ hg log --style ./issue4758 -r tip
-  8 tip
-
-Check that {phase} works correctly on parents:
-
-  $ cat << EOF > parentphase
-  > changeset_debug = '{rev} ({phase}):{parents}\n'
-  > parent = ' {rev} ({phase})'
-  > EOF
   $ hg phase -r 5 --public
   $ hg phase -r 7 --secret --force
-  $ hg log --debug -G --style ./parentphase
-  @  8 (secret): 7 (secret) -1 (public)
-  |
-  o  7 (secret): -1 (public) -1 (public)
-  
-  o    6 (draft): 5 (public) 4 (draft)
-  |\
-  | o  5 (public): 3 (public) -1 (public)
-  | |
-  o |  4 (draft): 3 (public) -1 (public)
-  |/
-  o  3 (public): 2 (public) -1 (public)
-  |
-  o  2 (public): 1 (public) -1 (public)
-  |
-  o  1 (public): 0 (public) -1 (public)
-  |
-  o  0 (public): -1 (public) -1 (public)
-  
-
-Keys work:
-
-  $ for key in author branch branches date desc file_adds file_dels file_mods \
-  >         file_copies file_copies_switch files \
-  >         manifest node parents rev tags diffstat extras \
-  >         p1rev p2rev p1node p2node; do
-  >     for mode in '' --verbose --debug; do
-  >         hg log $mode --template "$key$mode: {$key}\n"
-  >     done
-  > done
-  author: test
-  author: User Name <user@hostname>
-  author: person
-  author: person
-  author: person
-  author: person
-  author: other@place
-  author: A. N. Other <other@place>
-  author: User Name <user@hostname>
-  author--verbose: test
-  author--verbose: User Name <user@hostname>
-  author--verbose: person
-  author--verbose: person
-  author--verbose: person
-  author--verbose: person
-  author--verbose: other@place
-  author--verbose: A. N. Other <other@place>
-  author--verbose: User Name <user@hostname>
-  author--debug: test
-  author--debug: User Name <user@hostname>
-  author--debug: person
-  author--debug: person
-  author--debug: person
-  author--debug: person
-  author--debug: other@place
-  author--debug: A. N. Other <other@place>
-  author--debug: User Name <user@hostname>
-  branch: default
-  branch: default
-  branch: default
-  branch: default
-  branch: foo
-  branch: default
-  branch: default
-  branch: default
-  branch: default
-  branch--verbose: default
-  branch--verbose: default
-  branch--verbose: default
-  branch--verbose: default
-  branch--verbose: foo
-  branch--verbose: default
-  branch--verbose: default
-  branch--verbose: default
-  branch--verbose: default
-  branch--debug: default
-  branch--debug: default
-  branch--debug: default
-  branch--debug: default
-  branch--debug: foo
-  branch--debug: default
-  branch--debug: default
-  branch--debug: default
-  branch--debug: default
-  branches: 
-  branches: 
-  branches: 
-  branches: 
-  branches: foo
-  branches: 
-  branches: 
-  branches: 
-  branches: 
-  branches--verbose: 
-  branches--verbose: 
-  branches--verbose: 
-  branches--verbose: 
-  branches--verbose: foo
-  branches--verbose: 
-  branches--verbose: 
-  branches--verbose: 
-  branches--verbose: 
-  branches--debug: 
-  branches--debug: 
-  branches--debug: 
-  branches--debug: 
-  branches--debug: foo
-  branches--debug: 
-  branches--debug: 
-  branches--debug: 
-  branches--debug: 
-  date: 1577872860.00
-  date: 1000000.00
-  date: 1500001.00
-  date: 1500000.00
-  date: 1400000.00
-  date: 1300000.00
-  date: 1200000.00
-  date: 1100000.00
-  date: 1000000.00
-  date--verbose: 1577872860.00
-  date--verbose: 1000000.00
-  date--verbose: 1500001.00
-  date--verbose: 1500000.00
-  date--verbose: 1400000.00
-  date--verbose: 1300000.00
-  date--verbose: 1200000.00
-  date--verbose: 1100000.00
-  date--verbose: 1000000.00
-  date--debug: 1577872860.00
-  date--debug: 1000000.00
-  date--debug: 1500001.00
-  date--debug: 1500000.00
-  date--debug: 1400000.00
-  date--debug: 1300000.00
-  date--debug: 1200000.00
-  date--debug: 1100000.00
-  date--debug: 1000000.00
-  desc: third
-  desc: second
-  desc: merge
-  desc: new head
-  desc: new branch
-  desc: no user, no domain
-  desc: no person
-  desc: other 1
-  other 2
-  
-  other 3
-  desc: line 1
-  line 2
-  desc--verbose: third
-  desc--verbose: second
-  desc--verbose: merge
-  desc--verbose: new head
-  desc--verbose: new branch
-  desc--verbose: no user, no domain
-  desc--verbose: no person
-  desc--verbose: other 1
-  other 2
-  
-  other 3
-  desc--verbose: line 1
-  line 2
-  desc--debug: third
-  desc--debug: second
-  desc--debug: merge
-  desc--debug: new head
-  desc--debug: new branch
-  desc--debug: no user, no domain
-  desc--debug: no person
-  desc--debug: other 1
-  other 2
-  
-  other 3
-  desc--debug: line 1
-  line 2
-  file_adds: fourth third
-  file_adds: second
-  file_adds: 
-  file_adds: d
-  file_adds: 
-  file_adds: 
-  file_adds: c
-  file_adds: b
-  file_adds: a
-  file_adds--verbose: fourth third
-  file_adds--verbose: second
-  file_adds--verbose: 
-  file_adds--verbose: d
-  file_adds--verbose: 
-  file_adds--verbose: 
-  file_adds--verbose: c
-  file_adds--verbose: b
-  file_adds--verbose: a
-  file_adds--debug: fourth third
-  file_adds--debug: second
-  file_adds--debug: 
-  file_adds--debug: d
-  file_adds--debug: 
-  file_adds--debug: 
-  file_adds--debug: c
-  file_adds--debug: b
-  file_adds--debug: a
-  file_dels: second
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels: 
-  file_dels--verbose: second
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--verbose: 
-  file_dels--debug: second
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_dels--debug: 
-  file_mods: 
-  file_mods: 
-  file_mods: 
-  file_mods: 
-  file_mods: 
-  file_mods: c
-  file_mods: 
-  file_mods: 
-  file_mods: 
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--verbose: c
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--verbose: 
-  file_mods--debug: 
-  file_mods--debug: 
-  file_mods--debug: 
-  file_mods--debug: 
-  file_mods--debug: 
-  file_mods--debug: c
-  file_mods--debug: 
-  file_mods--debug: 
-  file_mods--debug: 
-  file_copies: fourth (second)
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies: 
-  file_copies--verbose: fourth (second)
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--verbose: 
-  file_copies--debug: fourth (second)
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies--debug: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--verbose: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  file_copies_switch--debug: 
-  files: fourth second third
-  files: second
-  files: 
-  files: d
-  files: 
-  files: c
-  files: c
-  files: b
-  files: a
-  files--verbose: fourth second third
-  files--verbose: second
-  files--verbose: 
-  files--verbose: d
-  files--verbose: 
-  files--verbose: c
-  files--verbose: c
-  files--verbose: b
-  files--verbose: a
-  files--debug: fourth second third
-  files--debug: second
-  files--debug: 
-  files--debug: d
-  files--debug: 
-  files--debug: c
-  files--debug: c
-  files--debug: b
-  files--debug: a
-  manifest: 6:94961b75a2da
-  manifest: 5:f2dbc354b94e
-  manifest: 4:4dc3def4f9b4
-  manifest: 4:4dc3def4f9b4
-  manifest: 3:cb5a1327723b
-  manifest: 3:cb5a1327723b
-  manifest: 2:6e0e82995c35
-  manifest: 1:4e8d705b1e53
-  manifest: 0:a0c8bcbbb45c
-  manifest--verbose: 6:94961b75a2da
-  manifest--verbose: 5:f2dbc354b94e
-  manifest--verbose: 4:4dc3def4f9b4
-  manifest--verbose: 4:4dc3def4f9b4
-  manifest--verbose: 3:cb5a1327723b
-  manifest--verbose: 3:cb5a1327723b
-  manifest--verbose: 2:6e0e82995c35
-  manifest--verbose: 1:4e8d705b1e53
-  manifest--verbose: 0:a0c8bcbbb45c
-  manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
-  manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
-  manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
-  manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
-  manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
-  manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
-  manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
-  manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
-  manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
-  node: 95c24699272ef57d062b8bccc32c878bf841784a
-  node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
-  node: 13207e5a10d9fd28ec424934298e176197f2c67f
-  node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  node: 97054abb4ab824450e9164180baf491ae0078465
-  node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  node: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
-  node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
-  node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
-  node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  node--verbose: 97054abb4ab824450e9164180baf491ae0078465
-  node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
-  node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
-  node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
-  node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  node--debug: 97054abb4ab824450e9164180baf491ae0078465
-  node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  parents: 
-  parents: -1:000000000000 
-  parents: 5:13207e5a10d9 4:bbe44766e73d 
-  parents: 3:10e46f2dcbf4 
-  parents: 
-  parents: 
-  parents: 
-  parents: 
-  parents: 
-  parents--verbose: 
-  parents--verbose: -1:000000000000 
-  parents--verbose: 5:13207e5a10d9 4:bbe44766e73d 
-  parents--verbose: 3:10e46f2dcbf4 
-  parents--verbose: 
-  parents--verbose: 
-  parents--verbose: 
-  parents--verbose: 
-  parents--verbose: 
-  parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 
-  parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
-  parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 
-  parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
-  parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
-  parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
-  parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
-  parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
-  parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
-  rev: 8
-  rev: 7
-  rev: 6
-  rev: 5
-  rev: 4
-  rev: 3
-  rev: 2
-  rev: 1
-  rev: 0
-  rev--verbose: 8
-  rev--verbose: 7
-  rev--verbose: 6
-  rev--verbose: 5
-  rev--verbose: 4
-  rev--verbose: 3
-  rev--verbose: 2
-  rev--verbose: 1
-  rev--verbose: 0
-  rev--debug: 8
-  rev--debug: 7
-  rev--debug: 6
-  rev--debug: 5
-  rev--debug: 4
-  rev--debug: 3
-  rev--debug: 2
-  rev--debug: 1
-  rev--debug: 0
-  tags: tip
-  tags: 
-  tags: 
-  tags: 
-  tags: 
-  tags: 
-  tags: 
-  tags: 
-  tags: 
-  tags--verbose: tip
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--verbose: 
-  tags--debug: tip
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  tags--debug: 
-  diffstat: 3: +2/-1
-  diffstat: 1: +1/-0
-  diffstat: 0: +0/-0
-  diffstat: 1: +1/-0
-  diffstat: 0: +0/-0
-  diffstat: 1: +1/-0
-  diffstat: 1: +4/-0
-  diffstat: 1: +2/-0
-  diffstat: 1: +1/-0
-  diffstat--verbose: 3: +2/-1
-  diffstat--verbose: 1: +1/-0
-  diffstat--verbose: 0: +0/-0
-  diffstat--verbose: 1: +1/-0
-  diffstat--verbose: 0: +0/-0
-  diffstat--verbose: 1: +1/-0
-  diffstat--verbose: 1: +4/-0
-  diffstat--verbose: 1: +2/-0
-  diffstat--verbose: 1: +1/-0
-  diffstat--debug: 3: +2/-1
-  diffstat--debug: 1: +1/-0
-  diffstat--debug: 0: +0/-0
-  diffstat--debug: 1: +1/-0
-  diffstat--debug: 0: +0/-0
-  diffstat--debug: 1: +1/-0
-  diffstat--debug: 1: +4/-0
-  diffstat--debug: 1: +2/-0
-  diffstat--debug: 1: +1/-0
-  extras: branch=default
-  extras: branch=default
-  extras: branch=default
-  extras: branch=default
-  extras: branch=foo
-  extras: branch=default
-  extras: branch=default
-  extras: branch=default
-  extras: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=foo
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--verbose: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=foo
-  extras--debug: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=default
-  extras--debug: branch=default
-  p1rev: 7
-  p1rev: -1
-  p1rev: 5
-  p1rev: 3
-  p1rev: 3
-  p1rev: 2
-  p1rev: 1
-  p1rev: 0
-  p1rev: -1
-  p1rev--verbose: 7
-  p1rev--verbose: -1
-  p1rev--verbose: 5
-  p1rev--verbose: 3
-  p1rev--verbose: 3
-  p1rev--verbose: 2
-  p1rev--verbose: 1
-  p1rev--verbose: 0
-  p1rev--verbose: -1
-  p1rev--debug: 7
-  p1rev--debug: -1
-  p1rev--debug: 5
-  p1rev--debug: 3
-  p1rev--debug: 3
-  p1rev--debug: 2
-  p1rev--debug: 1
-  p1rev--debug: 0
-  p1rev--debug: -1
-  p2rev: -1
-  p2rev: -1
-  p2rev: 4
-  p2rev: -1
-  p2rev: -1
-  p2rev: -1
-  p2rev: -1
-  p2rev: -1
-  p2rev: -1
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--verbose: 4
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--verbose: -1
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p2rev--debug: 4
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p2rev--debug: -1
-  p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  p1node: 0000000000000000000000000000000000000000
-  p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
-  p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node: 97054abb4ab824450e9164180baf491ae0078465
-  p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  p1node: 0000000000000000000000000000000000000000
-  p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  p1node--verbose: 0000000000000000000000000000000000000000
-  p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
-  p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
-  p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  p1node--verbose: 0000000000000000000000000000000000000000
-  p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
-  p1node--debug: 0000000000000000000000000000000000000000
-  p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
-  p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
-  p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
-  p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
-  p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
-  p1node--debug: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--verbose: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
-  p2node--debug: 0000000000000000000000000000000000000000
 
 Filters work:
 
@@ -1157,130 +277,11 b' Add a commit that does all possible modi'
   $ hg rm a
   $ hg ci -m "Modify, add, remove, rename"
 
-Error on syntax:
-
-  $ cat <<EOF > t
-  > changeset = '{c}'
-  > c = q
-  > x = "f
-  > EOF
-  $ echo '[ui]' > .hg/hgrc
-  $ echo 'style = t' >> .hg/hgrc
-  $ hg log
-  hg: parse error at t:3: unmatched quotes
-  [255]
-
-  $ hg log -T '{date'
-  hg: parse error at 1: unterminated template expansion
-  ({date
-    ^ here)
-  [255]
-  $ hg log -T '{date(}'
-  hg: parse error at 6: not a prefix: end
-  ({date(}
-         ^ here)
-  [255]
-  $ hg log -T '{date)}'
-  hg: parse error at 5: invalid token
-  ({date)}
-        ^ here)
-  [255]
-  $ hg log -T '{date date}'
-  hg: parse error at 6: invalid token
-  ({date date}
-         ^ here)
-  [255]
-
-  $ hg log -T '{}'
-  hg: parse error at 1: not a prefix: end
-  ({}
-    ^ here)
-  [255]
-  $ hg debugtemplate -v '{()}'
-  (template
-    (group
-      None))
-  * keywords: 
-  * functions: 
-  hg: parse error: missing argument
-  [255]
-
-Behind the scenes, this would throw TypeError without intype=bytes
-
-  $ hg log -l 3 --template '{date|obfuscate}\n'
-  &#48;&#46;&#48;&#48;
-  &#48;&#46;&#48;&#48;
-  &#49;&#53;&#55;&#55;&#56;&#55;&#50;&#56;&#54;&#48;&#46;&#48;&#48;
-
-Behind the scenes, this will throw a ValueError
-
-  $ hg log -l 3 --template 'line: {desc|shortdate}\n'
-  hg: parse error: invalid date: 'Modify, add, remove, rename'
-  (template filter 'shortdate' is not compatible with keyword 'desc')
-  [255]
-
-Behind the scenes, this would throw AttributeError without intype=bytes
-
-  $ hg log -l 3 --template 'line: {date|escape}\n'
-  line: 0.00
-  line: 0.00
-  line: 1577872860.00
-
-  $ hg log -l 3 --template 'line: {extras|localdate}\n'
-  hg: parse error: localdate expects a date information
-  [255]
-
-Behind the scenes, this will throw ValueError
-
-  $ hg tip --template '{author|email|date}\n'
-  hg: parse error: date expects a date information
-  [255]
-
-  $ hg tip -T '{author|email|shortdate}\n'
-  hg: parse error: invalid date: 'test'
-  (template filter 'shortdate' is not compatible with keyword 'author')
-  [255]
-
-  $ hg tip -T '{get(extras, "branch")|shortdate}\n'
-  hg: parse error: invalid date: 'default'
-  (incompatible use of template filter 'shortdate')
-  [255]
-
-Error in nested template:
-
-  $ hg log -T '{"date'
-  hg: parse error at 2: unterminated string
-  ({"date
-     ^ here)
-  [255]
-
-  $ hg log -T '{"foo{date|?}"}'
-  hg: parse error at 11: syntax error
-  ({"foo{date|?}"}
-              ^ here)
-  [255]
-
-Thrown an error if a template function doesn't exist
-
-  $ hg tip --template '{foo()}\n'
-  hg: parse error: unknown function 'foo'
-  [255]
-
 Pass generator object created by template function to filter
 
   $ hg log -l 1 --template '{if(author, author)|user}\n'
   test
 
-Test index keyword:
-
-  $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'
-  10 0:a 1:b 2:fifth 3:fourth 4:third
-  11 0:a
-
-  $ hg branches -T '{index} {branch}\n'
-  0 default
-  1 foo
-
 Test diff function:
 
   $ hg diff -c 8
@@ -1343,21 +344,9 b' Test diff function:'
   @@ -0,0 +1,1 @@
   +second
 
-ui verbosity:
-
-  $ hg log -l1 -T '{verbosity}\n'
-  
-  $ hg log -l1 -T '{verbosity}\n' --debug
-  debug
-  $ hg log -l1 -T '{verbosity}\n' --quiet
-  quiet
-  $ hg log -l1 -T '{verbosity}\n' --verbose
-  verbose
-
   $ cd ..
 
-
-latesttag:
+latesttag() function:
 
   $ hg init latesttag
   $ cd latesttag
@@ -1385,165 +374,12 b' latesttag:'
   $ hg merge -q
   $ hg ci -m merge -d '5 -3600'
 
-No tag set:
-
-  $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
-  @    5: null+5
-  |\
-  | o  4: null+4
-  | |
-  | o  3: null+3
-  | |
-  o |  2: null+3
-  |/
-  o  1: null+2
-  |
-  o  0: null+1
-  
-
-One common tag: longest path wins for {latesttagdistance}:
-
   $ hg tag -r 1 -m t1 -d '6 0' t1
-  $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
-  @  6: t1+4
-  |
-  o    5: t1+3
-  |\
-  | o  4: t1+2
-  | |
-  | o  3: t1+1
-  | |
-  o |  2: t1+1
-  |/
-  o  1: t1+0
-  |
-  o  0: null+1
-  
-
-One ancestor tag: closest wins:
-
   $ hg tag -r 2 -m t2 -d '7 0' t2
-  $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
-  @  7: t2+3
-  |
-  o  6: t2+2
-  |
-  o    5: t2+1
-  |\
-  | o  4: t1+2
-  | |
-  | o  3: t1+1
-  | |
-  o |  2: t2+0
-  |/
-  o  1: t1+0
-  |
-  o  0: null+1
-  
-
-Two branch tags: more recent wins if same number of changes:
-
   $ hg tag -r 3 -m t3 -d '8 0' t3
-  $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
-  @  8: t3+5
-  |
-  o  7: t3+4
-  |
-  o  6: t3+3
-  |
-  o    5: t3+2
-  |\
-  | o  4: t3+1
-  | |
-  | o  3: t3+0
-  | |
-  o |  2: t2+0
-  |/
-  o  1: t1+0
-  |
-  o  0: null+1
-  
-
-Two branch tags: fewest changes wins:
-
   $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
-  $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
-  @  9: t4+5,6
-  |
-  o  8: t4+4,5
-  |
-  o  7: t4+3,4
-  |
-  o  6: t4+2,3
-  |
-  o    5: t4+1,2
-  |\
-  | o  4: t4+0,0
-  | |
-  | o  3: t3+0,0
-  | |
-  o |  2: t2+0,0
-  |/
-  o  1: t1+0,0
-  |
-  o  0: null+1,1
-  
-
-Merged tag overrides:
-
   $ hg tag -r 5 -m t5 -d '9 0' t5
   $ hg tag -r 3 -m at3 -d '10 0' at3
-  $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
-  @  11: t5+6
-  |
-  o  10: t5+5
-  |
-  o  9: t5+4
-  |
-  o  8: t5+3
-  |
-  o  7: t5+2
-  |
-  o  6: t5+1
-  |
-  o    5: t5+0
-  |\
-  | o  4: t4+0
-  | |
-  | o  3: at3:t3+0
-  | |
-  o |  2: t2+0
-  |/
-  o  1: t1+0
-  |
-  o  0: null+1
-  
-
-  $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
-  @  11: t5+6,6
-  |
-  o  10: t5+5,5
-  |
-  o  9: t5+4,4
-  |
-  o  8: t5+3,3
-  |
-  o  7: t5+2,2
-  |
-  o  6: t5+1,1
-  |
-  o    5: t5+0,0
-  |\
-  | o  4: t4+0,0
-  | |
-  | o  3: at3+0,0 t3+0,0
-  | |
-  o |  2: t2+0,0
-  |/
-  o  1: t1+0,0
-  |
-  o  0: null+1,1
-  
 
   $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
   @  11: t3, C: 9, D: 8
@@ -1573,44 +409,6 b' Merged tag overrides:'
 
   $ cd ..
 
-Test new-style inline templating:
-
-  $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n'
-  modified files:  .hgtags
-  
-
-  $ hg log -R latesttag -r tip -T '{rev % "a"}\n'
-  hg: parse error: 11 is not iterable of mappings
-  (keyword 'rev' does not support map operation)
-  [255]
-  $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n'
-  hg: parse error: None is not iterable of mappings
-  [255]
-  $ hg log -R latesttag -r tip -T '{extras % "{key}\n" % "{key}\n"}'
-  hg: parse error: list of strings is not mappable
-  [255]
-
-Test new-style inline templating of non-list/dict type:
-
-  $ hg log -R latesttag -r tip -T '{manifest}\n'
-  11:2bc6e9006ce2
-  $ hg log -R latesttag -r tip -T 'string length: {manifest|count}\n'
-  string length: 15
-  $ hg log -R latesttag -r tip -T '{manifest % "{rev}:{node}"}\n'
-  11:2bc6e9006ce29882383a22d39fd1f4e66dd3e2fc
-
-  $ hg log -R latesttag -r tip -T '{get(extras, "branch") % "{key}: {value}\n"}'
-  branch: default
-  $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "{key}\n"}'
-  hg: parse error: None is not iterable of mappings
-  [255]
-  $ hg log -R latesttag -r tip -T '{min(extras) % "{key}: {value}\n"}'
-  branch: default
-  $ hg log -R latesttag -l1 -T '{min(revset("0:9")) % "{rev}:{node|short}\n"}'
-  0:ce3cec86e6c2
-  $ hg log -R latesttag -l1 -T '{max(revset("0:9")) % "{rev}:{node|short}\n"}'
-  9:fbc7cd862e9c
-
 Test manifest/get() can be join()-ed as string, though it's silly:
 
   $ hg log -R latesttag -r tip -T '{join(manifest, ".")}\n'
@@ -1727,60 +525,6 b' Test laziness of if() then/else clause'
   $ hg debugtemplate '{ifeq(0, 0, "", count(0))}'
   $ hg debugtemplate '{ifeq(0, 1, count(0), "")}'
 
-Test dot operator precedence:
-
-  $ hg debugtemplate -R latesttag -r0 -v '{manifest.node|short}\n'
-  (template
-    (|
-      (.
-        (symbol 'manifest')
-        (symbol 'node'))
-      (symbol 'short'))
-    (string '\n'))
-  * keywords: manifest, node, rev
-  * functions: formatnode, short
-  89f4071fec70
-
- (the following examples are invalid, but seem natural in parsing POV)
-
-  $ hg debugtemplate -R latesttag -r0 -v '{foo|bar.baz}\n' 2> /dev/null
-  (template
-    (|
-      (symbol 'foo')
-      (.
-        (symbol 'bar')
-        (symbol 'baz')))
-    (string '\n'))
-  [255]
-  $ hg debugtemplate -R latesttag -r0 -v '{foo.bar()}\n' 2> /dev/null
-  (template
-    (.
-      (symbol 'foo')
-      (func
-        (symbol 'bar')
-        None))
-    (string '\n'))
-  * keywords: foo
-  * functions: bar
-  [255]
-
-Test evaluation of dot operator:
-
-  $ hg log -R latesttag -l1 -T '{min(revset("0:9")).node}\n'
-  ce3cec86e6c26bd9bdfc590a6b92abc9680f1796
-  $ hg log -R latesttag -r0 -T '{extras.branch}\n'
-  default
-  $ hg log -R latesttag -r0 -T '{date.unixtime} {localdate(date, "+0200").tzoffset}\n'
-  0 -7200
-
-  $ hg log -R latesttag -l1 -T '{author.invalid}\n'
-  hg: parse error: 'test' is not a dictionary
-  (keyword 'author' does not support member operation)
-  [255]
-  $ hg log -R latesttag -l1 -T '{min("abc").invalid}\n'
-  hg: parse error: 'a' is not a dictionary
-  [255]
-
 Test the sub function of templating for expansion:
 
   $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n'
@@ -1845,395 +589,18 b' Test invalid date:'
   hg: parse error: date expects a date information
   [255]
 
-Test integer literal:
-
-  $ hg debugtemplate -v '{(0)}\n'
-  (template
-    (group
-      (integer '0'))
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  0
-  $ hg debugtemplate -v '{(123)}\n'
-  (template
-    (group
-      (integer '123'))
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  123
-  $ hg debugtemplate -v '{(-4)}\n'
-  (template
-    (group
-      (negate
-        (integer '4')))
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  -4
-  $ hg debugtemplate '{(-)}\n'
-  hg: parse error at 3: not a prefix: )
-  ({(-)}\n
-      ^ here)
-  [255]
-  $ hg debugtemplate '{(-a)}\n'
-  hg: parse error: negation needs an integer argument
-  [255]
-
-top-level integer literal is interpreted as symbol (i.e. variable name):
-
-  $ hg debugtemplate -D 1=one -v '{1}\n'
-  (template
-    (integer '1')
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  one
-  $ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n'
-  (template
-    (func
-      (symbol 'if')
-      (list
-        (string 't')
-        (template
-          (integer '1'))))
-    (string '\n'))
-  * keywords: 
-  * functions: if
-  one
-  $ hg debugtemplate -D 1=one -v '{1|stringify}\n'
-  (template
-    (|
-      (integer '1')
-      (symbol 'stringify'))
-    (string '\n'))
-  * keywords: 
-  * functions: stringify
-  one
-
-unless explicit symbol is expected:
-
-  $ hg log -Ra -r0 -T '{desc|1}\n'
-  hg: parse error: expected a symbol, got 'integer'
-  [255]
-  $ hg log -Ra -r0 -T '{1()}\n'
-  hg: parse error: expected a symbol, got 'integer'
-  [255]
-
-Test string literal:
-
-  $ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n'
-  (template
-    (string 'string with no template fragment')
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  string with no template fragment
-  $ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n'
-  (template
-    (template
-      (string 'template: ')
-      (symbol 'rev'))
-    (string '\n'))
-  * keywords: rev
-  * functions: 
-  template: 0
-  $ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n'
-  (template
-    (string 'rawstring: {rev}')
-    (string '\n'))
-  * keywords: 
-  * functions: 
-  rawstring: {rev}
-  $ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n'
-  (template
-    (%
-      (symbol 'files')
-      (string 'rawstring: {file}'))
-    (string '\n'))
-  * keywords: files
-  * functions: 
-  rawstring: {file}
-
-Test string escaping:
-
-  $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
-  >
-  <>\n<[>
-  <>\n<]>
-  <>\n<
-
-  $ hg log -R latesttag -r 0 \
-  > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
-  >
-  <>\n<[>
-  <>\n<]>
-  <>\n<
-
-  $ hg log -R latesttag -r 0 -T esc \
-  > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
-  >
-  <>\n<[>
-  <>\n<]>
-  <>\n<
-
-  $ cat <<'EOF' > esctmpl
-  > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
-  > EOF
-  $ hg log -R latesttag -r 0 --style ./esctmpl
-  >
-  <>\n<[>
-  <>\n<]>
-  <>\n<
-
-Test string escaping of quotes:
-
-  $ hg log -Ra -r0 -T '{"\""}\n'
-  "
-  $ hg log -Ra -r0 -T '{"\\\""}\n'
-  \"
-  $ hg log -Ra -r0 -T '{r"\""}\n'
-  \"
-  $ hg log -Ra -r0 -T '{r"\\\""}\n'
-  \\\"
-
-
-  $ hg log -Ra -r0 -T '{"\""}\n'
-  "
-  $ hg log -Ra -r0 -T '{"\\\""}\n'
-  \"
-  $ hg log -Ra -r0 -T '{r"\""}\n'
-  \"
-  $ hg log -Ra -r0 -T '{r"\\\""}\n'
-  \\\"
-
-Test exception in quoted template. single backslash before quotation mark is
-stripped before parsing:
-
-  $ cat <<'EOF' > escquotetmpl
-  > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n"
-  > EOF
-  $ cd latesttag
-  $ hg log -r 2 --style ../escquotetmpl
-  " \" \" \\" head1
-
-  $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"'
-  valid
-  $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'"
-  valid
-
-Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested
-_evalifliteral() templates (issue4733):
-
-  $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n'
-  "2
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n'
-  "2
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n'
-  "2
-
-  $ hg log -r 2 -T '{if(rev, "\\\"")}\n'
-  \"
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n'
-  \"
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
-  \"
-
-  $ hg log -r 2 -T '{if(rev, r"\\\"")}\n'
-  \\\"
-  $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n'
-  \\\"
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
-  \\\"
-
-escaped single quotes and errors:
-
-  $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n'
-  foo
-  $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n'
-  foo
-  $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n'
-  hg: parse error at 21: unterminated string
-  ({if(rev, "{if(rev, \")}")}\n
-                        ^ here)
-  [255]
-  $ hg log -r 2 -T '{if(rev, \"\\"")}\n'
-  hg: parse error: trailing \ in string
-  [255]
-  $ hg log -r 2 -T '{if(rev, r\"\\"")}\n'
-  hg: parse error: trailing \ in string
-  [255]
-
-  $ cd ..
-
-Test leading backslashes:
-
-  $ cd latesttag
-  $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n'
-  {rev} {file}
-  $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n'
-  \2 \head1
-  $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n'
-  \{rev} \{file}
-  $ cd ..
-
-Test leading backslashes in "if" expression (issue4714):
-
-  $ cd latesttag
-  $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n'
-  {rev} \{rev}
-  $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n'
-  \2 \\{rev}
-  $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n'
-  \{rev} \\\{rev}
-  $ cd ..
-
-"string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice)
-
-  $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n'
-  \x6e
-  $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n'
-  \x5c\x786e
-  $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n'
-  \x6e
-  $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n'
-  \x5c\x786e
-
-  $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n'
-  \x6e
-  $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n'
-  \x5c\x786e
-  $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n'
-  \x6e
-  $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n'
-  \x5c\x786e
-
-  $ hg log -R a -r 8 --template '{join(files, "\n")}\n'
-  fourth
-  second
-  third
-  $ hg log -R a -r 8 --template '{join(files, r"\n")}\n'
-  fourth\nsecond\nthird
-
-  $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}'
-  <p>
-  1st
-  </p>
-  <p>
-  2nd
-  </p>
-  $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}'
-  <p>
-  1st\n\n2nd
-  </p>
-  $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}'
-  1st
-  
-  2nd
-
-  $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n'
-  o perso
-  $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n'
-  no person
-  $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n'
-  o perso
-  $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n'
-  no perso
-
-  $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n'
-  -o perso-
-  $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n'
-  no person
-  $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n'
-  \x2do perso\x2d
-  $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n'
-  -o perso-
-  $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n'
-  \x2do perso\x6e
-
-  $ hg log -R a -r 8 --template '{files % "{file}\n"}'
-  fourth
-  second
-  third
-
-Test string escaping in nested expression:
-
-  $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n'
-  fourth\x6esecond\x6ethird
-  $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n'
-  fourth\x6esecond\x6ethird
-
-  $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n'
-  fourth\x6esecond\x6ethird
-  $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n'
-  fourth\x5c\x786esecond\x5c\x786ethird
-
-  $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n'
-  3:\x6eo user, \x6eo domai\x6e
-  4:\x5c\x786eew bra\x5c\x786ech
-
-Test quotes in nested expression are evaluated just like a $(command)
-substitution in POSIX shells:
-
-  $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n'
-  8:95c24699272e
-  $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n'
-  {8} "95c24699272e"
-
-Test recursive evaluation:
+Set up repository containing template fragments in commit metadata:
 
   $ hg init r
   $ cd r
   $ echo a > a
   $ hg ci -Am '{rev}'
   adding a
-  $ hg log -r 0 --template '{if(rev, desc)}\n'
-  {rev}
-  $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n'
-  test 0
 
   $ hg branch -q 'text.{rev}'
   $ echo aa >> aa
   $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
 
-  $ hg log -l1 --template '{fill(desc, "20", author, branch)}'
-  {node|short}desc to
-  text.{rev}be wrapped
-  text.{rev}desc to be
-  text.{rev}wrapped (no-eol)
-  $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}'
-  bcc7ff960b8e:desc to
-  text.1:be wrapped
-  text.1:desc to be
-  text.1:wrapped (no-eol)
-  $ hg log -l1 -T '{fill(desc, date, "", "")}\n'
-  hg: parse error: fill expects an integer width
-  [255]
-
-  $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
-  bcc7ff960b8e:desc to be
-  termwidth.1:wrapped desc
-  termwidth.1:to be wrapped (no-eol)
-
-  $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}'
-  {node|short} (no-eol)
-  $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}'
-  bcc-ff---b-e (no-eol)
-
-  $ cat >> .hg/hgrc <<EOF
-  > [extensions]
-  > color=
-  > [color]
-  > mode=ansi
-  > text.{rev} = red
-  > text.1 = green
-  > EOF
-  $ hg log --color=always -l 1 --template '{label(branch, "text\n")}'
-  \x1b[0;31mtext\x1b[0m (esc)
-  $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}'
-  \x1b[0;32mtext\x1b[0m (esc)
-
 color effect can be specified without quoting:
 
   $ hg log --color=always -l 1 --template '{label(red, "text\n")}'
@@ -2727,13 +1094,6 b' Invalid arguments passed to revset()'
   hg: parse error: invalid argument for revspec
   [255]
 
-Test 'originalnode'
-
-  $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n'
-  000000000000 bcc7ff960b8e
-  $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
-  a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
-
 Test files function
 
   $ hg log -T "{rev}\n{join(files('*'), '\n')}\n"
@@ -2767,90 +1127,9 b' Test relpath function'
   $ cd ..
   $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}'
   r/a
-  $ cd r
-
-Test active bookmark templating
-
-  $ hg book foo
-  $ hg book bar
-  $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
-  2 bar* foo 
-  1 
-  0 
-  $ hg log --template "{rev} {activebookmark}\n"
-  2 bar
-  1 
-  0 
-  $ hg bookmarks --inactive bar
-  $ hg log --template "{rev} {activebookmark}\n"
-  2 
-  1 
-  0 
-  $ hg book -r1 baz
-  $ hg log --template "{rev} {join(bookmarks, ' ')}\n"
-  2 bar foo
-  1 baz
-  0 
-  $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
-  2 t
-  1 f
-  0 f
-
-Test namespaces dict
-
-  $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n  {join(names, ",")}\n"}\n'
-  2
-   bookmarks color=bookmark builtin=True
-    bar,foo
-   tags color=tag builtin=True
-    tip
-   branches color=branch builtin=True
-    text.{rev}
-   revnames color=revname builtin=False
-    r2
-  
-  1
-   bookmarks color=bookmark builtin=True
-    baz
-   tags color=tag builtin=True
-    
-   branches color=branch builtin=True
-    text.{rev}
-   revnames color=revname builtin=False
-    r1
-  
-  0
-   bookmarks color=bookmark builtin=True
-    
-   tags color=tag builtin=True
-    
-   branches color=branch builtin=True
-    default
-   revnames color=revname builtin=False
-    r0
-  
-  $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
-  bookmarks: bar foo
-  tags: tip
-  branches: text.{rev}
-  $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
-  bookmarks:
-   bar
-   foo
-  tags:
-   tip
-  branches:
-   text.{rev}
-  $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
-  bar
-  foo
-  $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
-  bar
-  foo
 
 Test stringify on sub expressions
 
-  $ cd ..
   $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n'
   fourth, second, third
   $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n'
@@ -2918,12 +1197,6 b' Test startswith'
   o  line 1
      line 2
 
-Test bad template with better error message
-
-  $ hg log -Gv -R a --template '{desc|user()}'
-  hg: parse error: expected a symbol, got 'func'
-  [255]
-
 Test word function (including index out of bounds graceful failure)
 
   $ hg log -Gv -R a --template "{word('1', desc)}"
@@ -3020,148 +1293,11 b' Test with non-strings like dates'
      1200000.00
      1300000.00
 
-Test broken string escapes:
-
-  $ hg log -T "bogus\\" -R a
-  hg: parse error: trailing \ in string
-  [255]
-  $ hg log -T "\\xy" -R a
-  hg: parse error: invalid \x escape* (glob)
-  [255]
-
 json filter should escape HTML tags so that the output can be embedded in hgweb:
 
   $ hg log -T "{'<[e-mail]>'|json}\n" -R a -l1
   "\[e-mail]\u003e"
 
-Templater supports aliases of symbol and func() styles:
-
-  $ hg clone -q a aliases
-  $ cd aliases
-  $ cat <<EOF >> .hg/hgrc
-  > [templatealias]
-  > r = rev
-  > rn = "{r}:{node|short}"
-  > status(c, files) = files % "{c} {file}\n"
-  > utcdate(d) = localdate(d, "UTC")
-  > EOF
-
-  $ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n'
-  (template
-    (symbol 'rn')
-    (string ' ')
-    (|
-      (func
-        (symbol 'utcdate')
-        (symbol 'date'))
-      (symbol 'isodate'))
-    (string '\n'))
-  * expanded:
-  (template
-    (template
-      (symbol 'rev')
-      (string ':')
-      (|
-        (symbol 'node')
-        (symbol 'short')))
-    (string ' ')
-    (|
-      (func
-        (symbol 'localdate')
-        (list
-          (symbol 'date')
-          (string 'UTC')))
-      (symbol 'isodate'))
-    (string '\n'))
-  * keywords: date, node, rev
-  * functions: isodate, localdate, short
-  0:1e4e1b8f71e0 1970-01-12 13:46 +0000
-
-  $ hg debugtemplate -vr0 '{status("A", file_adds)}'
-  (template
-    (func
-      (symbol 'status')
-      (list
-        (string 'A')
-        (symbol 'file_adds'))))
-  * expanded:
-  (template
-    (%
-      (symbol 'file_adds')
-      (template
-        (string 'A')
-        (string ' ')
-        (symbol 'file')
-        (string '\n'))))
-  * keywords: file, file_adds
-  * functions: 
-  A a
-
-A unary function alias can be called as a filter:
-
-  $ hg debugtemplate -vr0 '{date|utcdate|isodate}\n'
-  (template
-    (|
-      (|
-        (symbol 'date')
-        (symbol 'utcdate'))
-      (symbol 'isodate'))
-    (string '\n'))
-  * expanded:
-  (template
-    (|
-      (func
-        (symbol 'localdate')
-        (list
-          (symbol 'date')
-          (string 'UTC')))
-      (symbol 'isodate'))
-    (string '\n'))
-  * keywords: date
-  * functions: isodate, localdate
-  1970-01-12 13:46 +0000
-
-Aliases should be applied only to command arguments and templates in hgrc.
-Otherwise, our stock styles and web templates could be corrupted:
-
-  $ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n'
-  0:1e4e1b8f71e0 1970-01-12 13:46 +0000
-
-  $ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"'
-  0:1e4e1b8f71e0 1970-01-12 13:46 +0000
-
-  $ cat <<EOF > tmpl
-  > changeset = 'nothing expanded:{rn}\n'
-  > EOF
-  $ hg log -r0 --style ./tmpl
-  nothing expanded:
-
-Aliases in formatter:
-
-  $ hg branches -T '{pad(branch, 7)} {rn}\n'
-  default 6:d41e714fe50d
-  foo     4:bbe44766e73d
-
-Aliases should honor HGPLAIN:
-
-  $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n'
-  nothing expanded:
-  $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n'
-  0:1e4e1b8f71e0
-
-Unparsable alias:
-
-  $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}'
-  (template
-    (symbol 'bad'))
-  abort: bad definition of template alias "bad": at 2: not a prefix: end
-  [255]
-  $ hg log --config templatealias.bad='x(' -T '{bad}'
-  abort: bad definition of template alias "bad": at 2: not a prefix: end
-  [255]
-
-  $ cd ..
-
 Set up repository for non-ascii encoding tests:
 
   $ hg init nonascii
@@ -3212,178 +1348,3 b' pad width:'
   \xc3\xa9- (esc)
 
   $ cd ..
-
-Test that template function in extension is registered as expected
-
-  $ cd a
-
-  $ cat <<EOF > $TESTTMP/customfunc.py
-  > from mercurial import registrar
-  > 
-  > templatefunc = registrar.templatefunc()
-  > 
-  > @templatefunc(b'custom()')
-  > def custom(context, mapping, args):
-  >     return b'custom'
-  > EOF
-  $ cat <<EOF > .hg/hgrc
-  > [extensions]
-  > customfunc = $TESTTMP/customfunc.py
-  > EOF
-
-  $ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true
-  custom
-
-  $ cd ..
-
-Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
-printed graphwidths 3, 5, 7, etc. should all line up in their respective
-columns. We don't care about other aspects of the graph rendering here.
-
-  $ hg init graphwidth
-  $ cd graphwidth
-
-  $ wrappabletext="a a a a a a a a a a a a"
-
-  $ printf "first\n" > file
-  $ hg add file
-  $ hg commit -m "$wrappabletext"
-
-  $ printf "first\nsecond\n" > file
-  $ hg commit -m "$wrappabletext"
-
-  $ hg checkout 0
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ printf "third\nfirst\n" > file
-  $ hg commit -m "$wrappabletext"
-  created new head
-
-  $ hg merge
-  merging file
-  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-
-  $ hg log --graph -T "{graphwidth}"
-  @  3
-  |
-  | @  5
-  |/
-  o  3
-  
-  $ hg commit -m "$wrappabletext"
-
-  $ hg log --graph -T "{graphwidth}"
-  @    5
-  |\
-  | o  5
-  | |
-  o |  5
-  |/
-  o  3
-  
-
-  $ hg checkout 0
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ printf "third\nfirst\nsecond\n" > file
-  $ hg commit -m "$wrappabletext"
-  created new head
-
-  $ hg log --graph -T "{graphwidth}"
-  @  3
-  |
-  | o    7
-  | |\
-  +---o  7
-  | |
-  | o  5
-  |/
-  o  3
-  
-
-  $ hg log --graph -T "{graphwidth}" -r 3
-  o    5
-  |\
-  ~ ~
-
-  $ hg log --graph -T "{graphwidth}" -r 1
-  o  3
-  |
-  ~
-
-  $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg commit -m "$wrappabletext"
-
-  $ printf "seventh\n" >> file
-  $ hg commit -m "$wrappabletext"
-
-  $ hg log --graph -T "{graphwidth}"
-  @  3
-  |
-  o    5
-  |\
-  | o  5
-  | |
-  o |    7
-  |\ \
-  | o |  7
-  | |/
-  o /  5
-  |/
-  o  3
-  
-
-The point of graphwidth is to allow wrapping that accounts for the space taken
-by the graph.
-
-  $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
-  @  a a a a
-  |  a a a a
-  |  a a a a
-  o    a a a
-  |\   a a a
-  | |  a a a
-  | |  a a a
-  | o  a a a
-  | |  a a a
-  | |  a a a
-  | |  a a a
-  o |    a a
-  |\ \   a a
-  | | |  a a
-  | | |  a a
-  | | |  a a
-  | | |  a a
-  | o |  a a
-  | |/   a a
-  | |    a a
-  | |    a a
-  | |    a a
-  | |    a a
-  o |  a a a
-  |/   a a a
-  |    a a a
-  |    a a a
-  o  a a a a
-     a a a a
-     a a a a
-
-Something tricky happens when there are elided nodes; the next drawn row of
-edges can be more than one column wider, but the graph width only increases by
-one column. The remaining columns are added in between the nodes.
-
-  $ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
-  o    5
-  |\
-  | \
-  | :\
-  o : :  7
-  :/ /
-  : o  5
-  :/
-  o  3
-  
-
-  $ cd ..
-