mercurial-source: mercurial/templater.py annotate

author	Boris Feld <boris.feld@octobus.net>
date	Thu, 19 Oct 2017 12:35:47 +0200 (2017-10-19)
parents	d3ea6a1c798f
children	073bc922d349

rev	line source
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	1 # templater.py - template expansion for output
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	2 #
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8223 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9842 diff changeset	6 # GNU General Public License version 2 or any later version.
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	7
34920 a8994d08e4a2 doctest: use print_function and convert bytes to unicode where needed Yuya Nishihara <yuya@tcha.org> parents: 34914 diff changeset	8 from __future__ import absolute_import, print_function
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	9
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	10 import os
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	11 import re
17982 e06e9fd2d99f template engine: convert generator-based iterator to list-based iterator Weiwen <weiwen@fb.com> parents: 17890 diff changeset	12 import types
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	13
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	14 from .i18n import _
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	15 from . import (
32300 44c591f63458 templater: make pad() strip color codes before computing width (issue5416) Yuya Nishihara <yuya@tcha.org> parents: 32299 diff changeset	16 color,
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	17 config,
32299 6f150bb19317 templater: make pad() compute actual width Yuya Nishihara <yuya@tcha.org> parents: 32298 diff changeset	18 encoding,
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	19 error,
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	20 minirst,
34776 3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 34337 diff changeset	21 obsutil,
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	22 parser,
31394 bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4) Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	23 pycompat,
29446 efa192203623 templater: use templatefunc to mark a function as template function FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 29445 diff changeset	24 registrar,
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	25 revset as revsetmod,
31803 0b8356705de6 revset: split language services to revsetlang module (API) Yuya Nishihara <yuya@tcha.org> parents: 31404 diff changeset	26 revsetlang,
35241 a1b89c8ad32d templater: add experimental support for extdata Yuya Nishihara <yuya@tcha.org> parents: 35129 diff changeset	27 scmutil,
26569 7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	28 templatefilters,
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	29 templatekw,
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	30 util,
7eb357b5f774 templater: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26375 diff changeset	31 )
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	32
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	33 # template parsing
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	34
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	35 elements = {
26375 e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	36 # token-type: binding-strength, primary, prefix, infix, suffix
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	37 "(": (20, None, ("group", 1, ")"), ("func", 1, ")"), None),
35318 78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	38 ".": (18, None, None, (".", 18), None),
35112 6367318327f0 templater: adjust binding strength of '%' and '\|' operators (BC) Yuya Nishihara <yuya@tcha.org> parents: 35111 diff changeset	39 "%": (15, None, None, ("%", 15), None),
32663 0926ca37a990 templater: adjust binding strengths to make room for key-value operator Yuya Nishihara <yuya@tcha.org> parents: 32662 diff changeset	40 "\|": (15, None, None, ("\|", 15), None),
0926ca37a990 templater: adjust binding strengths to make room for key-value operator Yuya Nishihara <yuya@tcha.org> parents: 32662 diff changeset	41 "": (5, None, None, ("", 5), None),
0926ca37a990 templater: adjust binding strengths to make room for key-value operator Yuya Nishihara <yuya@tcha.org> parents: 32662 diff changeset	42 "/": (5, None, None, ("/", 5), None),
0926ca37a990 templater: adjust binding strengths to make room for key-value operator Yuya Nishihara <yuya@tcha.org> parents: 32662 diff changeset	43 "+": (4, None, None, ("+", 4), None),
0926ca37a990 templater: adjust binding strengths to make room for key-value operator Yuya Nishihara <yuya@tcha.org> parents: 32662 diff changeset	44 "-": (4, None, ("negate", 19), ("-", 4), None),
32664 d18b624c1c06 templater: add parsing rule for key-value pair Yuya Nishihara <yuya@tcha.org> parents: 32663 diff changeset	45 "=": (3, None, None, ("keyvalue", 3), None),
32662 25be03a33f50 templater: sort token table by binding strength Yuya Nishihara <yuya@tcha.org> parents: 32659 diff changeset	46 ",": (2, None, None, ("list", 2), None),
25be03a33f50 templater: sort token table by binding strength Yuya Nishihara <yuya@tcha.org> parents: 32659 diff changeset	47 ")": (0, None, None, None, None),
26375 e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	48 "integer": (0, "integer", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	49 "symbol": (0, "symbol", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	50 "string": (0, "string", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	51 "template": (0, "template", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 26360 diff changeset	52 "end": (0, None, None, None, None),
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	53 }
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	54
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	55 def tokenize(program, start, end, term=None):
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	56 """Parse a template expression into a stream of tokens, which must end
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	57 with term if specified"""
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	58 pos = start
32933 52e222eef646 py3: use pycompat.bytestr instead of bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32816 diff changeset	59 program = pycompat.bytestr(program)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	60 while pos < end:
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	61 c = program[pos]
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	62 if c.isspace(): # skip inter-token whitespace
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	63 pass
35318 78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	64 elif c in "(=,).%\|+-*/": # handle simple operators
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	65 yield (c, None, pos)
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	66 elif c in '"\'': # handle quoted templates
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	67 s = pos + 1
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	68 data, pos = _parsetemplate(program, s, end, c)
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	69 yield ('template', data, s)
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	70 pos -= 1
26343 33e613687dab templater: remove processing of "string" literals from tokenizer Yuya Nishihara <yuya@tcha.org> parents: 26342 diff changeset	71 elif c == 'r' and program[pos:pos + 2] in ("r'", 'r"'):
33e613687dab templater: remove processing of "string" literals from tokenizer Yuya Nishihara <yuya@tcha.org> parents: 26342 diff changeset	72 # handle quoted strings
33e613687dab templater: remove processing of "string" literals from tokenizer Yuya Nishihara <yuya@tcha.org> parents: 26342 diff changeset	73 c = program[pos + 1]
33e613687dab templater: remove processing of "string" literals from tokenizer Yuya Nishihara <yuya@tcha.org> parents: 26342 diff changeset	74 s = pos = pos + 2
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	75 while pos < end: # find closing quote
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	76 d = program[pos]
26192 6047b60cdd09 templater: fix handling of \-escapes in raw string literals Yuya Nishihara <yuya@tcha.org> parents: 26191 diff changeset	77 if d == '\\': # skip over escaped characters
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	78 pos += 2
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	79 continue
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	80 if d == c:
26344 f976b7dc5e7b templater: unify "string" and "rawstring" Yuya Nishihara <yuya@tcha.org> parents: 26343 diff changeset	81 yield ('string', program[s:pos], s)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	82 break
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	83 pos += 1
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	84 else:
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	85 raise error.ParseError(_("unterminated string"), s)
30894 8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	86 elif c.isdigit():
25393 829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	87 s = pos
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	88 while pos < end:
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	89 d = program[pos]
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	90 if not d.isdigit():
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	91 break
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	92 pos += 1
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	93 yield ('integer', program[s:pos], s)
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	94 pos -= 1
26235 ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	95 elif (c == '\\' and program[pos:pos + 2] in (r"\'", r'\"')
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	96 or c == 'r' and program[pos:pos + 3] in (r"r\'", r'r\"')):
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	97 # handle escaped quoted strings for compatibility with 2.9.2-3.4,
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	98 # where some of nested templates were preprocessed as strings and
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	99 # then compiled. therefore, \"...\" was allowed. (issue4733)
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	100 #
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	101 # processing flow of _evalifliteral() at 5ab28a2e9962:
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	102 # outer template string -> stringify() -> compiletemplate()
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	103 # ------------------------ ------------ ------------------
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	104 # {f("\\\\ {g(\"\\\"\")}"} \\ {g("\"")} [r'\\', {g("\"")}]
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	105 # ~~~~~~~~
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	106 # escaped quoted string
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	107 if c == 'r':
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	108 pos += 1
26344 f976b7dc5e7b templater: unify "string" and "rawstring" Yuya Nishihara <yuya@tcha.org> parents: 26343 diff changeset	109 token = 'string'
26235 ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	110 else:
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	111 token = 'template'
26235 ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	112 quote = program[pos:pos + 2]
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	113 s = pos = pos + 2
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	114 while pos < end: # find closing escaped quote
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	115 if program.startswith('\\\\\\', pos, end):
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	116 pos += 4 # skip over double escaped characters
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	117 continue
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	118 if program.startswith(quote, pos, end):
26823 72aad184f061 templater: create string unescape helper (issue4798) Matt Mackall <mpm@selenic.com> parents: 26796 diff changeset	119 # interpret as if it were a part of an outer string
26839 87c9c562c37a parser: move unescape helper from templater Yuya Nishihara <yuya@tcha.org> parents: 26823 diff changeset	120 data = parser.unescapestr(program[s:pos])
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	121 if token == 'template':
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	122 data = _parsetemplate(data, 0, len(data))[0]
26235 ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	123 yield (token, data, s)
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	124 pos += 1
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	125 break
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	126 pos += 1
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	127 else:
ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) Yuya Nishihara <yuya@tcha.org> parents: 26192 diff changeset	128 raise error.ParseError(_("unterminated string"), s)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	129 elif c.isalnum() or c in '_':
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	130 s = pos
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	131 pos += 1
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	132 while pos < end: # find end of symbol
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	133 d = program[pos]
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	134 if not (d.isalnum() or d == "_"):
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	135 break
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	136 pos += 1
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	137 sym = program[s:pos]
18893 74ea61318ea8 templater: back out 0615b22da148, it breaks schemes ({1}) Brendan Cully <brendan@kublai.com> parents: 18889 diff changeset	138 yield ('symbol', sym, s)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	139 pos -= 1
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	140 elif c == term:
26341 babd2c93bd99 templater: check existence of closing brace of template string Yuya Nishihara <yuya@tcha.org> parents: 26340 diff changeset	141 yield ('end', None, pos + 1)
babd2c93bd99 templater: check existence of closing brace of template string Yuya Nishihara <yuya@tcha.org> parents: 26340 diff changeset	142 return
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	143 else:
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	144 raise error.ParseError(_("syntax error"), pos)
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	145 pos += 1
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	146 if term:
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	147 raise error.ParseError(_("unterminated template expansion"), start)
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	148 yield ('end', None, pos)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	149
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	150 def _parsetemplate(tmpl, start, stop, quote=''):
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	151 r"""
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	152 >>> _parsetemplate(b'foo{bar}"baz', 0, 12)
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	153 ([('string', 'foo'), ('symbol', 'bar'), ('string', '"baz')], 12)
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	154 >>> _parsetemplate(b'foo{bar}"baz', 0, 12, quote=b'"')
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	155 ([('string', 'foo'), ('symbol', 'bar')], 9)
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	156 >>> _parsetemplate(b'foo"{bar}', 0, 9, quote=b'"')
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	157 ([('string', 'foo')], 4)
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	158 >>> _parsetemplate(br'foo\"bar"baz', 0, 12, quote=b'"')
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	159 ([('string', 'foo"'), ('string', 'bar')], 9)
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	160 >>> _parsetemplate(br'foo\\"bar', 0, 10, quote=b'"')
26344 f976b7dc5e7b templater: unify "string" and "rawstring" Yuya Nishihara <yuya@tcha.org> parents: 26343 diff changeset	161 ([('string', 'foo\\')], 6)
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	162 """
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	163 parsed = []
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	164 sepchars = '{' + quote
26340 82c918509ef5 templater: extract function that parses template string Yuya Nishihara <yuya@tcha.org> parents: 26339 diff changeset	165 pos = start
26208 af329a84310c parser: accept iterator of tokens instead of tokenizer function and program Yuya Nishihara <yuya@tcha.org> parents: 26142 diff changeset	166 p = parser.parser(elements)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	167 while pos < stop:
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	168 n = min((tmpl.find(c, pos, stop) for c in sepchars),
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	169 key=lambda n: (n < 0, n))
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	170 if n < 0:
26839 87c9c562c37a parser: move unescape helper from templater Yuya Nishihara <yuya@tcha.org> parents: 26823 diff changeset	171 parsed.append(('string', parser.unescapestr(tmpl[pos:stop])))
26339 8b900b937e1c templater: respect stop position while parsing template string Yuya Nishihara <yuya@tcha.org> parents: 26255 diff changeset	172 pos = stop
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	173 break
34854 f55769e41803 py3: use bytes[n:n + 1] to get bytes in templater._parsetemplate() Yuya Nishihara <yuya@tcha.org> parents: 34778 diff changeset	174 c = tmpl[n:n + 1]
25284 890845af1ac2 templater: strictly parse leading backslashes of '{' (issue4569) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25283 diff changeset	175 bs = (n - pos) - len(tmpl[pos:n].rstrip('\\'))
26141 55c2cb65bdfa templater: drop strtoken argument from compiletemplate() Yuya Nishihara <yuya@tcha.org> parents: 26140 diff changeset	176 if bs % 2 == 1:
55c2cb65bdfa templater: drop strtoken argument from compiletemplate() Yuya Nishihara <yuya@tcha.org> parents: 26140 diff changeset	177 # escaped (e.g. '\{', '\\\{', but not '\\{')
26839 87c9c562c37a parser: move unescape helper from templater Yuya Nishihara <yuya@tcha.org> parents: 26823 diff changeset	178 parsed.append(('string', parser.unescapestr(tmpl[pos:n - 1]) + c))
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	179 pos = n + 1
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	180 continue
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	181 if n > pos:
26839 87c9c562c37a parser: move unescape helper from templater Yuya Nishihara <yuya@tcha.org> parents: 26823 diff changeset	182 parsed.append(('string', parser.unescapestr(tmpl[pos:n])))
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	183 if c == quote:
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	184 return parsed, n + 1
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	185
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	186 parseres, pos = p.parse(tokenize(tmpl, n + 1, stop, '}'))
13665 e798e430c5e5 revset: report a parse error if a revset is not parsed completely (issue2654) Bernhard Leiner <bleiner@gmail.com> parents: 13187 diff changeset	187 parsed.append(parseres)
26342 1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	188
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	189 if quote:
1f6878c87c25 templater: introduce one-pass parsing of nested template strings Yuya Nishihara <yuya@tcha.org> parents: 26341 diff changeset	190 raise error.ParseError(_("unterminated string"), start)
26340 82c918509ef5 templater: extract function that parses template string Yuya Nishihara <yuya@tcha.org> parents: 26339 diff changeset	191 return parsed, pos
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	192
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	193 def _unnesttemplatelist(tree):
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	194 """Expand list of templates to node tuple
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	195
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	196 >>> def f(tree):
34920 a8994d08e4a2 doctest: use print_function and convert bytes to unicode where needed Yuya Nishihara <yuya@tcha.org> parents: 34914 diff changeset	197 ... print(pycompat.sysstr(prettyformat(_unnesttemplatelist(tree))))
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	198 >>> f((b'template', []))
34856 7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	199 (string '')
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	200 >>> f((b'template', [(b'string', b'foo')]))
34856 7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	201 (string 'foo')
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	202 >>> f((b'template', [(b'string', b'foo'), (b'symbol', b'rev')]))
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	203 (template
34856 7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	204 (string 'foo')
7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	205 (symbol 'rev'))
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	206 >>> f((b'template', [(b'symbol', b'rev')])) # template(rev) -> str
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	207 (template
34856 7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	208 (symbol 'rev'))
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	209 >>> f((b'template', [(b'template', [(b'string', b'foo')])]))
34856 7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr() Yuya Nishihara <yuya@tcha.org> parents: 34854 diff changeset	210 (string 'foo')
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	211 """
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	212 if not isinstance(tree, tuple):
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	213 return tree
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	214 op = tree[0]
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	215 if op != 'template':
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	216 return (op,) + tuple(_unnesttemplatelist(x) for x in tree[1:])
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	217
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	218 assert len(tree) == 2
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	219 xs = tuple(_unnesttemplatelist(x) for x in tree[1])
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	220 if not xs:
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	221 return ('string', '') # empty template ""
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	222 elif len(xs) == 1 and xs[0][0] == 'string':
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	223 return xs[0] # fast path for string with no template fragment "x"
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	224 else:
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	225 return (op,) + xs
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	226
29286 1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	227 def parse(tmpl):
1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	228 """Parse template string into tree"""
26340 82c918509ef5 templater: extract function that parses template string Yuya Nishihara <yuya@tcha.org> parents: 26339 diff changeset	229 parsed, pos = _parsetemplate(tmpl, 0, len(tmpl))
29286 1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	230 assert pos == len(tmpl), 'unquoted template should be consumed'
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	231 return _unnesttemplatelist(('template', parsed))
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	232
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	233 def _parseexpr(expr):
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	234 """Parse a template expression into tree
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	235
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	236 >>> _parseexpr(b'"foo"')
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	237 ('string', 'foo')
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	238 >>> _parseexpr(b'foo(bar)')
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	239 ('func', ('symbol', 'foo'), ('symbol', 'bar'))
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	240 >>> _parseexpr(b'foo(')
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	241 Traceback (most recent call last):
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	242 ...
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	243 ParseError: ('not a prefix: end', 4)
34914 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 34856 diff changeset	244 >>> _parseexpr(b'"foo" "bar"')
29661 35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	245 Traceback (most recent call last):
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	246 ...
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	247 ParseError: ('invalid token', 7)
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	248 """
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	249 p = parser.parser(elements)
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	250 tree, pos = p.parse(tokenize(expr, 0, len(expr)))
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	251 if pos != len(expr):
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	252 raise error.ParseError(_('invalid token'), pos)
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	253 return _unnesttemplatelist(tree)
35da19348143 templater: add function to parse whole string as template expression Yuya Nishihara <yuya@tcha.org> parents: 29587 diff changeset	254
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	255 def prettyformat(tree):
73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	256 return parser.prettyformat(tree, ('integer', 'string', 'symbol'))
29286 1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	257
25392 9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr Yuya Nishihara <yuya@tcha.org> parents: 25379 diff changeset	258 def compileexp(exp, context, curmethods):
29706 eea98190ed73 templater: inline compiletemplate() function into engine Yuya Nishihara <yuya@tcha.org> parents: 29704 diff changeset	259 """Compile parsed template tree to (func, data) pair"""
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	260 t = exp[0]
25392 9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr Yuya Nishihara <yuya@tcha.org> parents: 25379 diff changeset	261 if t in curmethods:
9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr Yuya Nishihara <yuya@tcha.org> parents: 25379 diff changeset	262 return curmethods[t](exp, context)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	263 raise error.ParseError(_("unknown method '%s'") % t)
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	264
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	265 # template evaluation
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	266
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	267 def getsymbol(exp):
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	268 if exp[0] == 'symbol':
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	269 return exp[1]
21822 028a48105191 templater: add symbol to error Ryan McElroy <rmcelroy@fb.com> parents: 21821 diff changeset	270 raise error.ParseError(_("expected a symbol, got '%s'") % exp[0])
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	271
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	272 def getlist(x):
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	273 if not x:
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	274 return []
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	275 if x[0] == 'list':
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	276 return getlist(x[1]) + [x[2]]
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	277 return [x]
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	278
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	279 def gettemplate(exp, context):
29286 1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	280 """Compile given template tree or load named template from map file;
1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	281 returns (func, data) pair"""
29287 1987ed32efca templater: relax type of mapped template Yuya Nishihara <yuya@tcha.org> parents: 29286 diff changeset	282 if exp[0] in ('template', 'string'):
29286 1d461ee26e1b templater: lift parsed and compiled templates to generic data types Yuya Nishihara <yuya@tcha.org> parents: 29133 diff changeset	283 return compileexp(exp, context, methods)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	284 if exp[0] == 'symbol':
26142 695b93a79d17 templater: comment that gettemplate() has different name resolution order Yuya Nishihara <yuya@tcha.org> parents: 26141 diff changeset	285 # unlike runsymbol(), here 'symbol' is always taken as template name
695b93a79d17 templater: comment that gettemplate() has different name resolution order Yuya Nishihara <yuya@tcha.org> parents: 26141 diff changeset	286 # even if it exists in mapping. this allows us to override mapping
695b93a79d17 templater: comment that gettemplate() has different name resolution order Yuya Nishihara <yuya@tcha.org> parents: 26141 diff changeset	287 # by web templates, e.g. 'changelogtag' is redefined in map file.
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	288 return context._load(exp[1])
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	289 raise error.ParseError(_("expected template specifier"))
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	290
32706 2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	291 def findsymbolicname(arg):
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	292 """Find symbolic name for the given compiled expression; returns None
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	293 if nothing found reliably"""
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	294 while True:
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	295 func, data = arg
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	296 if func is runsymbol:
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	297 return data
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	298 elif func is runfilter:
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	299 arg = data[0]
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	300 else:
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	301 return None
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	302
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	303 def evalrawexp(context, mapping, arg):
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	304 """Evaluate given argument as a bare template object which may require
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	305 further processing (such as folding generator of strings)"""
26720 604a7c941103 templater: extract helper that evaluates filter or function argument Yuya Nishihara <yuya@tcha.org> parents: 26693 diff changeset	306 func, data = arg
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	307 return func(context, mapping, data)
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	308
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	309 def evalfuncarg(context, mapping, arg):
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	310 """Evaluate given argument as value type"""
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	311 thing = evalrawexp(context, mapping, arg)
35113 89aec1834a86 templatekw: add new-style template expansion to {manifest} Yuya Nishihara <yuya@tcha.org> parents: 35112 diff changeset	312 thing = templatekw.unwrapvalue(thing)
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	313 # evalrawexp() may return string, generator of strings or arbitrary object
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	314 # such as date tuple, but filter does not want generator.
26720 604a7c941103 templater: extract helper that evaluates filter or function argument Yuya Nishihara <yuya@tcha.org> parents: 26693 diff changeset	315 if isinstance(thing, types.GeneratorType):
604a7c941103 templater: extract helper that evaluates filter or function argument Yuya Nishihara <yuya@tcha.org> parents: 26693 diff changeset	316 thing = stringify(thing)
604a7c941103 templater: extract helper that evaluates filter or function argument Yuya Nishihara <yuya@tcha.org> parents: 26693 diff changeset	317 return thing
604a7c941103 templater: extract helper that evaluates filter or function argument Yuya Nishihara <yuya@tcha.org> parents: 26693 diff changeset	318
30586 034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	319 def evalboolean(context, mapping, arg):
30587 cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	320 """Evaluate given argument as boolean, but also takes boolean literals"""
30586 034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	321 func, data = arg
30587 cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	322 if func is runsymbol:
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	323 thing = func(context, mapping, data, default=None)
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	324 if thing is None:
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	325 # not a template keyword, takes as a boolean literal
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	326 thing = util.parsebool(data)
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	327 else:
cc11079644fc templater: make pad() evaluate boolean argument (BC) Yuya Nishihara <yuya@tcha.org> parents: 30586 diff changeset	328 thing = func(context, mapping, data)
35113 89aec1834a86 templatekw: add new-style template expansion to {manifest} Yuya Nishihara <yuya@tcha.org> parents: 35112 diff changeset	329 thing = templatekw.unwrapvalue(thing)
30586 034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	330 if isinstance(thing, bool):
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	331 return thing
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	332 # other objects are evaluated as strings, which means 0 is True, but
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	333 # empty dict/list should be False as they are expected to be ''
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	334 return bool(stringify(thing))
034412ca28c3 templater: fix if() to not evaluate False as bool('False') Yuya Nishihara <yuya@tcha.org> parents: 30585 diff changeset	335
35364 ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	336 def evalinteger(context, mapping, arg, err=None):
29015 ac371d4c007f templater: drop redundant type conversion when evaluating integer argument Yuya Nishihara <yuya@tcha.org> parents: 29014 diff changeset	337 v = evalfuncarg(context, mapping, arg)
29014 a6c2310b3827 templater: factor out function that evaluates argument as integer Yuya Nishihara <yuya@tcha.org> parents: 29005 diff changeset	338 try:
29015 ac371d4c007f templater: drop redundant type conversion when evaluating integer argument Yuya Nishihara <yuya@tcha.org> parents: 29014 diff changeset	339 return int(v)
ac371d4c007f templater: drop redundant type conversion when evaluating integer argument Yuya Nishihara <yuya@tcha.org> parents: 29014 diff changeset	340 except (TypeError, ValueError):
35364 ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	341 raise error.ParseError(err or _('not an integer'))
29014 a6c2310b3827 templater: factor out function that evaluates argument as integer Yuya Nishihara <yuya@tcha.org> parents: 29005 diff changeset	342
29019 ccedb17a5657 templater: factor out thin helper that evaluates argument as string Yuya Nishihara <yuya@tcha.org> parents: 29017 diff changeset	343 def evalstring(context, mapping, arg):
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	344 return stringify(evalrawexp(context, mapping, arg))
29019 ccedb17a5657 templater: factor out thin helper that evaluates argument as string Yuya Nishihara <yuya@tcha.org> parents: 29017 diff changeset	345
29044 9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	346 def evalstringliteral(context, mapping, arg):
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	347 """Evaluate given argument as string template, but returns symbol name
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	348 if it is unknown"""
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	349 func, data = arg
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	350 if func is runsymbol:
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	351 thing = func(context, mapping, data, default=data)
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	352 else:
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	353 thing = func(context, mapping, data)
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	354 return stringify(thing)
9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	355
35364 ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	356 _evalfuncbytype = {
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	357 bool: evalboolean,
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	358 bytes: evalstring,
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	359 int: evalinteger,
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	360 }
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	361
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	362 def evalastype(context, mapping, arg, typ):
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	363 """Evaluate given argument and coerce its type"""
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	364 try:
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	365 f = _evalfuncbytype[typ]
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	366 except KeyError:
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	367 raise error.ProgrammingError('invalid type specified: %r' % typ)
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	368 return f(context, mapping, arg)
ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings Yuya Nishihara <yuya@tcha.org> parents: 35319 diff changeset	369
25393 829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	370 def runinteger(context, mapping, data):
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	371 return int(data)
829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25392 diff changeset	372
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	373 def runstring(context, mapping, data):
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	374 return data
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	375
28610 7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	376 def _recursivesymbolblocker(key):
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	377 def showrecursion(**args):
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	378 raise error.Abort(_("recursive reference '%s' in template") % key)
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	379 return showrecursion
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	380
28611 cfe7da66f555 templater: abort if infinite recursion detected while compiling Yuya Nishihara <yuya@tcha.org> parents: 28610 diff changeset	381 def _runrecursivesymbol(context, mapping, key):
cfe7da66f555 templater: abort if infinite recursion detected while compiling Yuya Nishihara <yuya@tcha.org> parents: 28610 diff changeset	382 raise error.Abort(_("recursive reference '%s' in template") % key)
cfe7da66f555 templater: abort if infinite recursion detected while compiling Yuya Nishihara <yuya@tcha.org> parents: 28610 diff changeset	383
29044 9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	384 def runsymbol(context, mapping, key, default=''):
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	385 v = mapping.get(key)
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	386 if v is None:
19770 0361163efbaf templater: support using templates with non-standard names from map file Alexander Plavin <alexander@plav.in> parents: 19390 diff changeset	387 v = context._defaults.get(key)
0361163efbaf templater: support using templates with non-standard names from map file Alexander Plavin <alexander@plav.in> parents: 19390 diff changeset	388 if v is None:
28610 7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	389 # put poison to cut recursion. we can't move this to parsing phase
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	390 # because "x = {x}" is allowed if "x" is a keyword. (issue4758)
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	391 safemapping = mapping.copy()
7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	392 safemapping[key] = _recursivesymbolblocker(key)
19770 0361163efbaf templater: support using templates with non-standard names from map file Alexander Plavin <alexander@plav.in> parents: 19390 diff changeset	393 try:
28610 7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758) Yuya Nishihara <yuya@tcha.org> parents: 28547 diff changeset	394 v = context.process(key, safemapping)
19770 0361163efbaf templater: support using templates with non-standard names from map file Alexander Plavin <alexander@plav.in> parents: 19390 diff changeset	395 except TemplateNotFound:
29044 9a9dd71e882c templater: make label() take unknown symbol as color literal Yuya Nishihara <yuya@tcha.org> parents: 29020 diff changeset	396 v = default
21798 f2c617ff2abc templater: restore use of callable() since it was readded in Python 3.2 Augie Fackler <raf@durin42.com> parents: 21540 diff changeset	397 if callable(v):
33800 c31d45623304 py3: convert kwargs' keys' to str using pycompat.strkwargs() Pulkit Goyal <7895pulkit@gmail.com> parents: 33799 diff changeset	398 return v(**pycompat.strkwargs(mapping))
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	399 return v
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	400
26139 c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC) Yuya Nishihara <yuya@tcha.org> parents: 26138 diff changeset	401 def buildtemplate(exp, context):
29288 73d01cba5810 templater: expand list of parsed templates to template node Yuya Nishihara <yuya@tcha.org> parents: 29287 diff changeset	402 ctmpl = [compileexp(e, context, methods) for e in exp[1:]]
26139 c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC) Yuya Nishihara <yuya@tcha.org> parents: 26138 diff changeset	403 return (runtemplate, ctmpl)
c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC) Yuya Nishihara <yuya@tcha.org> parents: 26138 diff changeset	404
26138 a7dd6692e5cb templater: move runtemplate function out of buildmap/runmap pair Yuya Nishihara <yuya@tcha.org> parents: 26123 diff changeset	405 def runtemplate(context, mapping, template):
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	406 for arg in template:
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	407 yield evalrawexp(context, mapping, arg)
26138 a7dd6692e5cb templater: move runtemplate function out of buildmap/runmap pair Yuya Nishihara <yuya@tcha.org> parents: 26123 diff changeset	408
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	409 def buildfilter(exp, context):
26691 0f1bc7faa50d templater: inline getfilter() to buildfilter() Yuya Nishihara <yuya@tcha.org> parents: 26569 diff changeset	410 n = getsymbol(exp[2])
0f1bc7faa50d templater: inline getfilter() to buildfilter() Yuya Nishihara <yuya@tcha.org> parents: 26569 diff changeset	411 if n in context._filters:
0f1bc7faa50d templater: inline getfilter() to buildfilter() Yuya Nishihara <yuya@tcha.org> parents: 26569 diff changeset	412 filt = context._filters[n]
32665 bdda942f4b9c templater: add support for keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 32664 diff changeset	413 arg = compileexp(exp[1], context, methods)
26721 c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter Yuya Nishihara <yuya@tcha.org> parents: 26720 diff changeset	414 return (runfilter, (arg, filt))
26692 d67341f55429 templater: introduce unified filter syntax for unary functions Yuya Nishihara <yuya@tcha.org> parents: 26691 diff changeset	415 if n in funcs:
d67341f55429 templater: introduce unified filter syntax for unary functions Yuya Nishihara <yuya@tcha.org> parents: 26691 diff changeset	416 f = funcs[n]
32665 bdda942f4b9c templater: add support for keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 32664 diff changeset	417 args = _buildfuncargs(exp[1], context, methods, n, f._argspec)
bdda942f4b9c templater: add support for keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 32664 diff changeset	418 return (f, args)
26691 0f1bc7faa50d templater: inline getfilter() to buildfilter() Yuya Nishihara <yuya@tcha.org> parents: 26569 diff changeset	419 raise error.ParseError(_("unknown function '%s'") % n)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	420
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	421 def runfilter(context, mapping, data):
26721 c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter Yuya Nishihara <yuya@tcha.org> parents: 26720 diff changeset	422 arg, filt = data
c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter Yuya Nishihara <yuya@tcha.org> parents: 26720 diff changeset	423 thing = evalfuncarg(context, mapping, arg)
17383 099c778ceb33 templater: abort when a template filter raises an exception (issue2987) Neil Kodner <neilk@fb.com> parents: 17334 diff changeset	424 try:
24387 6c55e37ba5f2 templater: allow piping generator-type function output to filters Yuya Nishihara <yuya@tcha.org> parents: 24342 diff changeset	425 return filt(thing)
17383 099c778ceb33 templater: abort when a template filter raises an exception (issue2987) Neil Kodner <neilk@fb.com> parents: 17334 diff changeset	426 except (ValueError, AttributeError, TypeError):
32706 2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	427 sym = findsymbolicname(arg)
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	428 if sym:
2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	429 msg = (_("template filter '%s' is not compatible with keyword '%s'")
35621 d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs Augie Fackler <augie@google.com> parents: 35591 diff changeset	430 % (pycompat.sysbytes(filt.__name__), sym))
17383 099c778ceb33 templater: abort when a template filter raises an exception (issue2987) Neil Kodner <neilk@fb.com> parents: 17334 diff changeset	431 else:
35621 d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs Augie Fackler <augie@google.com> parents: 35591 diff changeset	432 msg = (_("incompatible use of template filter '%s'")
d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs Augie Fackler <augie@google.com> parents: 35591 diff changeset	433 % pycompat.sysbytes(filt.__name__))
32706 2abc556dbe92 templater: find keyword name more thoroughly on filtering error Yuya Nishihara <yuya@tcha.org> parents: 32705 diff changeset	434 raise error.Abort(msg)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	435
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	436 def buildmap(exp, context):
35108 86d050abd5c1 templater: do not destructure operands in buildmap() Yuya Nishihara <yuya@tcha.org> parents: 35107 diff changeset	437 darg = compileexp(exp[1], context, methods)
86d050abd5c1 templater: do not destructure operands in buildmap() Yuya Nishihara <yuya@tcha.org> parents: 35107 diff changeset	438 targ = gettemplate(exp[2], context)
86d050abd5c1 templater: do not destructure operands in buildmap() Yuya Nishihara <yuya@tcha.org> parents: 35107 diff changeset	439 return (runmap, (darg, targ))
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	440
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	441 def runmap(context, mapping, data):
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	442 darg, targ = data
e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	443 d = evalrawexp(context, mapping, darg)
28546 ac8c0ee5c3b8 templater: make _hybrid not callable to avoid conflicting semantics Yuya Nishihara <yuya@tcha.org> parents: 28292 diff changeset	444 if util.safehasattr(d, 'itermaps'):
29020 7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	445 diter = d.itermaps()
7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	446 else:
7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	447 try:
7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	448 diter = iter(d)
7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	449 except TypeError:
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	450 sym = findsymbolicname(darg)
35107 e473f482b9b3 templater: use helper function to get name of non-iterable keyword Yuya Nishihara <yuya@tcha.org> parents: 35070 diff changeset	451 if sym:
e473f482b9b3 templater: use helper function to get name of non-iterable keyword Yuya Nishihara <yuya@tcha.org> parents: 35070 diff changeset	452 raise error.ParseError(_("keyword '%s' is not iterable") % sym)
29020 7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	453 else:
7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object Yuya Nishihara <yuya@tcha.org> parents: 29019 diff changeset	454 raise error.ParseError(_("%r is not iterable") % d)
17631 0b241d7a8c62 templating: make new-style templating features work with command line lists Matt Mackall <mpm@selenic.com> parents: 17383 diff changeset	455
32586 e6eb86b154c5 templater: provide loop counter as "index" keyword Yuya Nishihara <yuya@tcha.org> parents: 32585 diff changeset	456 for i, v in enumerate(diter):
28896 5c11702fe2a3 templater: fix list templating bug Kostia Balytskyi <ikostia@fb.com> parents: 28849 diff changeset	457 lm = mapping.copy()
32586 e6eb86b154c5 templater: provide loop counter as "index" keyword Yuya Nishihara <yuya@tcha.org> parents: 32585 diff changeset	458 lm['index'] = i
32585 8f203b491bb5 templater: rename variable "i" to "v" in runmap() Yuya Nishihara <yuya@tcha.org> parents: 32300 diff changeset	459 if isinstance(v, dict):
8f203b491bb5 templater: rename variable "i" to "v" in runmap() Yuya Nishihara <yuya@tcha.org> parents: 32300 diff changeset	460 lm.update(v)
17991 d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810) Weiwen <weiwen@fb.com> parents: 17982 diff changeset	461 lm['originalnode'] = mapping.get('node')
35109 e60c601953d7 templater: extract helper to just evaluate template expression Yuya Nishihara <yuya@tcha.org> parents: 35108 diff changeset	462 yield evalrawexp(context, lm, targ)
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	463 else:
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	464 # v is not an iterable of dicts, this happen when 'key'
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	465 # has been fully expanded already and format is useless.
895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	466 # If so, return the expanded value.
32585 8f203b491bb5 templater: rename variable "i" to "v" in runmap() Yuya Nishihara <yuya@tcha.org> parents: 32300 diff changeset	467 yield v
13177 895f54a79c6e templater: use the parser.py parser to extend the templater syntax Matt Mackall <mpm@selenic.com> parents: 13176 diff changeset	468
35318 78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	469 def buildmember(exp, context):
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	470 darg = compileexp(exp[1], context, methods)
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	471 memb = getsymbol(exp[2])
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	472 return (runmember, (darg, memb))
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	473
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	474 def runmember(context, mapping, data):
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	475 darg, memb = data
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	476 d = evalrawexp(context, mapping, darg)
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	477 if util.safehasattr(d, 'tomap'):
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	478 lm = mapping.copy()
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	479 lm.update(d.tomap())
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	480 return runsymbol(context, lm, memb)
35319 4c1cfe54c08d templater: extend dot operator as a short for get(dict, key) Yuya Nishihara <yuya@tcha.org> parents: 35318 diff changeset	481 if util.safehasattr(d, 'get'):
4c1cfe54c08d templater: extend dot operator as a short for get(dict, key) Yuya Nishihara <yuya@tcha.org> parents: 35318 diff changeset	482 return _getdictitem(d, memb)
35318 78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	483
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	484 sym = findsymbolicname(darg)
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	485 if sym:
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	486 raise error.ParseError(_("keyword '%s' has no member") % sym)
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	487 else:
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	488 raise error.ParseError(_("%r has no member") % d)
78590585c0db templater: add dot operator to easily access a sub item Yuya Nishihara <yuya@tcha.org> parents: 35317 diff changeset	489
30894 8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	490 def buildnegate(exp, context):
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	491 arg = compileexp(exp[1], context, exprmethods)
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	492 return (runnegate, arg)
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	493
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	494 def runnegate(context, mapping, data):
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	495 data = evalinteger(context, mapping, data,
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	496 _('negation needs an integer argument'))
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	497 return -data
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	498
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	499 def buildarithmetic(exp, context, func):
8e42dfde93d1 templater: provide arithmetic operations on integers Simon Farnsworth <simonfar@fb.com> parents: 30862 diff changeset	500 left = compileexp(exp[1], context, exprmethods)

1909

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1 # templater.py - template expansion for output

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

2 #

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

4 #

8225

46293a0c7e9f updated license to be explicit about GPL version 2

Martin Geisler <mg@lazybytes.net>

parents: 8223

diff changeset

5 # This software may be used and distributed according to the terms of the

10263

25e572394f5c Update license to GPLv2+

Matt Mackall <mpm@selenic.com>

parents: 9842

diff changeset

6 # GNU General Public License version 2 or any later version.

1909

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

7

34920

a8994d08e4a2 doctest: use print_function and convert bytes to unicode where needed

Yuya Nishihara <yuya@tcha.org>

parents: 34914

diff changeset

8 from __future__ import absolute_import, print_function

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

9

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

10 import os

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

11 import re

17982

e06e9fd2d99f template engine: convert generator-based iterator to list-based iterator

Weiwen <weiwen@fb.com>

parents: 17890

diff changeset

12 import types

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

13

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

14 from .i18n import _

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

15 from . import (

32300

44c591f63458 templater: make pad() strip color codes before computing width (issue5416)

Yuya Nishihara <yuya@tcha.org>

parents: 32299

diff changeset

16 color,

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

17 config,

32299

6f150bb19317 templater: make pad() compute actual width

Yuya Nishihara <yuya@tcha.org>

parents: 32298

diff changeset

18 encoding,

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

19 error,

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

20 minirst,

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

21 obsutil,

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

22 parser,

31394

bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4)

Pulkit Goyal <7895pulkit@gmail.com>

parents: 31111

diff changeset

23 pycompat,

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

24 registrar,

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

25 revset as revsetmod,

31803

0b8356705de6 revset: split language services to revsetlang module (API)

Yuya Nishihara <yuya@tcha.org>

parents: 31404

diff changeset

26 revsetlang,

35241

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

27 scmutil,

26569

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

28 templatefilters,

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

29 templatekw,

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

30 util,

7eb357b5f774 templater: use absolute_import

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26375

diff changeset

31 )

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

32

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

33 # template parsing

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

34

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

35 elements = {

26375

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

36 # token-type: binding-strength, primary, prefix, infix, suffix

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

37 "(": (20, None, ("group", 1, ")"), ("func", 1, ")"), None),

35318

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

38 ".": (18, None, None, (".", 18), None),

35112

6367318327f0 templater: adjust binding strength of '%' and '|' operators (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 35111

diff changeset

39 "%": (15, None, None, ("%", 15), None),

32663

0926ca37a990 templater: adjust binding strengths to make room for key-value operator

Yuya Nishihara <yuya@tcha.org>

parents: 32662

diff changeset

40 "|": (15, None, None, ("|", 15), None),

0926ca37a990 templater: adjust binding strengths to make room for key-value operator

Yuya Nishihara <yuya@tcha.org>

parents: 32662

diff changeset

41 "*": (5, None, None, ("*", 5), None),

0926ca37a990 templater: adjust binding strengths to make room for key-value operator

Yuya Nishihara <yuya@tcha.org>

parents: 32662

diff changeset

42 "/": (5, None, None, ("/", 5), None),

0926ca37a990 templater: adjust binding strengths to make room for key-value operator

Yuya Nishihara <yuya@tcha.org>

parents: 32662

diff changeset

43 "+": (4, None, None, ("+", 4), None),

0926ca37a990 templater: adjust binding strengths to make room for key-value operator

Yuya Nishihara <yuya@tcha.org>

parents: 32662

diff changeset

44 "-": (4, None, ("negate", 19), ("-", 4), None),

32664

d18b624c1c06 templater: add parsing rule for key-value pair

Yuya Nishihara <yuya@tcha.org>

parents: 32663

diff changeset

45 "=": (3, None, None, ("keyvalue", 3), None),

32662

25be03a33f50 templater: sort token table by binding strength

Yuya Nishihara <yuya@tcha.org>

parents: 32659

diff changeset

46 ",": (2, None, None, ("list", 2), None),

25be03a33f50 templater: sort token table by binding strength

Yuya Nishihara <yuya@tcha.org>

parents: 32659

diff changeset

47 ")": (0, None, None, None, None),

26375

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

48 "integer": (0, "integer", None, None, None),

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

49 "symbol": (0, "symbol", None, None, None),

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

50 "string": (0, "string", None, None, None),

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

51 "template": (0, "template", None, None, None),

e71e5629e006 parser: separate actions for primary expression and prefix operator

Yuya Nishihara <yuya@tcha.org>

parents: 26360

diff changeset

52 "end": (0, None, None, None, None),

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

53 }

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

54

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

55 def tokenize(program, start, end, term=None):

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

56 """Parse a template expression into a stream of tokens, which must end

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

57 with term if specified"""

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

58 pos = start

32933

52e222eef646 py3: use pycompat.bytestr instead of bytes

Pulkit Goyal <7895pulkit@gmail.com>

parents: 32816

diff changeset

59 program = pycompat.bytestr(program)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

60 while pos < end:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

61 c = program[pos]

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

62 if c.isspace(): # skip inter-token whitespace

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

63 pass

35318

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

64 elif c in "(=,).%|+-*/": # handle simple operators

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

65 yield (c, None, pos)

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

66 elif c in '"\'': # handle quoted templates

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

67 s = pos + 1

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

68 data, pos = _parsetemplate(program, s, end, c)

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

69 yield ('template', data, s)

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

70 pos -= 1

26343

33e613687dab templater: remove processing of "string" literals from tokenizer

Yuya Nishihara <yuya@tcha.org>

parents: 26342

diff changeset

71 elif c == 'r' and program[pos:pos + 2] in ("r'", 'r"'):

33e613687dab templater: remove processing of "string" literals from tokenizer

Yuya Nishihara <yuya@tcha.org>

parents: 26342

diff changeset

72 # handle quoted strings

33e613687dab templater: remove processing of "string" literals from tokenizer

Yuya Nishihara <yuya@tcha.org>

parents: 26342

diff changeset

73 c = program[pos + 1]

33e613687dab templater: remove processing of "string" literals from tokenizer

Yuya Nishihara <yuya@tcha.org>

parents: 26342

diff changeset

74 s = pos = pos + 2

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

75 while pos < end: # find closing quote

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

76 d = program[pos]

26192

6047b60cdd09 templater: fix handling of \-escapes in raw string literals

Yuya Nishihara <yuya@tcha.org>

parents: 26191

diff changeset

77 if d == '\\': # skip over escaped characters

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

78 pos += 2

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

79 continue

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

80 if d == c:

26344

f976b7dc5e7b templater: unify "string" and "rawstring"

Yuya Nishihara <yuya@tcha.org>

parents: 26343

diff changeset

81 yield ('string', program[s:pos], s)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

82 break

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

83 pos += 1

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

84 else:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

85 raise error.ParseError(_("unterminated string"), s)

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

86 elif c.isdigit():

25393

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

87 s = pos

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

88 while pos < end:

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

89 d = program[pos]

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

90 if not d.isdigit():

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

91 break

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

92 pos += 1

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

93 yield ('integer', program[s:pos], s)

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

94 pos -= 1

26235

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

95 elif (c == '\\' and program[pos:pos + 2] in (r"\'", r'\"')

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

96 or c == 'r' and program[pos:pos + 3] in (r"r\'", r'r\"')):

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

97 # handle escaped quoted strings for compatibility with 2.9.2-3.4,

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

98 # where some of nested templates were preprocessed as strings and

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

99 # then compiled. therefore, \"...\" was allowed. (issue4733)

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

100 #

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

101 # processing flow of _evalifliteral() at 5ab28a2e9962:

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

102 # outer template string -> stringify() -> compiletemplate()

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

103 # ------------------------ ------------ ------------------

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

104 # {f("\\\\ {g(\"\\\"\")}"} \\ {g("\"")} [r'\\', {g("\"")}]

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

105 # ~~~~~~~~

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

106 # escaped quoted string

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

107 if c == 'r':

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

108 pos += 1

26344

f976b7dc5e7b templater: unify "string" and "rawstring"

Yuya Nishihara <yuya@tcha.org>

parents: 26343

diff changeset

109 token = 'string'

26235

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

110 else:

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

111 token = 'template'

26235

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

112 quote = program[pos:pos + 2]

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

113 s = pos = pos + 2

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

114 while pos < end: # find closing escaped quote

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

115 if program.startswith('\\\\\\', pos, end):

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

116 pos += 4 # skip over double escaped characters

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

117 continue

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

118 if program.startswith(quote, pos, end):

26823

72aad184f061 templater: create string unescape helper (issue4798)

Matt Mackall <mpm@selenic.com>

parents: 26796

diff changeset

119 # interpret as if it were a part of an outer string

26839

87c9c562c37a parser: move unescape helper from templater

Yuya Nishihara <yuya@tcha.org>

parents: 26823

diff changeset

120 data = parser.unescapestr(program[s:pos])

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

121 if token == 'template':

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

122 data = _parsetemplate(data, 0, len(data))[0]

26235

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

123 yield (token, data, s)

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

124 pos += 1

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

125 break

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

126 pos += 1

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

127 else:

ec9c258e666d templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)

Yuya Nishihara <yuya@tcha.org>

parents: 26192

diff changeset

128 raise error.ParseError(_("unterminated string"), s)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

129 elif c.isalnum() or c in '_':

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

130 s = pos

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

131 pos += 1

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

132 while pos < end: # find end of symbol

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

133 d = program[pos]

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

134 if not (d.isalnum() or d == "_"):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

135 break

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

136 pos += 1

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

137 sym = program[s:pos]

18893

74ea61318ea8 templater: back out 0615b22da148, it breaks schemes ({1})

Brendan Cully <brendan@kublai.com>

parents: 18889

diff changeset

138 yield ('symbol', sym, s)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

139 pos -= 1

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

140 elif c == term:

26341

babd2c93bd99 templater: check existence of closing brace of template string

Yuya Nishihara <yuya@tcha.org>

parents: 26340

diff changeset

141 yield ('end', None, pos + 1)

babd2c93bd99 templater: check existence of closing brace of template string

Yuya Nishihara <yuya@tcha.org>

parents: 26340

diff changeset

142 return

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

143 else:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

144 raise error.ParseError(_("syntax error"), pos)

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

145 pos += 1

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

146 if term:

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

147 raise error.ParseError(_("unterminated template expansion"), start)

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

148 yield ('end', None, pos)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

149

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

150 def _parsetemplate(tmpl, start, stop, quote=''):

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

151 r"""

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

152 >>> _parsetemplate(b'foo{bar}"baz', 0, 12)

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

153 ([('string', 'foo'), ('symbol', 'bar'), ('string', '"baz')], 12)

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

154 >>> _parsetemplate(b'foo{bar}"baz', 0, 12, quote=b'"')

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

155 ([('string', 'foo'), ('symbol', 'bar')], 9)

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

156 >>> _parsetemplate(b'foo"{bar}', 0, 9, quote=b'"')

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

157 ([('string', 'foo')], 4)

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

158 >>> _parsetemplate(br'foo\"bar"baz', 0, 12, quote=b'"')

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

159 ([('string', 'foo"'), ('string', 'bar')], 9)

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

160 >>> _parsetemplate(br'foo\\"bar', 0, 10, quote=b'"')

26344

f976b7dc5e7b templater: unify "string" and "rawstring"

Yuya Nishihara <yuya@tcha.org>

parents: 26343

diff changeset

161 ([('string', 'foo\\')], 6)

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

162 """

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

163 parsed = []

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

164 sepchars = '{' + quote

26340

82c918509ef5 templater: extract function that parses template string

Yuya Nishihara <yuya@tcha.org>

parents: 26339

diff changeset

165 pos = start

26208

af329a84310c parser: accept iterator of tokens instead of tokenizer function and program

Yuya Nishihara <yuya@tcha.org>

parents: 26142

diff changeset

166 p = parser.parser(elements)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

167 while pos < stop:

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

168 n = min((tmpl.find(c, pos, stop) for c in sepchars),

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

169 key=lambda n: (n < 0, n))

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

170 if n < 0:

26839

87c9c562c37a parser: move unescape helper from templater

Yuya Nishihara <yuya@tcha.org>

parents: 26823

diff changeset

171 parsed.append(('string', parser.unescapestr(tmpl[pos:stop])))

26339

8b900b937e1c templater: respect stop position while parsing template string

Yuya Nishihara <yuya@tcha.org>

parents: 26255

diff changeset

172 pos = stop

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

173 break

34854

f55769e41803 py3: use bytes[n:n + 1] to get bytes in templater._parsetemplate()

Yuya Nishihara <yuya@tcha.org>

parents: 34778

diff changeset

174 c = tmpl[n:n + 1]

25284

890845af1ac2 templater: strictly parse leading backslashes of '{' (issue4569) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25283

diff changeset

175 bs = (n - pos) - len(tmpl[pos:n].rstrip('\\'))

26141

55c2cb65bdfa templater: drop strtoken argument from compiletemplate()

Yuya Nishihara <yuya@tcha.org>

parents: 26140

diff changeset

176 if bs % 2 == 1:

55c2cb65bdfa templater: drop strtoken argument from compiletemplate()

Yuya Nishihara <yuya@tcha.org>

parents: 26140

diff changeset

177 # escaped (e.g. '\{', '\\\{', but not '\\{')

26839

87c9c562c37a parser: move unescape helper from templater

Yuya Nishihara <yuya@tcha.org>

parents: 26823

diff changeset

178 parsed.append(('string', parser.unescapestr(tmpl[pos:n - 1]) + c))

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

179 pos = n + 1

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

180 continue

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

181 if n > pos:

26839

87c9c562c37a parser: move unescape helper from templater

Yuya Nishihara <yuya@tcha.org>

parents: 26823

diff changeset

182 parsed.append(('string', parser.unescapestr(tmpl[pos:n])))

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

183 if c == quote:

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

184 return parsed, n + 1

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

185

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

186 parseres, pos = p.parse(tokenize(tmpl, n + 1, stop, '}'))

13665

e798e430c5e5 revset: report a parse error if a revset is not parsed completely (issue2654)

Bernhard Leiner <bleiner@gmail.com>

parents: 13187

diff changeset

187 parsed.append(parseres)

26342

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

188

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

189 if quote:

1f6878c87c25 templater: introduce one-pass parsing of nested template strings

Yuya Nishihara <yuya@tcha.org>

parents: 26341

diff changeset

190 raise error.ParseError(_("unterminated string"), start)

26340

82c918509ef5 templater: extract function that parses template string

Yuya Nishihara <yuya@tcha.org>

parents: 26339

diff changeset

191 return parsed, pos

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

192

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

193 def _unnesttemplatelist(tree):

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

194 """Expand list of templates to node tuple

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

195

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

196 >>> def f(tree):

34920

a8994d08e4a2 doctest: use print_function and convert bytes to unicode where needed

Yuya Nishihara <yuya@tcha.org>

parents: 34914

diff changeset

197 ... print(pycompat.sysstr(prettyformat(_unnesttemplatelist(tree))))

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

198 >>> f((b'template', []))

34856

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

199 (string '')

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

200 >>> f((b'template', [(b'string', b'foo')]))

34856

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

201 (string 'foo')

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

202 >>> f((b'template', [(b'string', b'foo'), (b'symbol', b'rev')]))

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

203 (template

34856

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

204 (string 'foo')

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

205 (symbol 'rev'))

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

206 >>> f((b'template', [(b'symbol', b'rev')])) # template(rev) -> str

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

207 (template

34856

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

208 (symbol 'rev'))

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

209 >>> f((b'template', [(b'template', [(b'string', b'foo')])]))

34856

7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()

Yuya Nishihara <yuya@tcha.org>

parents: 34854

diff changeset

210 (string 'foo')

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

211 """

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

212 if not isinstance(tree, tuple):

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

213 return tree

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

214 op = tree[0]

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

215 if op != 'template':

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

216 return (op,) + tuple(_unnesttemplatelist(x) for x in tree[1:])

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

217

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

218 assert len(tree) == 2

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

219 xs = tuple(_unnesttemplatelist(x) for x in tree[1])

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

220 if not xs:

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

221 return ('string', '') # empty template ""

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

222 elif len(xs) == 1 and xs[0][0] == 'string':

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

223 return xs[0] # fast path for string with no template fragment "x"

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

224 else:

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

225 return (op,) + xs

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

226

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

227 def parse(tmpl):

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

228 """Parse template string into tree"""

26340

82c918509ef5 templater: extract function that parses template string

Yuya Nishihara <yuya@tcha.org>

parents: 26339

diff changeset

229 parsed, pos = _parsetemplate(tmpl, 0, len(tmpl))

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

230 assert pos == len(tmpl), 'unquoted template should be consumed'

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

231 return _unnesttemplatelist(('template', parsed))

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

232

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

233 def _parseexpr(expr):

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

234 """Parse a template expression into tree

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

235

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

236 >>> _parseexpr(b'"foo"')

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

237 ('string', 'foo')

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

238 >>> _parseexpr(b'foo(bar)')

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

239 ('func', ('symbol', 'foo'), ('symbol', 'bar'))

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

240 >>> _parseexpr(b'foo(')

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

241 Traceback (most recent call last):

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

242 ...

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

243 ParseError: ('not a prefix: end', 4)

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

244 >>> _parseexpr(b'"foo" "bar"')

29661

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

245 Traceback (most recent call last):

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

246 ...

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

247 ParseError: ('invalid token', 7)

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

248 """

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

249 p = parser.parser(elements)

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

250 tree, pos = p.parse(tokenize(expr, 0, len(expr)))

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

251 if pos != len(expr):

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

252 raise error.ParseError(_('invalid token'), pos)

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

253 return _unnesttemplatelist(tree)

35da19348143 templater: add function to parse whole string as template expression

Yuya Nishihara <yuya@tcha.org>

parents: 29587

diff changeset

254

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

255 def prettyformat(tree):

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

256 return parser.prettyformat(tree, ('integer', 'string', 'symbol'))

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

257

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

258 def compileexp(exp, context, curmethods):

29706

eea98190ed73 templater: inline compiletemplate() function into engine

Yuya Nishihara <yuya@tcha.org>

parents: 29704

diff changeset

259 """Compile parsed template tree to (func, data) pair"""

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

260 t = exp[0]

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

261 if t in curmethods:

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

262 return curmethods[t](exp, context)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

263 raise error.ParseError(_("unknown method '%s'") % t)

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

264

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

265 # template evaluation

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

266

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

267 def getsymbol(exp):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

268 if exp[0] == 'symbol':

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

269 return exp[1]

21822

028a48105191 templater: add symbol to error

Ryan McElroy <rmcelroy@fb.com>

parents: 21821

diff changeset

270 raise error.ParseError(_("expected a symbol, got '%s'") % exp[0])

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

271

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

272 def getlist(x):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

273 if not x:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

274 return []

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

275 if x[0] == 'list':

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

276 return getlist(x[1]) + [x[2]]

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

277 return [x]

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

278

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

279 def gettemplate(exp, context):

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

280 """Compile given template tree or load named template from map file;

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

281 returns (func, data) pair"""

29287

1987ed32efca templater: relax type of mapped template

Yuya Nishihara <yuya@tcha.org>

parents: 29286

diff changeset

282 if exp[0] in ('template', 'string'):

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

283 return compileexp(exp, context, methods)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

284 if exp[0] == 'symbol':

26142

695b93a79d17 templater: comment that gettemplate() has different name resolution order

Yuya Nishihara <yuya@tcha.org>

parents: 26141

diff changeset

285 # unlike runsymbol(), here 'symbol' is always taken as template name

695b93a79d17 templater: comment that gettemplate() has different name resolution order

Yuya Nishihara <yuya@tcha.org>

parents: 26141

diff changeset

286 # even if it exists in mapping. this allows us to override mapping

695b93a79d17 templater: comment that gettemplate() has different name resolution order

Yuya Nishihara <yuya@tcha.org>

parents: 26141

diff changeset

287 # by web templates, e.g. 'changelogtag' is redefined in map file.

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

288 return context._load(exp[1])

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

289 raise error.ParseError(_("expected template specifier"))

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

290

32706

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

291 def findsymbolicname(arg):

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

292 """Find symbolic name for the given compiled expression; returns None

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

293 if nothing found reliably"""

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

294 while True:

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

295 func, data = arg

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

296 if func is runsymbol:

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

297 return data

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

298 elif func is runfilter:

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

299 arg = data[0]

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

300 else:

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

301 return None

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

302

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

303 def evalrawexp(context, mapping, arg):

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

304 """Evaluate given argument as a bare template object which may require

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

305 further processing (such as folding generator of strings)"""

26720

604a7c941103 templater: extract helper that evaluates filter or function argument

Yuya Nishihara <yuya@tcha.org>

parents: 26693

diff changeset

306 func, data = arg

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

307 return func(context, mapping, data)

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

308

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

309 def evalfuncarg(context, mapping, arg):

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

310 """Evaluate given argument as value type"""

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

311 thing = evalrawexp(context, mapping, arg)

35113

89aec1834a86 templatekw: add new-style template expansion to {manifest}

Yuya Nishihara <yuya@tcha.org>

parents: 35112

diff changeset

312 thing = templatekw.unwrapvalue(thing)

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

313 # evalrawexp() may return string, generator of strings or arbitrary object

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

314 # such as date tuple, but filter does not want generator.

26720

604a7c941103 templater: extract helper that evaluates filter or function argument

Yuya Nishihara <yuya@tcha.org>

parents: 26693

diff changeset

315 if isinstance(thing, types.GeneratorType):

604a7c941103 templater: extract helper that evaluates filter or function argument

Yuya Nishihara <yuya@tcha.org>

parents: 26693

diff changeset

316 thing = stringify(thing)

604a7c941103 templater: extract helper that evaluates filter or function argument

Yuya Nishihara <yuya@tcha.org>

parents: 26693

diff changeset

317 return thing

604a7c941103 templater: extract helper that evaluates filter or function argument

Yuya Nishihara <yuya@tcha.org>

parents: 26693

diff changeset

318

30586

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

319 def evalboolean(context, mapping, arg):

30587

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

320 """Evaluate given argument as boolean, but also takes boolean literals"""

30586

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

321 func, data = arg

30587

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

322 if func is runsymbol:

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

323 thing = func(context, mapping, data, default=None)

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

324 if thing is None:

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

325 # not a template keyword, takes as a boolean literal

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

326 thing = util.parsebool(data)

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

327 else:

cc11079644fc templater: make pad() evaluate boolean argument (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 30586

diff changeset

328 thing = func(context, mapping, data)

35113

89aec1834a86 templatekw: add new-style template expansion to {manifest}

Yuya Nishihara <yuya@tcha.org>

parents: 35112

diff changeset

329 thing = templatekw.unwrapvalue(thing)

30586

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

330 if isinstance(thing, bool):

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

331 return thing

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

332 # other objects are evaluated as strings, which means 0 is True, but

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

333 # empty dict/list should be False as they are expected to be ''

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

334 return bool(stringify(thing))

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

335

35364

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

336 def evalinteger(context, mapping, arg, err=None):

29015

ac371d4c007f templater: drop redundant type conversion when evaluating integer argument

Yuya Nishihara <yuya@tcha.org>

parents: 29014

diff changeset

337 v = evalfuncarg(context, mapping, arg)

29014

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

338 try:

29015

ac371d4c007f templater: drop redundant type conversion when evaluating integer argument

Yuya Nishihara <yuya@tcha.org>

parents: 29014

diff changeset

339 return int(v)

ac371d4c007f templater: drop redundant type conversion when evaluating integer argument

Yuya Nishihara <yuya@tcha.org>

parents: 29014

diff changeset

340 except (TypeError, ValueError):

35364

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

341 raise error.ParseError(err or _('not an integer'))

29014

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

342

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

343 def evalstring(context, mapping, arg):

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

344 return stringify(evalrawexp(context, mapping, arg))

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

345

29044

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

346 def evalstringliteral(context, mapping, arg):

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

347 """Evaluate given argument as string template, but returns symbol name

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

348 if it is unknown"""

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

349 func, data = arg

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

350 if func is runsymbol:

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

351 thing = func(context, mapping, data, default=data)

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

352 else:

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

353 thing = func(context, mapping, data)

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

354 return stringify(thing)

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

355

35364

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

356 _evalfuncbytype = {

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

357 bool: evalboolean,

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

358 bytes: evalstring,

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

359 int: evalinteger,

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

360 }

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

361

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

362 def evalastype(context, mapping, arg, typ):

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

363 """Evaluate given argument and coerce its type"""

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

364 try:

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

365 f = _evalfuncbytype[typ]

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

366 except KeyError:

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

367 raise error.ProgrammingError('invalid type specified: %r' % typ)

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

368 return f(context, mapping, arg)

ee0d74083a22 templater: store revisions as ints so min/max won't compare them as strings

Yuya Nishihara <yuya@tcha.org>

parents: 35319

diff changeset

369

25393

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

370 def runinteger(context, mapping, data):

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

371 return int(data)

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

372

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

373 def runstring(context, mapping, data):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

374 return data

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

375

28610

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

376 def _recursivesymbolblocker(key):

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

377 def showrecursion(**args):

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

378 raise error.Abort(_("recursive reference '%s' in template") % key)

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

379 return showrecursion

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

380

28611

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

381 def _runrecursivesymbol(context, mapping, key):

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

382 raise error.Abort(_("recursive reference '%s' in template") % key)

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

383

29044

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

384 def runsymbol(context, mapping, key, default=''):

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

385 v = mapping.get(key)

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

386 if v is None:

19770

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

387 v = context._defaults.get(key)

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

388 if v is None:

28610

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

389 # put poison to cut recursion. we can't move this to parsing phase

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

390 # because "x = {x}" is allowed if "x" is a keyword. (issue4758)

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

391 safemapping = mapping.copy()

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

392 safemapping[key] = _recursivesymbolblocker(key)

19770

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

393 try:

28610

7ed3a3c0cef1 templater: abort if infinite recursion detected while evaluation (issue4758)

Yuya Nishihara <yuya@tcha.org>

parents: 28547

diff changeset

394 v = context.process(key, safemapping)

19770

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

395 except TemplateNotFound:

29044

9a9dd71e882c templater: make label() take unknown symbol as color literal

Yuya Nishihara <yuya@tcha.org>

parents: 29020

diff changeset

396 v = default

21798

f2c617ff2abc templater: restore use of callable() since it was readded in Python 3.2

Augie Fackler <raf@durin42.com>

parents: 21540

diff changeset

397 if callable(v):

33800

c31d45623304 py3: convert kwargs' keys' to str using pycompat.strkwargs()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33799

diff changeset

398 return v(**pycompat.strkwargs(mapping))

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

399 return v

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

400

26139

c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 26138

diff changeset

401 def buildtemplate(exp, context):

29288

73d01cba5810 templater: expand list of parsed templates to template node

Yuya Nishihara <yuya@tcha.org>

parents: 29287

diff changeset

402 ctmpl = [compileexp(e, context, methods) for e in exp[1:]]

26139

c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 26138

diff changeset

403 return (runtemplate, ctmpl)

c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 26138

diff changeset

404

26138

a7dd6692e5cb templater: move runtemplate function out of buildmap/runmap pair

Yuya Nishihara <yuya@tcha.org>

parents: 26123

diff changeset

405 def runtemplate(context, mapping, template):

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

406 for arg in template:

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

407 yield evalrawexp(context, mapping, arg)

26138

a7dd6692e5cb templater: move runtemplate function out of buildmap/runmap pair

Yuya Nishihara <yuya@tcha.org>

parents: 26123

diff changeset

408

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

409 def buildfilter(exp, context):

26691

0f1bc7faa50d templater: inline getfilter() to buildfilter()

Yuya Nishihara <yuya@tcha.org>

parents: 26569

diff changeset

410 n = getsymbol(exp[2])

0f1bc7faa50d templater: inline getfilter() to buildfilter()

Yuya Nishihara <yuya@tcha.org>

parents: 26569

diff changeset

411 if n in context._filters:

0f1bc7faa50d templater: inline getfilter() to buildfilter()

Yuya Nishihara <yuya@tcha.org>

parents: 26569

diff changeset

412 filt = context._filters[n]

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

413 arg = compileexp(exp[1], context, methods)

26721

c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter

Yuya Nishihara <yuya@tcha.org>

parents: 26720

diff changeset

414 return (runfilter, (arg, filt))

26692

d67341f55429 templater: introduce unified filter syntax for unary functions

Yuya Nishihara <yuya@tcha.org>

parents: 26691

diff changeset

415 if n in funcs:

d67341f55429 templater: introduce unified filter syntax for unary functions

Yuya Nishihara <yuya@tcha.org>

parents: 26691

diff changeset

416 f = funcs[n]

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

417 args = _buildfuncargs(exp[1], context, methods, n, f._argspec)

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

418 return (f, args)

26691

0f1bc7faa50d templater: inline getfilter() to buildfilter()

Yuya Nishihara <yuya@tcha.org>

parents: 26569

diff changeset

419 raise error.ParseError(_("unknown function '%s'") % n)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

420

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

421 def runfilter(context, mapping, data):

26721

c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter

Yuya Nishihara <yuya@tcha.org>

parents: 26720

diff changeset

422 arg, filt = data

c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter

Yuya Nishihara <yuya@tcha.org>

parents: 26720

diff changeset

423 thing = evalfuncarg(context, mapping, arg)

17383

099c778ceb33 templater: abort when a template filter raises an exception (issue2987)

Neil Kodner <neilk@fb.com>

parents: 17334

diff changeset

424 try:

24387

6c55e37ba5f2 templater: allow piping generator-type function output to filters

Yuya Nishihara <yuya@tcha.org>

parents: 24342

diff changeset

425 return filt(thing)

17383

099c778ceb33 templater: abort when a template filter raises an exception (issue2987)

Neil Kodner <neilk@fb.com>

parents: 17334

diff changeset

426 except (ValueError, AttributeError, TypeError):

32706

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

427 sym = findsymbolicname(arg)

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

428 if sym:

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

429 msg = (_("template filter '%s' is not compatible with keyword '%s'")

35621

d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs

Augie Fackler <augie@google.com>

parents: 35591

diff changeset

430 % (pycompat.sysbytes(filt.__name__), sym))

17383

099c778ceb33 templater: abort when a template filter raises an exception (issue2987)

Neil Kodner <neilk@fb.com>

parents: 17334

diff changeset

431 else:

35621

d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs

Augie Fackler <augie@google.com>

parents: 35591

diff changeset

432 msg = (_("incompatible use of template filter '%s'")

d3ea6a1c798f templater: use pycompat.sysbytes to bytes-ify some __name__ attrs

Augie Fackler <augie@google.com>

parents: 35591

diff changeset

433 % pycompat.sysbytes(filt.__name__))

32706

2abc556dbe92 templater: find keyword name more thoroughly on filtering error

Yuya Nishihara <yuya@tcha.org>

parents: 32705

diff changeset

434 raise error.Abort(msg)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

435

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

436 def buildmap(exp, context):

35108

86d050abd5c1 templater: do not destructure operands in buildmap()

Yuya Nishihara <yuya@tcha.org>

parents: 35107

diff changeset

437 darg = compileexp(exp[1], context, methods)

86d050abd5c1 templater: do not destructure operands in buildmap()

Yuya Nishihara <yuya@tcha.org>

parents: 35107

diff changeset

438 targ = gettemplate(exp[2], context)

86d050abd5c1 templater: do not destructure operands in buildmap()

Yuya Nishihara <yuya@tcha.org>

parents: 35107

diff changeset

439 return (runmap, (darg, targ))

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

440

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

441 def runmap(context, mapping, data):

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

442 darg, targ = data

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

443 d = evalrawexp(context, mapping, darg)

28546

ac8c0ee5c3b8 templater: make _hybrid not callable to avoid conflicting semantics

Yuya Nishihara <yuya@tcha.org>

parents: 28292

diff changeset

444 if util.safehasattr(d, 'itermaps'):

29020

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

445 diter = d.itermaps()

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

446 else:

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

447 try:

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

448 diter = iter(d)

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

449 except TypeError:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

450 sym = findsymbolicname(darg)

35107

e473f482b9b3 templater: use helper function to get name of non-iterable keyword

Yuya Nishihara <yuya@tcha.org>

parents: 35070

diff changeset

451 if sym:

e473f482b9b3 templater: use helper function to get name of non-iterable keyword

Yuya Nishihara <yuya@tcha.org>

parents: 35070

diff changeset

452 raise error.ParseError(_("keyword '%s' is not iterable") % sym)

29020

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

453 else:

7cb2f2438f85 templater: handle exception when applying map operator to non-iterable object

Yuya Nishihara <yuya@tcha.org>

parents: 29019

diff changeset

454 raise error.ParseError(_("%r is not iterable") % d)

17631

0b241d7a8c62 templating: make new-style templating features work with command line lists

Matt Mackall <mpm@selenic.com>

parents: 17383

diff changeset

455

32586

e6eb86b154c5 templater: provide loop counter as "index" keyword

Yuya Nishihara <yuya@tcha.org>

parents: 32585

diff changeset

456 for i, v in enumerate(diter):

28896

5c11702fe2a3 templater: fix list templating bug

Kostia Balytskyi <ikostia@fb.com>

parents: 28849

diff changeset

457 lm = mapping.copy()

32586

e6eb86b154c5 templater: provide loop counter as "index" keyword

Yuya Nishihara <yuya@tcha.org>

parents: 32585

diff changeset

458 lm['index'] = i

32585

8f203b491bb5 templater: rename variable "i" to "v" in runmap()

Yuya Nishihara <yuya@tcha.org>

parents: 32300

diff changeset

459 if isinstance(v, dict):

8f203b491bb5 templater: rename variable "i" to "v" in runmap()

Yuya Nishihara <yuya@tcha.org>

parents: 32300

diff changeset

460 lm.update(v)

17991

d605a82cf189 hgweb: display diff for a changeset against any parents (issue2810)

Weiwen <weiwen@fb.com>

parents: 17982

diff changeset

461 lm['originalnode'] = mapping.get('node')

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

462 yield evalrawexp(context, lm, targ)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

463 else:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

464 # v is not an iterable of dicts, this happen when 'key'

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

465 # has been fully expanded already and format is useless.

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

466 # If so, return the expanded value.

32585

8f203b491bb5 templater: rename variable "i" to "v" in runmap()

Yuya Nishihara <yuya@tcha.org>

parents: 32300

diff changeset

467 yield v

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

468

35318

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

469 def buildmember(exp, context):

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

470 darg = compileexp(exp[1], context, methods)

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

471 memb = getsymbol(exp[2])

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

472 return (runmember, (darg, memb))

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

473

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

474 def runmember(context, mapping, data):

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

475 darg, memb = data

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

476 d = evalrawexp(context, mapping, darg)

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

477 if util.safehasattr(d, 'tomap'):

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

478 lm = mapping.copy()

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

479 lm.update(d.tomap())

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

480 return runsymbol(context, lm, memb)

35319

4c1cfe54c08d templater: extend dot operator as a short for get(dict, key)

Yuya Nishihara <yuya@tcha.org>

parents: 35318

diff changeset

481 if util.safehasattr(d, 'get'):

4c1cfe54c08d templater: extend dot operator as a short for get(dict, key)

Yuya Nishihara <yuya@tcha.org>

parents: 35318

diff changeset

482 return _getdictitem(d, memb)

35318

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

483

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

484 sym = findsymbolicname(darg)

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

485 if sym:

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

486 raise error.ParseError(_("keyword '%s' has no member") % sym)

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

487 else:

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

488 raise error.ParseError(_("%r has no member") % d)

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

489

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

490 def buildnegate(exp, context):

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

491 arg = compileexp(exp[1], context, exprmethods)

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

492 return (runnegate, arg)

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

493

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

494 def runnegate(context, mapping, data):

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

495 data = evalinteger(context, mapping, data,

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

496 _('negation needs an integer argument'))

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

497 return -data

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

498

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

499 def buildarithmetic(exp, context, func):

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

500 left = compileexp(exp[1], context, exprmethods)

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

501 right = compileexp(exp[2], context, exprmethods)

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

502 return (runarithmetic, (func, left, right))

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

503

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

504 def runarithmetic(context, mapping, data):

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

505 func, left, right = data

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

506 left = evalinteger(context, mapping, left,

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

507 _('arithmetic only defined on integers'))

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

508 right = evalinteger(context, mapping, right,

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

509 _('arithmetic only defined on integers'))

30895

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

510 try:

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

511 return func(left, right)

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

512 except ZeroDivisionError:

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

513 raise error.Abort(_('division by zero is not defined'))

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

514

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

515 def buildfunc(exp, context):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

516 n = getsymbol(exp[1])

14925

ab545a15d807 templater: use a global funcs table

Matt Mackall <mpm@selenic.com>

parents: 14170

diff changeset

517 if n in funcs:

ab545a15d807 templater: use a global funcs table

Matt Mackall <mpm@selenic.com>

parents: 14170

diff changeset

518 f = funcs[n]

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

519 args = _buildfuncargs(exp[2], context, exprmethods, n, f._argspec)

14925

ab545a15d807 templater: use a global funcs table

Matt Mackall <mpm@selenic.com>

parents: 14170

diff changeset

520 return (f, args)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

521 if n in context._filters:

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

522 args = _buildfuncargs(exp[2], context, exprmethods, n, argspec=None)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

523 if len(args) != 1:

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

524 raise error.ParseError(_("filter %s expects one argument") % n)

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

525 f = context._filters[n]

26721

c990afab2243 templater: drop unneeded destructuring of argument tuple at buildfilter

Yuya Nishihara <yuya@tcha.org>

parents: 26720

diff changeset

526 return (runfilter, (args[0], f))

20857

6eb55310fcbc templater: raise error for unknown func

Sean Farley <sean.michael.farley@gmail.com>

parents: 20664

diff changeset

527 raise error.ParseError(_("unknown function '%s'") % n)

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

528

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

529 def _buildfuncargs(exp, context, curmethods, funcname, argspec):

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

530 """Compile parsed tree of function arguments into list or dict of

32700

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

531 (func, data) pairs

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

532

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

533 >>> context = engine(lambda t: (runsymbol, t))

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

534 >>> def fargs(expr, argspec):

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

535 ... x = _parseexpr(expr)

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

536 ... n = getsymbol(x[1])

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

537 ... return _buildfuncargs(x[2], context, exprmethods, n, argspec)

34922

be00af4a1ac5 doctest: coerce dict.keys() to list

Yuya Nishihara <yuya@tcha.org>

parents: 34920

diff changeset

538 >>> list(fargs(b'a(l=1, k=2)', b'k l m').keys())

32701

0f41f1e3c75c parser: preserve order of keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32700

diff changeset

539 ['l', 'k']

34914

0fa781320203 doctest: bulk-replace string literals with b'' for Python 3

Yuya Nishihara <yuya@tcha.org>

parents: 34856

diff changeset

540 >>> args = fargs(b'a(opts=1, k=2)', b'**opts')

34922

be00af4a1ac5 doctest: coerce dict.keys() to list

Yuya Nishihara <yuya@tcha.org>

parents: 34920

diff changeset

541 >>> list(args.keys()), list(args[b'opts'].keys())

32701

0f41f1e3c75c parser: preserve order of keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32700

diff changeset

542 (['opts'], ['opts', 'k'])

32700

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

543 """

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

544 def compiledict(xs):

32701

0f41f1e3c75c parser: preserve order of keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32700

diff changeset

545 return util.sortdict((k, compileexp(x, context, curmethods))

0f41f1e3c75c parser: preserve order of keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32700

diff changeset

546 for k, x in xs.iteritems())

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

547 def compilelist(xs):

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

548 return [compileexp(x, context, curmethods) for x in xs]

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

549

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

550 if not argspec:

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

551 # filter or function with no argspec: return list of positional args

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

552 return compilelist(getlist(exp))

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

553

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

554 # function with argspec: return dict of named args

32700

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

555 _poskeys, varkey, _keys, optkey = argspec = parser.splitargspec(argspec)

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

556 treeargs = parser.buildargsdict(getlist(exp), funcname, argspec,

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

557 keyvaluenode='keyvalue', keynode='symbol')

32701

0f41f1e3c75c parser: preserve order of keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32700

diff changeset

558 compargs = util.sortdict()

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

559 if varkey:

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

560 compargs[varkey] = compilelist(treeargs.pop(varkey))

32700

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

561 if optkey:

2156934b7917 parser: extend buildargsdict() to support arbitrary number of **kwargs

Yuya Nishihara <yuya@tcha.org>

parents: 32666

diff changeset

562 compargs[optkey] = compiledict(treeargs.pop(optkey))

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

563 compargs.update(compiledict(treeargs))

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

564 return compargs

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

565

32664

d18b624c1c06 templater: add parsing rule for key-value pair

Yuya Nishihara <yuya@tcha.org>

parents: 32663

diff changeset

566 def buildkeyvaluepair(exp, content):

d18b624c1c06 templater: add parsing rule for key-value pair

Yuya Nishihara <yuya@tcha.org>

parents: 32663

diff changeset

567 raise error.ParseError(_("can't use a key-value pair in this context"))

d18b624c1c06 templater: add parsing rule for key-value pair

Yuya Nishihara <yuya@tcha.org>

parents: 32663

diff changeset

568

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

569 # dict of template built-in functions

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

570 funcs = {}

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

571

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

572 templatefunc = registrar.templatefunc(funcs)

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

573

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

574 @templatefunc('date(date[, fmt])')

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

575 def date(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

576 """Format a date. See :hg:`help dates` for formatting

26693

c568c4db036f templatefilters: remove redundant 'date' and 'strip' filters

Yuya Nishihara <yuya@tcha.org>

parents: 26692

diff changeset

577 strings. The default is a Unix date format, including the timezone:

c568c4db036f templatefilters: remove redundant 'date' and 'strip' filters

Yuya Nishihara <yuya@tcha.org>

parents: 26692

diff changeset

578 "Mon Sep 04 15:13:13 2006 0700"."""

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

579 if not (1 <= len(args) <= 2):

23112

3226ed457928 i18n: add i18n comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22844

diff changeset

580 # i18n: "date" is a keyword

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

581 raise error.ParseError(_("date expects one or two arguments"))

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

582

29005

9dc340f51e06 templater: make date() use helper function to evaluate argument

Yuya Nishihara <yuya@tcha.org>

parents: 29004

diff changeset

583 date = evalfuncarg(context, mapping, args[0])

25191

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

584 fmt = None

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

585 if len(args) == 2:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

586 fmt = evalstring(context, mapping, args[1])

25191

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

587 try:

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

588 if fmt is None:

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

589 return util.datestr(date)

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

590 else:

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

591 return util.datestr(date, fmt)

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

592 except (TypeError, ValueError):

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

593 # i18n: "date" is a keyword

09124cce913f templater: fix crash by passing invalid object to date() function

Yuya Nishihara <yuya@tcha.org>

parents: 25143

diff changeset

594 raise error.ParseError(_("date expects a date information"))

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

595

32707

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

596 @templatefunc('dict([[key=]value...])', argspec='*args **kwargs')

32705

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

597 def dict_(context, mapping, args):

32707

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

598 """Construct a dict from key-value pairs. A key may be omitted if

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

599 a value expression can provide an unambiguous name."""

32705

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

600 data = util.sortdict()

32707

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

601

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

602 for v in args['args']:

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

603 k = findsymbolicname(v)

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

604 if not k:

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

605 raise error.ParseError(_('dict key cannot be inferred'))

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

606 if k in data or k in args['kwargs']:

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

607 raise error.ParseError(_("duplicated dict key '%s' inferred") % k)

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

608 data[k] = evalfuncarg(context, mapping, v)

277b3e2d711b templater: add shorthand for building a dict like {"key": key}

Yuya Nishihara <yuya@tcha.org>

parents: 32706

diff changeset

609

32705

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

610 data.update((k, evalfuncarg(context, mapping, v))

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

611 for k, v in args['kwargs'].iteritems())

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

612 return templatekw.hybriddict(data)

932241b8c644 templater: add dict() constructor

Yuya Nishihara <yuya@tcha.org>

parents: 32701

diff changeset

613

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

614 @templatefunc('diff([includepattern [, excludepattern]])')

22434

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

615 def diff(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

616 """Show a diff, optionally

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

617 specifying files to include or exclude."""

22434

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

618 if len(args) > 2:

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

619 # i18n: "diff" is a keyword

27940

9e06e7fb037d grammar: favor zero, one, two over ... or no

timeless <timeless@mozdev.org>

parents: 27227

diff changeset

620 raise error.ParseError(_("diff expects zero, one, or two arguments"))

22434

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

621

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

622 def getpatterns(i):

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

623 if i < len(args):

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

624 s = evalstring(context, mapping, args[i]).strip()

22434

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

625 if s:

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

626 return [s]

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

627 return []

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

628

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

629 ctx = mapping['ctx']

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

630 chunks = ctx.diff(match=ctx.match([], getpatterns(0), getpatterns(1)))

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

631

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

632 return ''.join(chunks)

40ce05b50148 templater: add "diff" template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22304

diff changeset

633

35241

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

634 @templatefunc('extdata(source)', argspec='source')

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

635 def extdata(context, mapping, args):

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

636 """Show a text read from the specified extdata source. (EXPERIMENTAL)"""

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

637 if 'source' not in args:

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

638 # i18n: "extdata" is a keyword

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

639 raise error.ParseError(_('extdata expects one argument'))

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

640

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

641 source = evalstring(context, mapping, args['source'])

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

642 cache = mapping['cache'].setdefault('extdata', {})

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

643 ctx = mapping['ctx']

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

644 if source in cache:

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

645 data = cache[source]

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

646 else:

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

647 data = cache[source] = scmutil.extdatasource(ctx.repo(), source)

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

648 return data.get(ctx.rev(), '')

a1b89c8ad32d templater: add experimental support for extdata

Yuya Nishihara <yuya@tcha.org>

parents: 35129

diff changeset

649

30787

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

650 @templatefunc('files(pattern)')

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

651 def files(context, mapping, args):

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

652 """All files of the current changeset matching the pattern. See

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

653 :hg:`help patterns`."""

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

654 if not len(args) == 1:

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

655 # i18n: "files" is a keyword

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

656 raise error.ParseError(_("files expects one argument"))

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

657

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

658 raw = evalstring(context, mapping, args[0])

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

659 ctx = mapping['ctx']

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

660 m = ctx.match([raw])

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

661 files = list(ctx.matches(m))

32816

e5eab0fe69ee templatekw: have showlist() take mapping dict with no **kwargs expansion (API)

Yuya Nishihara <yuya@tcha.org>

parents: 32707

diff changeset

662 return templatekw.showlist("file", files, mapping)

30787

e83f89d3b1f7 templates: add built-in files() function

Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>

parents: 30618

diff changeset

663

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

664 @templatefunc('fill(text[, width[, initialident[, hangindent]]])')

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

665 def fill(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

666 """Fill many

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

667 paragraphs with optional indentation. See the "fill" filter."""

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

668 if not (1 <= len(args) <= 4):

23112

3226ed457928 i18n: add i18n comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22844

diff changeset

669 # i18n: "fill" is a keyword

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

670 raise error.ParseError(_("fill expects one to four arguments"))

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

671

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

672 text = evalstring(context, mapping, args[0])

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

673 width = 76

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

674 initindent = ''

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

675 hangindent = ''

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

676 if 2 <= len(args) <= 4:

29014

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

677 width = evalinteger(context, mapping, args[1],

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

678 # i18n: "fill" is a keyword

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

679 _("fill expects an integer width"))

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

680 try:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

681 initindent = evalstring(context, mapping, args[2])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

682 hangindent = evalstring(context, mapping, args[3])

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

683 except IndexError:

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

684 pass

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

685

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

686 return templatefilters.fill(text, width, initindent, hangindent)

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

687

31948

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

688 @templatefunc('formatnode(node)')

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

689 def formatnode(context, mapping, args):

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

690 """Obtain the preferred form of a changeset hash. (DEPRECATED)"""

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

691 if len(args) != 1:

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

692 # i18n: "formatnode" is a keyword

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

693 raise error.ParseError(_("formatnode expects one argument"))

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

694

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

695 ui = mapping['ui']

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

696 node = evalstring(context, mapping, args[0])

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

697 if ui.debugflag:

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

698 return node

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

699 return templatefilters.short(node)

48a8b2e5fe31 templater: port formatnode filter from changeset_templater

Yuya Nishihara <yuya@tcha.org>

parents: 31803

diff changeset

700

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

701 @templatefunc('pad(text, width[, fillchar=\' \'[, left=False]])',

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

702 argspec='text width fillchar left')

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

703 def pad(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

704 """Pad text with a

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

705 fill character."""

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

706 if 'text' not in args or 'width' not in args:

23112

3226ed457928 i18n: add i18n comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22844

diff changeset

707 # i18n: "pad" is a keyword

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

708 raise error.ParseError(_("pad() expects two to four arguments"))

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

709

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

710 width = evalinteger(context, mapping, args['width'],

29016

d81437c91a26 templater: fix pad() to evaluate int argument and handle error

Yuya Nishihara <yuya@tcha.org>

parents: 29015

diff changeset

711 # i18n: "pad" is a keyword

d81437c91a26 templater: fix pad() to evaluate int argument and handle error

Yuya Nishihara <yuya@tcha.org>

parents: 29015

diff changeset

712 _("pad() expects an integer width"))

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

713

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

714 text = evalstring(context, mapping, args['text'])

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

715

30588

407879b0893b templater: rename "right" argument of pad() function

Yuya Nishihara <yuya@tcha.org>

parents: 30587

diff changeset

716 left = False

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

717 fillchar = ' '

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

718 if 'fillchar' in args:

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

719 fillchar = evalstring(context, mapping, args['fillchar'])

32300

44c591f63458 templater: make pad() strip color codes before computing width (issue5416)

Yuya Nishihara <yuya@tcha.org>

parents: 32299

diff changeset

720 if len(color.stripeffects(fillchar)) != 1:

32298

3725986b151a templater: reject bad fillchar argument passed to pad()

Yuya Nishihara <yuya@tcha.org>

parents: 31948

diff changeset

721 # i18n: "pad" is a keyword

3725986b151a templater: reject bad fillchar argument passed to pad()

Yuya Nishihara <yuya@tcha.org>

parents: 31948

diff changeset

722 raise error.ParseError(_("pad() expects a single fill character"))

32666

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

723 if 'left' in args:

f7b3677f66cd templater: port pad() to take keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32665

diff changeset

724 left = evalboolean(context, mapping, args['left'])

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

725

32300

44c591f63458 templater: make pad() strip color codes before computing width (issue5416)

Yuya Nishihara <yuya@tcha.org>

parents: 32299

diff changeset

726 fillwidth = width - encoding.colwidth(color.stripeffects(text))

32299

6f150bb19317 templater: make pad() compute actual width

Yuya Nishihara <yuya@tcha.org>

parents: 32298

diff changeset

727 if fillwidth <= 0:

6f150bb19317 templater: make pad() compute actual width

Yuya Nishihara <yuya@tcha.org>

parents: 32298

diff changeset

728 return text

30588

407879b0893b templater: rename "right" argument of pad() function

Yuya Nishihara <yuya@tcha.org>

parents: 30587

diff changeset

729 if left:

32299

6f150bb19317 templater: make pad() compute actual width

Yuya Nishihara <yuya@tcha.org>

parents: 32298

diff changeset

730 return fillchar * fillwidth + text

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

731 else:

32299

6f150bb19317 templater: make pad() compute actual width

Yuya Nishihara <yuya@tcha.org>

parents: 32298

diff changeset

732 return text + fillchar * fillwidth

20370

aa51392da507 template: add pad function for padding output

Durham Goode <durham@fb.com>

parents: 20369

diff changeset

733

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

734 @templatefunc('indent(text, indentchars[, firstline])')

26025

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

735 def indent(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

736 """Indents all non-empty lines

26025

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

737 with the characters given in the indentchars string. An optional

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

738 third parameter will override the indent for the first line only

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

739 if present."""

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

740 if not (2 <= len(args) <= 3):

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

741 # i18n: "indent" is a keyword

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

742 raise error.ParseError(_("indent() expects two or three arguments"))

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

743

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

744 text = evalstring(context, mapping, args[0])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

745 indent = evalstring(context, mapping, args[1])

26025

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

746

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

747 if len(args) == 3:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

748 firstline = evalstring(context, mapping, args[2])

26025

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

749 else:

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

750 firstline = indent

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

751

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

752 # the indent function doesn't indent the first line, so we do it here

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

753 return templatefilters.indent(firstline + text, indent)

ef8956aa8755 templater: introduce indent function

Ryan McElroy <rmcelroy@fb.com>

parents: 25507

diff changeset

754

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

755 @templatefunc('get(dict, key)')

18578

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

756 def get(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

757 """Get an attribute/key from an object. Some keywords

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

758 are complex types. This function allows you to obtain the value of an

26796

fb6c08a9b40a templater: fix get English

timeless@mozdev.org

parents: 26787

diff changeset

759 attribute on these types."""

18578

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

760 if len(args) != 2:

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

761 # i18n: "get" is a keyword

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

762 raise error.ParseError(_("get() expects two arguments"))

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

763

29002

2874db5462d3 templater: fix get() to evaluate arguments eagerly

Yuya Nishihara <yuya@tcha.org>

parents: 28896

diff changeset

764 dictarg = evalfuncarg(context, mapping, args[0])

18578

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

765 if not util.safehasattr(dictarg, 'get'):

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

766 # i18n: "get" is a keyword

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

767 raise error.ParseError(_("get() expects a dict as first argument"))

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

768

29002

2874db5462d3 templater: fix get() to evaluate arguments eagerly

Yuya Nishihara <yuya@tcha.org>

parents: 28896

diff changeset

769 key = evalfuncarg(context, mapping, args[1])

35319

4c1cfe54c08d templater: extend dot operator as a short for get(dict, key)

Yuya Nishihara <yuya@tcha.org>

parents: 35318

diff changeset

770 return _getdictitem(dictarg, key)

4c1cfe54c08d templater: extend dot operator as a short for get(dict, key)

Yuya Nishihara <yuya@tcha.org>

parents: 35318

diff changeset

771

4c1cfe54c08d templater: extend dot operator as a short for get(dict, key)

Yuya Nishihara <yuya@tcha.org>

parents: 35318

diff changeset

772 def _getdictitem(dictarg, key):

35317

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

773 val = dictarg.get(key)

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

774 if val is None:

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

775 return

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

776 return templatekw.wraphybridvalue(dictarg, key, val)

18578

ef78450c8df6 templater: add get() function to access dict element (e.g. extra)

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 18289

diff changeset

777

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

778 @templatefunc('if(expr, then[, else])')

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

779 def if_(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

780 """Conditionally execute based on the result of

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

781 an expression."""

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

782 if not (2 <= len(args) <= 3):

17890

ca6850b9dd9e i18n: add "i18n" comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17729

diff changeset

783 # i18n: "if" is a keyword

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

784 raise error.ParseError(_("if expects two or three arguments"))

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

785

30586

034412ca28c3 templater: fix if() to not evaluate False as bool('False')

Yuya Nishihara <yuya@tcha.org>

parents: 30585

diff changeset

786 test = evalboolean(context, mapping, args[0])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

787 if test:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

788 yield evalrawexp(context, mapping, args[1])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

789 elif len(args) == 3:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

790 yield evalrawexp(context, mapping, args[2])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

791

30828

f18cc848b48e templater: use "needle" and "haystack" as (meta-)variables for ifcontains()

Anton Shestakov <av6@dwimlabs.net>

parents: 30787

diff changeset

792 @templatefunc('ifcontains(needle, haystack, then[, else])')

20518

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

793 def ifcontains(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

794 """Conditionally execute based

30828

f18cc848b48e templater: use "needle" and "haystack" as (meta-)variables for ifcontains()

Anton Shestakov <av6@dwimlabs.net>

parents: 30787

diff changeset

795 on whether the item "needle" is in "haystack"."""

20518

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

796 if not (3 <= len(args) <= 4):

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

797 # i18n: "ifcontains" is a keyword

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

798 raise error.ParseError(_("ifcontains expects three or four arguments"))

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

799

30828

f18cc848b48e templater: use "needle" and "haystack" as (meta-)variables for ifcontains()

Anton Shestakov <av6@dwimlabs.net>

parents: 30787

diff changeset

800 haystack = evalfuncarg(context, mapping, args[1])

35442

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

801 try:

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

802 needle = evalastype(context, mapping, args[0],

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

803 getattr(haystack, 'keytype', None) or bytes)

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

804 found = (needle in haystack)

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

805 except error.ParseError:

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

806 found = False

20518

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

807

35442

3edfd472f3cb templater: fix ifcontains() to handle type mismatch gracefully

Yuya Nishihara <yuya@tcha.org>

parents: 35364

diff changeset

808 if found:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

809 yield evalrawexp(context, mapping, args[2])

20518

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

810 elif len(args) == 4:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

811 yield evalrawexp(context, mapping, args[3])

20518

1e43f15a647f template: add ifcontains template function

Durham Goode <durham@fb.com>

parents: 20371

diff changeset

812

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

813 @templatefunc('ifeq(expr1, expr2, then[, else])')

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

814 def ifeq(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

815 """Conditionally execute based on

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

816 whether 2 items are equivalent."""

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

817 if not (3 <= len(args) <= 4):

17890

ca6850b9dd9e i18n: add "i18n" comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17729

diff changeset

818 # i18n: "ifeq" is a keyword

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

819 raise error.ParseError(_("ifeq expects three or four arguments"))

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

820

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

821 test = evalstring(context, mapping, args[0])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

822 match = evalstring(context, mapping, args[1])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

823 if test == match:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

824 yield evalrawexp(context, mapping, args[2])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

825 elif len(args) == 4:

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

826 yield evalrawexp(context, mapping, args[3])

17636

ce18dbcd91c8 templater: add if/ifeq conditionals

Matt Mackall <mpm@selenic.com>

parents: 17635

diff changeset

827

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

828 @templatefunc('join(list, sep)')

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

829 def join(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

830 """Join items in a list with a delimiter."""

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

831 if not (1 <= len(args) <= 2):

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

832 # i18n: "join" is a keyword

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

833 raise error.ParseError(_("join expects one or two arguments"))

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

834

35109

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

835 # TODO: perhaps this should be evalfuncarg(), but it can't because hgweb

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

836 # abuses generator as a keyword that returns a list of dicts.

e60c601953d7 templater: extract helper to just evaluate template expression

Yuya Nishihara <yuya@tcha.org>

parents: 35108

diff changeset

837 joinset = evalrawexp(context, mapping, args[0])

35113

89aec1834a86 templatekw: add new-style template expansion to {manifest}

Yuya Nishihara <yuya@tcha.org>

parents: 35112

diff changeset

838 joinset = templatekw.unwrapvalue(joinset)

35111

dd28b1f55eb8 templatekw: just pass underlying value (or key) to joinfmt() function

Yuya Nishihara <yuya@tcha.org>

parents: 35109

diff changeset

839 joinfmt = getattr(joinset, 'joinfmt', pycompat.identity)

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

840 joiner = " "

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

841 if len(args) > 1:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

842 joiner = evalstring(context, mapping, args[1])

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

843

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

844 first = True

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

845 for x in joinset:

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

846 if first:

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

847 first = False

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

848 else:

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

849 yield joiner

35111

dd28b1f55eb8 templatekw: just pass underlying value (or key) to joinfmt() function

Yuya Nishihara <yuya@tcha.org>

parents: 35109

diff changeset

850 yield joinfmt(x)

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

851

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

852 @templatefunc('label(label, expr)')

18289

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

853 def label(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

854 """Apply a label to generated content. Content with

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

855 a label applied can result in additional post-processing, such as

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

856 automatic colorization."""

18289

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

857 if len(args) != 2:

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

858 # i18n: "label" is a keyword

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

859 raise error.ParseError(_("label expects two arguments"))

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

860

29133

dbba18ba26d4 templater: make label() just fail if ui object isn't available

Yuya Nishihara <yuya@tcha.org>

parents: 29074

diff changeset

861 ui = mapping['ui']

29045

af3bd9d1dbc1 templater: move label() function from color extension

Yuya Nishihara <yuya@tcha.org>

parents: 29044

diff changeset

862 thing = evalstring(context, mapping, args[1])

af3bd9d1dbc1 templater: move label() function from color extension

Yuya Nishihara <yuya@tcha.org>

parents: 29044

diff changeset

863 # preserve unknown symbol as literal so effects like 'red', 'bold',

af3bd9d1dbc1 templater: move label() function from color extension

Yuya Nishihara <yuya@tcha.org>

parents: 29044

diff changeset

864 # etc. don't need to be quoted

af3bd9d1dbc1 templater: move label() function from color extension

Yuya Nishihara <yuya@tcha.org>

parents: 29044

diff changeset

865 label = evalstringliteral(context, mapping, args[0])

af3bd9d1dbc1 templater: move label() function from color extension

Yuya Nishihara <yuya@tcha.org>

parents: 29044

diff changeset

866

29055

3356bf61fa25 formatter: make labels work with templated output

Kostia Balytskyi <ikostia@fb.com>

parents: 29045

diff changeset

867 return ui.label(thing, label)

18289

9bfb53106328 templater: add no-op template function 'label'

Sean Farley <sean.michael.farley@gmail.com>

parents: 17991

diff changeset

868

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

869 @templatefunc('latesttag([pattern])')

27111

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

870 def latesttag(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

871 """The global tags matching the given pattern on the

32629

f0d719e513fc templatekw: clarify the result of {latesttag} when no tag exists

Matt Harbison <matt_harbison@yahoo.com>

parents: 32586

diff changeset

872 most recent globally tagged ancestor of this changeset.

f0d719e513fc templatekw: clarify the result of {latesttag} when no tag exists

Matt Harbison <matt_harbison@yahoo.com>

parents: 32586

diff changeset

873 If no such tags exist, the "{tag}" template resolves to

f0d719e513fc templatekw: clarify the result of {latesttag} when no tag exists

Matt Harbison <matt_harbison@yahoo.com>

parents: 32586

diff changeset

874 the string "null"."""

27111

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

875 if len(args) > 1:

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

876 # i18n: "latesttag" is a keyword

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

877 raise error.ParseError(_("latesttag expects at most one argument"))

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

878

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

879 pattern = None

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

880 if len(args) == 1:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

881 pattern = evalstring(context, mapping, args[0])

27111

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

882

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

883 return templatekw.showlatesttags(pattern, **mapping)

43bf9471fae9 templater: introduce {latesttag()} function to match a pattern (issue4184)

Matt Harbison <matt_harbison@yahoo.com>

parents: 26952

diff changeset

884

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

885 @templatefunc('localdate(date[, tz])')

26723

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

886 def localdate(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

887 """Converts a date to the specified timezone.

26724

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

888 The default is local date."""

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

889 if not (1 <= len(args) <= 2):

26723

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

890 # i18n: "localdate" is a keyword

26724

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

891 raise error.ParseError(_("localdate expects one or two arguments"))

26723

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

892

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

893 date = evalfuncarg(context, mapping, args[0])

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

894 try:

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

895 date = util.parsedate(date)

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

896 except AttributeError: # not str nor date tuple

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

897 # i18n: "localdate" is a keyword

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

898 raise error.ParseError(_("localdate expects a date information"))

26724

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

899 if len(args) >= 2:

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

900 tzoffset = None

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

901 tz = evalfuncarg(context, mapping, args[1])

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

902 if isinstance(tz, str):

30397

84ef4517de03 date: refactor timezone parsing

Matt Mackall <mpm@selenic.com>

parents: 29835

diff changeset

903 tzoffset, remainder = util.parsetimezone(tz)

84ef4517de03 date: refactor timezone parsing

Matt Mackall <mpm@selenic.com>

parents: 29835

diff changeset

904 if remainder:

84ef4517de03 date: refactor timezone parsing

Matt Mackall <mpm@selenic.com>

parents: 29835

diff changeset

905 tzoffset = None

26724

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

906 if tzoffset is None:

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

907 try:

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

908 tzoffset = int(tz)

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

909 except (TypeError, ValueError):

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

910 # i18n: "localdate" is a keyword

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

911 raise error.ParseError(_("localdate expects a timezone"))

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

912 else:

51f6940d3b4f templater: add optional timezone argument to localdate()

Yuya Nishihara <yuya@tcha.org>

parents: 26723

diff changeset

913 tzoffset = util.makedate()[1]

26723

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

914 return (date[0], tzoffset)

7012be5ab5bd templater: port localdate filter to a function

Yuya Nishihara <yuya@tcha.org>

parents: 26721

diff changeset

915

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

916 @templatefunc('max(iterable)')

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

917 def max_(context, mapping, args, **kwargs):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

918 """Return the max of an iterable"""

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

919 if len(args) != 1:

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

920 # i18n: "max" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

921 raise error.ParseError(_("max expects one arguments"))

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

922

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

923 iterable = evalfuncarg(context, mapping, args[0])

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

924 try:

35317

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

925 x = max(iterable)

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

926 except (TypeError, ValueError):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

927 # i18n: "max" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

928 raise error.ParseError(_("max first argument should be an iterable"))

35317

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

929 return templatekw.wraphybridvalue(iterable, x, x)

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

930

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

931 @templatefunc('min(iterable)')

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

932 def min_(context, mapping, args, **kwargs):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

933 """Return the min of an iterable"""

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

934 if len(args) != 1:

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

935 # i18n: "min" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

936 raise error.ParseError(_("min expects one arguments"))

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

937

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

938 iterable = evalfuncarg(context, mapping, args[0])

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

939 try:

35317

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

940 x = min(iterable)

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

941 except (TypeError, ValueError):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

942 # i18n: "min" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

943 raise error.ParseError(_("min first argument should be an iterable"))

35317

b3073e175c17 templater: wrap get/min/max result so map operation can apply to element

Yuya Nishihara <yuya@tcha.org>

parents: 35241

diff changeset

944 return templatekw.wraphybridvalue(iterable, x, x)

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

945

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

946 @templatefunc('mod(a, b)')

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

947 def mod(context, mapping, args):

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

948 """Calculate a mod b such that a / b + a mod b == a"""

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

949 if not len(args) == 2:

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

950 # i18n: "mod" is a keyword

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

951 raise error.ParseError(_("mod expects two arguments"))

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

952

30895

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

953 func = lambda a, b: a % b

1c01fa29630f templater: handle division by zero in arithmetic

Simon Farnsworth <simonfar@fb.com>

parents: 30894

diff changeset

954 return runarithmetic(context, mapping, (func, args[0], args[1]))

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

955

35070

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

956 @templatefunc('obsfateoperations(markers)')

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

957 def obsfateoperations(context, mapping, args):

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

958 """Compute obsfate related information based on markers (EXPERIMENTAL)"""

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

959 if len(args) != 1:

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

960 # i18n: "obsfateoperations" is a keyword

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

961 raise error.ParseError(_("obsfateoperations expects one arguments"))

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

962

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

963 markers = evalfuncarg(context, mapping, args[0])

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

964

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

965 try:

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

966 data = obsutil.markersoperations(markers)

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

967 return templatekw.hybridlist(data, name='operation')

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

968 except (TypeError, KeyError):

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

969 # i18n: "obsfateoperations" is a keyword

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

970 errmsg = _("obsfateoperations first argument should be an iterable")

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

971 raise error.ParseError(errmsg)

7cdc8c5a481a templates: introduce a obsfateoperation() function

Martin von Zweigbergk <martinvonz@google.com>

parents: 35033

diff changeset

972

34778

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

973 @templatefunc('obsfatedate(markers)')

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

974 def obsfatedate(context, mapping, args):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

975 """Compute obsfate related information based on markers (EXPERIMENTAL)"""

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

976 if len(args) != 1:

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

977 # i18n: "obsfatedate" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

978 raise error.ParseError(_("obsfatedate expects one arguments"))

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

979

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

980 markers = evalfuncarg(context, mapping, args[0])

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

981

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

982 try:

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

983 data = obsutil.markersdates(markers)

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

984 return templatekw.hybridlist(data, name='date', fmt='%d %d')

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

985 except (TypeError, KeyError):

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

986 # i18n: "obsfatedate" is a keyword

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

987 errmsg = _("obsfatedate first argument should be an iterable")

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

988 raise error.ParseError(errmsg)

c35c0f54f420 template: compute dates in obsfatedate

Boris Feld <boris.feld@octobus.net>

parents: 34777

diff changeset

989

34777

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

990 @templatefunc('obsfateusers(markers)')

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

991 def obsfateusers(context, mapping, args):

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

992 """Compute obsfate related information based on markers (EXPERIMENTAL)"""

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

993 if len(args) != 1:

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

994 # i18n: "obsfateusers" is a keyword

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

995 raise error.ParseError(_("obsfateusers expects one arguments"))

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

996

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

997 markers = evalfuncarg(context, mapping, args[0])

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

998

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

999 try:

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1000 data = obsutil.markersusers(markers)

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1001 return templatekw.hybridlist(data, name='user')

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1002 except (TypeError, KeyError, ValueError):

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1003 # i18n: "obsfateusers" is a keyword

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1004 msg = _("obsfateusers first argument should be an iterable of "

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1005 "obsmakers")

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1006 raise error.ParseError(msg)

38f08eaba6b0 template: compute user in obsfateusers

Boris Feld <boris.feld@octobus.net>

parents: 34776

diff changeset

1007

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1009 def obsfateverb(context, mapping, args):

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1010 """Compute obsfate related information based on successors (EXPERIMENTAL)"""

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1012 # i18n: "obsfateverb" is a keyword

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1014

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1015 successors = evalfuncarg(context, mapping, args[0])

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1017

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1018 try:

34776

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1020 except TypeError:

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1021 # i18n: "obsfateverb" is a keyword

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1022 errmsg = _("obsfateverb first argument should be countable")

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1023 raise error.ParseError(errmsg)

3d0f8918351b template: compute verb in obsfateverb

Boris Feld <boris.feld@octobus.net>

parents: 34337

diff changeset

1024

30862

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1025 @templatefunc('relpath(path)')

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1026 def relpath(context, mapping, args):

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1027 """Convert a repository-absolute path into a filesystem path relative to

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1028 the current working directory."""

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1029 if len(args) != 1:

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1030 # i18n: "relpath" is a keyword

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1031 raise error.ParseError(_("relpath expects one argument"))

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1032

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1033 repo = mapping['ctx'].repo()

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1034 path = evalstring(context, mapping, args[0])

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1035 return repo.pathto(path)

bd1f043d1ea3 templater: add relpath() to convert repo path to relative path (issue5394)

Yuya Nishihara <yuya@tcha.org>

parents: 30828

diff changeset

1036

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1037 @templatefunc('revset(query[, formatargs...])')

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1038 def revset(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1039 """Execute a revision set query. See

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

1040 :hg:`help revset`."""

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1041 if not len(args) > 0:

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1042 # i18n: "revset" is a keyword

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1043 raise error.ParseError(_("revset expects one or more arguments"))

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1044

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1045 raw = evalstring(context, mapping, args[0])

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1046 ctx = mapping['ctx']

24457

696ab1a24ae0 templater: replace 'ctx._repo' with 'ctx.repo()'

Matt Harbison <matt_harbison@yahoo.com>

parents: 24426

diff changeset

1047 repo = ctx.repo()

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1048

22304

5678b0e3608f templater: enable alias predicates to be used in "revset()" function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 21960

diff changeset

1049 def query(expr):

34337

2943141f5e07 revset: pass repo when passing ui

Gregory Szorc <gregory.szorc@gmail.com>

parents: 33800

diff changeset

1050 m = revsetmod.match(repo.ui, expr, repo=repo)

24169

fafd9a1284cf revset: make match function initiate query from full set by default

Yuya Nishihara <yuya@tcha.org>

parents: 23167

diff changeset

1051 return m(repo)

22304

5678b0e3608f templater: enable alias predicates to be used in "revset()" function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 21960

diff changeset

1052

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1053 if len(args) > 1:

29004

41373244f4e5 templater: fix revset() to evaluate format arguments eagerly

Yuya Nishihara <yuya@tcha.org>

parents: 29003

diff changeset

1054 formatargs = [evalfuncarg(context, mapping, a) for a in args[1:]]

31803

0b8356705de6 revset: split language services to revsetlang module (API)

Yuya Nishihara <yuya@tcha.org>

parents: 31404

diff changeset

1055 revs = query(revsetlang.formatspec(raw, *formatargs))

28849

96f2d50fb9f6 templater: factor out type conversion of revset() result

Yuya Nishihara <yuya@tcha.org>

parents: 28611

diff changeset

1056 revs = list(revs)

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1057 else:

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1058 revsetcache = mapping['cache'].setdefault("revsetcache", {})

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1059 if raw in revsetcache:

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1060 revs = revsetcache[raw]

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1061 else:

22304

5678b0e3608f templater: enable alias predicates to be used in "revset()" function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 21960

diff changeset

1062 revs = query(raw)

28849

96f2d50fb9f6 templater: factor out type conversion of revset() result

Yuya Nishihara <yuya@tcha.org>

parents: 28611

diff changeset

1063 revs = list(revs)

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1064 revsetcache[raw] = revs

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1065

26842

e4609ec959f8 templater: switch ctx of list expression to rev of revset() (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 26839

diff changeset

1066 return templatekw.showrevslist("revision", revs, **mapping)

20519

cda9d2b6beab template: add revset() template function

Durham Goode <durham@fb.com>

parents: 20518

diff changeset

1067

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1068 @templatefunc('rstdoc(text, style)')

18747

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1069 def rstdoc(context, mapping, args):

31111

318a24b52eeb spelling: fixes of non-dictionary words

Mads Kiilerich <madski@unity3d.com>

parents: 31011

diff changeset

1070 """Format reStructuredText."""

18747

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1071 if len(args) != 2:

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1072 # i18n: "rstdoc" is a keyword

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1073 raise error.ParseError(_("rstdoc expects two arguments"))

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1074

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1075 text = evalstring(context, mapping, args[0])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1076 style = evalstring(context, mapping, args[1])

18747

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1077

19079

1e433b5457fd hgweb: make help verbose again (issue3899)

Alexander Plavin <me@aplavin.ru>

parents: 19058

diff changeset

1078 return minirst.format(text, style=style, keep=['verbose'])

18747

f5db3092790f hgweb: generate HTML documentation

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 18578

diff changeset

1079

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

1080 @templatefunc('separate(sep, args)', argspec='sep *args')

29835

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1081 def separate(context, mapping, args):

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1082 """Add a separator between non-empty arguments."""

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

1083 if 'sep' not in args:

29835

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1084 # i18n: "separate" is a keyword

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1085 raise error.ParseError(_("separate expects at least one argument"))

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1086

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

1087 sep = evalstring(context, mapping, args['sep'])

29835

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1088 first = True

32665

bdda942f4b9c templater: add support for keyword arguments

Yuya Nishihara <yuya@tcha.org>

parents: 32664

diff changeset

1089 for arg in args['args']:

29835

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1090 argstr = evalstring(context, mapping, arg)

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1091 if not argstr:

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1092 continue

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1093 if first:

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1094 first = False

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1095 else:

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1096 yield sep

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1097 yield argstr

df838803c1d4 templater: add separate() template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 29707

diff changeset

1098

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1099 @templatefunc('shortest(node, minlength=4)')

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1100 def shortest(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1101 """Obtain the shortest representation of

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

1102 a node."""

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1103 if not (1 <= len(args) <= 2):

23112

3226ed457928 i18n: add i18n comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22844

diff changeset

1104 # i18n: "shortest" is a keyword

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1105 raise error.ParseError(_("shortest() expects one or two arguments"))

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1106

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1107 node = evalstring(context, mapping, args[0])

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1108

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1109 minlength = 4

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1110 if len(args) > 1:

29017

542d200bd261 templater: fix shortest() to evaluate int argument and handle error

Yuya Nishihara <yuya@tcha.org>

parents: 29016

diff changeset

1111 minlength = evalinteger(context, mapping, args[1],

542d200bd261 templater: fix shortest() to evaluate int argument and handle error

Yuya Nishihara <yuya@tcha.org>

parents: 29016

diff changeset

1112 # i18n: "shortest" is a keyword

542d200bd261 templater: fix shortest() to evaluate int argument and handle error

Yuya Nishihara <yuya@tcha.org>

parents: 29016

diff changeset

1113 _("shortest() expects an integer minlength"))

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1114

31011

362740e05460 templater: use unfiltered changelog to calculate shortest() at constant time

Yuya Nishihara <yuya@tcha.org>

parents: 31010

diff changeset

1115 # _partialmatch() of filtered changelog could take O(len(repo)) time,

362740e05460 templater: use unfiltered changelog to calculate shortest() at constant time

Yuya Nishihara <yuya@tcha.org>

parents: 31010

diff changeset

1116 # which would be unacceptably slow. so we look for hash collision in

362740e05460 templater: use unfiltered changelog to calculate shortest() at constant time

Yuya Nishihara <yuya@tcha.org>

parents: 31010

diff changeset

1117 # unfiltered space, which means some hashes may be slightly longer.

362740e05460 templater: use unfiltered changelog to calculate shortest() at constant time

Yuya Nishihara <yuya@tcha.org>

parents: 31010

diff changeset

1118 cl = mapping['ctx']._repo.unfiltered().changelog

35033

448725a2ef73 templater: extract shortest() logic from template function

Martin von Zweigbergk <martinvonz@google.com>

parents: 34922

diff changeset

1119 return cl.shortest(node, minlength)

20369

9c6b86dd2ed2 template: add shortest(node) template function

Durham Goode <durham@fb.com>

parents: 20312

diff changeset

1120

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1121 @templatefunc('strip(text[, chars])')

19333

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1122 def strip(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1123 """Strip characters from a string. By default,

26693

c568c4db036f templatefilters: remove redundant 'date' and 'strip' filters

Yuya Nishihara <yuya@tcha.org>

parents: 26692

diff changeset

1124 strips all leading and trailing whitespace."""

19333

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1125 if not (1 <= len(args) <= 2):

23112

3226ed457928 i18n: add i18n comment to error messages of template functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 22844

diff changeset

1126 # i18n: "strip" is a keyword

19333

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1127 raise error.ParseError(_("strip expects one or two arguments"))

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1128

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1129 text = evalstring(context, mapping, args[0])

19333

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1130 if len(args) == 2:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1131 chars = evalstring(context, mapping, args[1])

19333

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1132 return text.strip(chars)

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1133 return text.strip()

867b9957d895 templater: add strip function with chars as an extra argument

Alexander Plavin <me@aplavin.ru>

parents: 19228

diff changeset

1134

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1135 @templatefunc('sub(pattern, replacement, expression)')

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1136 def sub(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1137 """Perform text substitution

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

1138 using regular expressions."""

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1139 if len(args) != 3:

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1140 # i18n: "sub" is a keyword

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1141 raise error.ParseError(_("sub expects three arguments"))

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1142

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1143 pat = evalstring(context, mapping, args[0])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1144 rpl = evalstring(context, mapping, args[1])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1145 src = evalstring(context, mapping, args[2])

26787

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1146 try:

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1147 patre = re.compile(pat)

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1148 except re.error:

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1149 # i18n: "sub" is a keyword

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1150 raise error.ParseError(_("sub got an invalid pattern: %s") % pat)

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1151 try:

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1152 yield patre.sub(rpl, src)

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1153 except re.error:

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1154 # i18n: "sub" is a keyword

662ea52d5dca templater: catch regexp error at sub() function

Yuya Nishihara <yuya@tcha.org>

parents: 26724

diff changeset

1155 raise error.ParseError(_("sub got an invalid replacement: %s") % rpl)

19390

3af3a165db18 templater: sort functions alphabetically, as filters are

Alexander Plavin <me@aplavin.ru>

parents: 19333

diff changeset

1156

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1157 @templatefunc('startswith(pattern, text)')

21821

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1158 def startswith(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1159 """Returns the value from the "text" argument

24719

90e3f5d22dad templater: add consistent docstrings to functions

Gregory Szorc <gregory.szorc@gmail.com>

parents: 24457

diff changeset

1160 if it begins with the content from the "pattern" argument."""

21821

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1161 if len(args) != 2:

21960

2896d450fec4 templater: add i18n comments to error messages of newly added functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 21846

diff changeset

1162 # i18n: "startswith" is a keyword

21821

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1163 raise error.ParseError(_("startswith expects two arguments"))

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1164

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1165 patn = evalstring(context, mapping, args[0])

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1166 text = evalstring(context, mapping, args[1])

21821

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1167 if text.startswith(patn):

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1168 return text

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1169 return ''

4a445dc5abff templater: introduce startswith function

Ryan McElroy <rmcelroy@fb.com>

parents: 21798

diff changeset

1170

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1171 @templatefunc('word(number, text[, separator])')

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1172 def word(context, mapping, args):

29446

efa192203623 templater: use templatefunc to mark a function as template function

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29445

diff changeset

1173 """Return the nth word from a string."""

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1174 if not (2 <= len(args) <= 3):

21960

2896d450fec4 templater: add i18n comments to error messages of newly added functions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 21846

diff changeset

1175 # i18n: "word" is a keyword

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1176 raise error.ParseError(_("word expects two or three arguments, got %d")

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1177 % len(args))

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1178

29014

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

1179 num = evalinteger(context, mapping, args[0],

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

1180 # i18n: "word" is a keyword

a6c2310b3827 templater: factor out function that evaluates argument as integer

Yuya Nishihara <yuya@tcha.org>

parents: 29005

diff changeset

1181 _("word expects an integer index"))

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1182 text = evalstring(context, mapping, args[1])

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1183 if len(args) == 3:

29019

ccedb17a5657 templater: factor out thin helper that evaluates argument as string

Yuya Nishihara <yuya@tcha.org>

parents: 29017

diff changeset

1184 splitter = evalstring(context, mapping, args[2])

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1185 else:

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1186 splitter = None

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1187

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1188 tokens = text.split(splitter)

27135

4ca98a389152 templater: protect word() from crashing on out of range negative value

Matt Harbison <matt_harbison@yahoo.com>

parents: 26375

diff changeset

1189 if num >= len(tokens) or num < -len(tokens):

21846

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1190 return ''

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1191 else:

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1192 return tokens[num]

8f23f8096606 templater: introduce word function

Ryan McElroy <rmcelroy@fb.com>

parents: 21822

diff changeset

1193

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1194 # methods to interpret function arguments or inner expressions (e.g. {_(x)})

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1195 exprmethods = {

25393

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

1196 "integer": lambda e, c: (runinteger, e[1]),

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1197 "string": lambda e, c: (runstring, e[1]),

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1198 "symbol": lambda e, c: (runsymbol, e[1]),

26139

c1975809a6b5 templater: take any string literals as template, but not for rawstring (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 26138

diff changeset

1199 "template": buildtemplate,

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1200 "group": lambda e, c: compileexp(e[1], c, exprmethods),

35318

78590585c0db templater: add dot operator to easily access a sub item

Yuya Nishihara <yuya@tcha.org>

parents: 35317

diff changeset

1201 ".": buildmember,

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1202 "|": buildfilter,

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1203 "%": buildmap,

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1204 "func": buildfunc,

32664

d18b624c1c06 templater: add parsing rule for key-value pair

Yuya Nishihara <yuya@tcha.org>

parents: 32663

diff changeset

1205 "keyvalue": buildkeyvaluepair,

30894

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

1206 "+": lambda e, c: buildarithmetic(e, c, lambda a, b: a + b),

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

1207 "-": lambda e, c: buildarithmetic(e, c, lambda a, b: a - b),

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

1208 "negate": buildnegate,

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

1209 "*": lambda e, c: buildarithmetic(e, c, lambda a, b: a * b),

8e42dfde93d1 templater: provide arithmetic operations on integers

Simon Farnsworth <simonfar@fb.com>

parents: 30862

diff changeset

1210 "/": lambda e, c: buildarithmetic(e, c, lambda a, b: a // b),

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1211 }

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1212

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1213 # methods to interpret top-level template (e.g. {x}, {x|_}, {x % "y"})

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1214 methods = exprmethods.copy()

25393

829faf8ab605 templater: tokenize decimal integer literal (issue4638) (BC)

Yuya Nishihara <yuya@tcha.org>

parents: 25392

diff changeset

1215 methods["integer"] = exprmethods["symbol"] # '{1}' as variable

25392

9668c1a433b3 templater: switch methods table on compileexp() of func args and inner expr

Yuya Nishihara <yuya@tcha.org>

parents: 25379

diff changeset

1216

29662

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1217 class _aliasrules(parser.basealiasrules):

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1218 """Parsing and expansion rule set of template aliases"""

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1219 _section = _('template alias')

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1220 _parse = staticmethod(_parseexpr)

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1221

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1222 @staticmethod

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1223 def _trygetfunc(tree):

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1224 """Return (name, args) if tree is func(...) or ...|filter; otherwise

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1225 None"""

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1226 if tree[0] == 'func' and tree[1][0] == 'symbol':

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1227 return tree[1][1], getlist(tree[2])

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1228 if tree[0] == '|' and tree[2][0] == 'symbol':

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1229 return tree[2][1], [tree[1]]

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1230

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1231 def expandaliases(tree, aliases):

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1232 """Return new tree of aliases are expanded"""

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1233 aliasmap = _aliasrules.buildmap(aliases)

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1234 return _aliasrules.expand(aliasmap, tree)

867d6ba2353d templater: add parsing and expansion rules to process "templatealias" section

Yuya Nishihara <yuya@tcha.org>

parents: 29661

diff changeset

1235

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1236 # template engine

1901

c64bef3d7043 use safer string parser for template engine.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1900

diff changeset

1237

8360

acc202b71619 templater: provide the standard template filters by default

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8312

diff changeset

1238 stringify = templatefilters.stringify

7107

125c8fedcbe0 Allow hgweb to search for templates in more than one path.

Brendan Cully <brendan@kublai.com>

parents: 6772

diff changeset

1239

10853

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1240 def _flatten(thing):

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1241 '''yield a single stream from a possibly nested set of iterators'''

32659

a0f2d83f8083 templater: remove __iter__() from _hybrid, resolve it explicitly

Yuya Nishihara <yuya@tcha.org>

parents: 32629

diff changeset

1242 thing = templatekw.unwraphybrid(thing)

33753

11c0bb4ccc76 py3: replace str with bytes in isinstance()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33656

diff changeset

1243 if isinstance(thing, bytes):

10853

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1244 yield thing

35506

b13c95919ff5 templater: explode if we try to emit a str

Augie Fackler <augie@google.com>

parents: 35498

diff changeset

1245 elif isinstance(thing, str):

b13c95919ff5 templater: explode if we try to emit a str

Augie Fackler <augie@google.com>

parents: 35498

diff changeset

1246 # We can only hit this on Python 3, and it's here to guard

b13c95919ff5 templater: explode if we try to emit a str

Augie Fackler <augie@google.com>

parents: 35498

diff changeset

1247 # against infinite recursion.

b13c95919ff5 templater: explode if we try to emit a str

Augie Fackler <augie@google.com>

parents: 35498

diff changeset

1248 raise error.ProgrammingError('Mercurial IO including templates is done'

b13c95919ff5 templater: explode if we try to emit a str

Augie Fackler <augie@google.com>

parents: 35498

diff changeset

1249 ' with bytes, not strings')

30585

0d5cc0c18b4e templater: make it clearer that _flatten() omits None

Yuya Nishihara <yuya@tcha.org>

parents: 30582

diff changeset

1250 elif thing is None:

0d5cc0c18b4e templater: make it clearer that _flatten() omits None

Yuya Nishihara <yuya@tcha.org>

parents: 30582

diff changeset

1251 pass

14945

e2c413bde8a5 globally: use safehasattr(x, '__iter__') instead of hasattr(x, '__iter__')

Augie Fackler <durin42@gmail.com>

parents: 14944

diff changeset

1252 elif not util.safehasattr(thing, '__iter__'):

33757

8779d35c168d py3: use pycompat.bytestr() in place of str()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33753

diff changeset

1253 yield pycompat.bytestr(thing)

10855

0d50586a9d31 templater: raise nested functions

Matt Mackall <mpm@selenic.com>

parents: 10853

diff changeset

1254 else:

10853

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1255 for i in thing:

32659

a0f2d83f8083 templater: remove __iter__() from _hybrid, resolve it explicitly

Yuya Nishihara <yuya@tcha.org>

parents: 32629

diff changeset

1256 i = templatekw.unwraphybrid(i)

33753

11c0bb4ccc76 py3: replace str with bytes in isinstance()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33656

diff changeset

1257 if isinstance(i, bytes):

10853

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1258 yield i

30585

0d5cc0c18b4e templater: make it clearer that _flatten() omits None

Yuya Nishihara <yuya@tcha.org>

parents: 30582

diff changeset

1259 elif i is None:

0d5cc0c18b4e templater: make it clearer that _flatten() omits None

Yuya Nishihara <yuya@tcha.org>

parents: 30582

diff changeset

1260 pass

14945

e2c413bde8a5 globally: use safehasattr(x, '__iter__') instead of hasattr(x, '__iter__')

Augie Fackler <durin42@gmail.com>

parents: 14944

diff changeset

1261 elif not util.safehasattr(i, '__iter__'):

33757

8779d35c168d py3: use pycompat.bytestr() in place of str()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33753

diff changeset

1262 yield pycompat.bytestr(i)

30585

0d5cc0c18b4e templater: make it clearer that _flatten() omits None

Yuya Nishihara <yuya@tcha.org>

parents: 30582

diff changeset

1263 else:

10853

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1264 for j in _flatten(i):

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1265 yield j

a63391e26284 templater: use recursive flattening

Matt Mackall <mpm@selenic.com>

parents: 10852

diff changeset

1266

25379

e8ff0b09acac templater: rename parsestring() to unquotestring() (API)

Yuya Nishihara <yuya@tcha.org>

parents: 25378

diff changeset

1267 def unquotestring(s):

29371

bf35644b9f3a templater: relax unquotestring() to fall back to bare string

Yuya Nishihara <yuya@tcha.org>

parents: 29369

diff changeset

1268 '''unwrap quotes if any; otherwise returns unmodified string'''

29437

29c249dfb4ef templater: do not strip non-quote characters from template config

Yuya Nishihara <yuya@tcha.org>

parents: 29371

diff changeset

1269 if len(s) < 2 or s[0] not in "'\"" or s[0] != s[-1]:

29371

bf35644b9f3a templater: relax unquotestring() to fall back to bare string

Yuya Nishihara <yuya@tcha.org>

parents: 29369

diff changeset

1270 return s

26255

c1cac25ad1a6 templater: remove workaround for escaped quoted string in quoted template

Yuya Nishihara <yuya@tcha.org>

parents: 26254

diff changeset

1271 return s[1:-1]

1896

f8f818a04f5b move hgweb template code out to templater

Vadim Gelfer <vadim.gelfer@gmail.com>

parents:

diff changeset

1272

8218

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1273 class engine(object):

1909

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1274 '''template expansion engine.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1275

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1276 template expansion works like this. a map file contains key=value

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1277 pairs. if value is quoted, it is treated as string. otherwise, it

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1278 is treated as name of template file.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1279

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1280 templater is asked to expand a key in map. it looks up key, and

4335

66a3fe30f9fc minor typo fix in templater's docstring

TK Soh <teekaysoh@yahoo.com>

parents: 3904

diff changeset

1281 looks for strings like this: {foo}. it expands {foo} by looking up

1909

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1282 foo in map, and substituting it. expansion is recursive: it stops

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1283 when there is no more {foo} to replace.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1284

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1285 expansion also allows formatting and filtering.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1286

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1287 format uses key to expand each item in list. syntax is

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1288 {key%format}.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1289

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1290 filter uses function to transform value. syntax is

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1291 {key|filter1|filter2|...}.'''

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1292

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1293 def __init__(self, loader, filters=None, defaults=None, aliases=()):

10851

01346cea5485 templater: privatize class variables

Matt Mackall <mpm@selenic.com>

parents: 10850

diff changeset

1294 self._loader = loader

26948

ec4f3755d997 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26842

diff changeset

1295 if filters is None:

ec4f3755d997 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26842

diff changeset

1296 filters = {}

10851

01346cea5485 templater: privatize class variables

Matt Mackall <mpm@selenic.com>

parents: 10850

diff changeset

1297 self._filters = filters

26949

2c6a741bf05e templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26948

diff changeset

1298 if defaults is None:

2c6a741bf05e templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26948

diff changeset

1299 defaults = {}

10851

01346cea5485 templater: privatize class variables

Matt Mackall <mpm@selenic.com>

parents: 10850

diff changeset

1300 self._defaults = defaults

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1301 self._aliasmap = _aliasrules.buildmap(aliases)

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

1302 self._cache = {} # key: (func, data)

8218

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1303

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1304 def _load(self, t):

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1305 '''load, parse, and cache a template'''

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1306 if t not in self._cache:

28611

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

1307 # put poison to cut recursion while compiling 't'

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

1308 self._cache[t] = (_runrecursivesymbol, t)

28611

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

1309 try:

29706

eea98190ed73 templater: inline compiletemplate() function into engine

Yuya Nishihara <yuya@tcha.org>

parents: 29704

diff changeset

1310 x = parse(self._loader(t))

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1311 if self._aliasmap:

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1312 x = _aliasrules.expand(self._aliasmap, x)

29706

eea98190ed73 templater: inline compiletemplate() function into engine

Yuya Nishihara <yuya@tcha.org>

parents: 29704

diff changeset

1313 self._cache[t] = compileexp(x, self, methods)

28611

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

1314 except: # re-raises

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

1315 del self._cache[t]

cfe7da66f555 templater: abort if infinite recursion detected while compiling

Yuya Nishihara <yuya@tcha.org>

parents: 28610

diff changeset

1316 raise

13177

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1317 return self._cache[t]

895f54a79c6e templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com>

parents: 13176

diff changeset

1318

10856

b6f6d9fd53d6 templater: drop raw method

Matt Mackall <mpm@selenic.com>

parents: 10855

diff changeset

1319 def process(self, t, mapping):

b6f6d9fd53d6 templater: drop raw method

Matt Mackall <mpm@selenic.com>

parents: 10855

diff changeset

1320 '''Perform expansion. t is name of map element to expand.

b6f6d9fd53d6 templater: drop raw method

Matt Mackall <mpm@selenic.com>

parents: 10855

diff changeset

1321 mapping contains added elements for use during expansion. Is a

b6f6d9fd53d6 templater: drop raw method

Matt Mackall <mpm@selenic.com>

parents: 10855

diff changeset

1322 generator.'''

29286

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

1323 func, data = self._load(t)

1d461ee26e1b templater: lift parsed and compiled templates to generic data types

Yuya Nishihara <yuya@tcha.org>

parents: 29133

diff changeset

1324 return _flatten(func(self, mapping, data))

8218

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1325

8361

d8c5a7f25a40 templater: make the templating engine pluggable to some extent

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8360

diff changeset

1326 engines = {'default': engine}

d8c5a7f25a40 templater: make the templating engine pluggable to some extent

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8360

diff changeset

1327

19125

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1328 def stylelist():

22634

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1329 paths = templatepaths()

20312

268a5ab5c27b templater: selecting a style with no templates does not crash (issue4140)

Simon Heimberg <simohe@besonet.ch>

parents: 20067

diff changeset

1330 if not paths:

268a5ab5c27b templater: selecting a style with no templates does not crash (issue4140)

Simon Heimberg <simohe@besonet.ch>

parents: 20067

diff changeset

1331 return _('no templates found, try `hg debuginstall` for more info')

28292

b502138f5faa cleanup: remove superfluous space after space after equals (python)

timeless <timeless@mozdev.org>

parents: 27940

diff changeset

1332 dirlist = os.listdir(paths[0])

19125

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1333 stylelist = []

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1334 for file in dirlist:

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1335 split = file.split(".")

29074

d2e154dddb6e templater: ignore orig/rej files

timeless <timeless@mozdev.org>

parents: 29055

diff changeset

1336 if split[-1] in ('orig', 'rej'):

d2e154dddb6e templater: ignore orig/rej files

timeless <timeless@mozdev.org>

parents: 29055

diff changeset

1337 continue

19125

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1338 if split[0] == "map-cmdline":

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1339 stylelist.append(split[1])

19127

d982edcfe7f0 templater: fix output instability from gsoc patches

Augie Fackler <raf@durin42.com>

parents: 19125

diff changeset

1340 return ", ".join(sorted(stylelist))

19125

6ba6e345961e templater: show the style list when I try to use a wrong one

Iulian Stana <julian.stana@gmail.com>

parents: 19079

diff changeset

1341

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1342 def _readmapfile(mapfile):

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1343 """Load template elements from the given map file"""

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1344 if not os.path.exists(mapfile):

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1345 raise error.Abort(_("style '%s' not found") % mapfile,

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1346 hint=_("available styles: %s") % stylelist())

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1347

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1348 base = os.path.dirname(mapfile)

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1349 conf = config.config(includepaths=templatepaths())

35497

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1350 conf.read(mapfile, remap={'': 'templates'})

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1351

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1352 cache = {}

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1353 tmap = {}

35498

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1354 aliases = []

35495

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1355

35497

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1356 val = conf.get('templates', '__base__')

35495

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1357 if val and val[0] not in "'\"":

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1358 # treat as a pointer to a base class for this style

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1359 path = util.normpath(os.path.join(base, val))

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1360

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1361 # fallback check in template paths

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1362 if not os.path.exists(path):

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1363 for p in templatepaths():

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1364 p2 = util.normpath(os.path.join(p, val))

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1365 if os.path.isfile(p2):

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1366 path = p2

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1367 break

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1368 p3 = util.normpath(os.path.join(p2, "map"))

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1369 if os.path.isfile(p3):

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1370 path = p3

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1371 break

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1372

35498

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1373 cache, tmap, aliases = _readmapfile(path)

35495

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1374

35497

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1375 for key, val in conf['templates'].items():

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1376 if not val:

35497

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1377 raise error.ParseError(_('missing value'),

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1378 conf.source('templates', key))

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1379 if val[0] in "'\"":

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1380 if val[0] != val[-1]:

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1381 raise error.ParseError(_('unmatched quotes'),

35497

f4aeb952ab77 templater: load template fragments from [templates] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35495

diff changeset

1382 conf.source('templates', key))

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1383 cache[key] = unquotestring(val)

35495

56f085334611 templater: simplify merge of __base__ dicts by reading it first

Yuya Nishihara <yuya@tcha.org>

parents: 35476

diff changeset

1384 elif key != '__base__':

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1385 val = 'default', val

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1386 if ':' in val[1]:

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1387 val = val[1].split(':', 1)

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1388 tmap[key] = val[0], os.path.join(base, val[1])

35498

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1389 aliases.extend(conf['templatealias'].items())

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1390 return cache, tmap, aliases

29703

7f6b8ec691e3 templater: extract function that loads template map file

Yuya Nishihara <yuya@tcha.org>

parents: 29702

diff changeset

1391

27227

56b2bcea2529 error: get Abort from 'error' instead of 'util'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 27197

diff changeset

1392 class TemplateNotFound(error.Abort):

19770

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

1393 pass

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

1394

8218

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1395 class templater(object):

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1396

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1397 def __init__(self, filters=None, defaults=None, cache=None, aliases=(),

7394

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1398 minchunk=1024, maxchunk=65536):

1909

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1399 '''set up template engine.

37b9f80a5fbb add doc comments to template code.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1906

diff changeset

1400 filters is dict of functions. each transforms a value into another.

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1401 defaults is dict of default map definitions.

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1402 aliases is list of alias (name, replacement) pairs.

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1403 '''

26950

66221730d372 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26949

diff changeset

1404 if filters is None:

66221730d372 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26949

diff changeset

1405 filters = {}

26951

727d57e94cda templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26950

diff changeset

1406 if defaults is None:

727d57e94cda templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26950

diff changeset

1407 defaults = {}

26952

0a5a774f5956 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26951

diff changeset

1408 if cache is None:

0a5a774f5956 templater: remove a mutable default argument

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 26951

diff changeset

1409 cache = {}

1975

6e1a8ea5d717 Duplicate cache when creating templater.

Shun-ichi Goto <shunichi.goto@gmail.com>

parents: 1964

diff changeset

1410 self.cache = cache.copy()

1896

f8f818a04f5b move hgweb template code out to templater

Vadim Gelfer <vadim.gelfer@gmail.com>

parents:

diff changeset

1411 self.map = {}

8360

acc202b71619 templater: provide the standard template filters by default

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8312

diff changeset

1412 self.filters = templatefilters.filters.copy()

acc202b71619 templater: provide the standard template filters by default

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8312

diff changeset

1413 self.filters.update(filters)

1964

778281d46bb2 fix template bug that made hgweb break.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1955

diff changeset

1414 self.defaults = defaults

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1415 self._aliases = aliases

7394

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1416 self.minchunk, self.maxchunk = minchunk, maxchunk

13187

e3b87fb34d00 templater: clarify engine caching

Matt Mackall <mpm@selenic.com>

parents: 13177

diff changeset

1417 self.ecache = {}

1896

f8f818a04f5b move hgweb template code out to templater

Vadim Gelfer <vadim.gelfer@gmail.com>

parents:

diff changeset

1418

29704

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1419 @classmethod

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1420 def frommapfile(cls, mapfile, filters=None, defaults=None, cache=None,

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1421 minchunk=1024, maxchunk=65536):

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1422 """Create templater from the specified map file"""

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1423 t = cls(filters, defaults, cache, [], minchunk, maxchunk)

35498

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1424 cache, tmap, aliases = _readmapfile(mapfile)

29704

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1425 t.cache.update(cache)

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1426 t.map = tmap

35498

f17a0e18c47e templater: load aliases from [templatealias] section in map file

Yuya Nishihara <yuya@tcha.org>

parents: 35497

diff changeset

1427 t._aliases = aliases

29704

f97a0bcfd7a1 templater: separate function to create templater from map file (API)

Yuya Nishihara <yuya@tcha.org>

parents: 29703

diff changeset

1428 return t

1896

f8f818a04f5b move hgweb template code out to templater

Vadim Gelfer <vadim.gelfer@gmail.com>

parents:

diff changeset

1429

1899

888d298ddb91 many small changes to templater.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1897

diff changeset

1430 def __contains__(self, key):

3640

e7639888bb2f templater: simplify cache and remove filter argument in __call__

Matt Mackall <mpm@selenic.com>

parents: 3639

diff changeset

1431 return key in self.cache or key in self.map

1899

888d298ddb91 many small changes to templater.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1897

diff changeset

1432

8218

e61cb2813d2a templater: separate template management and actual string processing

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8198

diff changeset

1433 def load(self, t):

6772

6d824dc86907 templater: make a template a string-only iterator

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 6434

diff changeset

1434 '''Get the template for the given template name. Use a local cache.'''

16686

67964cda8701 cleanup: "not x in y" -> "x not in y"

Brodie Rao <brodie@sf.io>

parents: 14945

diff changeset

1435 if t not in self.cache:

1905

0c760737b996 improve template errors when something is wrong.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1904

diff changeset

1436 try:

14170

135e244776f0 prevent transient leaks of file handle by using new helper functions

Dan Villiom Podlaski Christiansen <danchr@gmail.com>

parents: 13665

diff changeset

1437 self.cache[t] = util.readfile(self.map[t][1])

26214

328739ea70c3 global: mass rewrite to use modern exception syntax

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26208

diff changeset

1438 except KeyError as inst:

19770

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

1439 raise TemplateNotFound(_('"%s" not in template map') %

0361163efbaf templater: support using templates with non-standard names from map file

Alexander Plavin <alexander@plav.in>

parents: 19390

diff changeset

1440 inst.args[0])

26214

328739ea70c3 global: mass rewrite to use modern exception syntax

Gregory Szorc <gregory.szorc@gmail.com>

parents: 26208

diff changeset

1441 except IOError as inst:

1905

0c760737b996 improve template errors when something is wrong.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 1904

diff changeset

1442 raise IOError(inst.args[0], _('template file %s: %s') %

8361

d8c5a7f25a40 templater: make the templating engine pluggable to some extent

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8360

diff changeset

1443 (self.map[t][1], inst.args[1]))

6772

6d824dc86907 templater: make a template a string-only iterator

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 6434

diff changeset

1444 return self.cache[t]

1896

f8f818a04f5b move hgweb template code out to templater

Vadim Gelfer <vadim.gelfer@gmail.com>

parents:

diff changeset

1445

33656

2ecce24dfcd3 templater: add simple interface for unnamed template (API)

Yuya Nishihara <yuya@tcha.org>

parents: 33467

diff changeset

1446 def render(self, mapping):

2ecce24dfcd3 templater: add simple interface for unnamed template (API)

Yuya Nishihara <yuya@tcha.org>

parents: 33467

diff changeset

1447 """Render the default unnamed template and return result as string"""

35129

46f45b7efa30 py3: use pycompat.strkwargs() before passing a dict as keyword argument

Pulkit Goyal <7895pulkit@gmail.com>

parents: 35113

diff changeset

1448 mapping = pycompat.strkwargs(mapping)

33656

2ecce24dfcd3 templater: add simple interface for unnamed template (API)

Yuya Nishihara <yuya@tcha.org>

parents: 33467

diff changeset

1449 return stringify(self('', **mapping))

2ecce24dfcd3 templater: add simple interface for unnamed template (API)

Yuya Nishihara <yuya@tcha.org>

parents: 33467

diff changeset

1450

10850

90f4367535a5 templater: map -> mapping

Matt Mackall <mpm@selenic.com>

parents: 10849

diff changeset

1451 def __call__(self, t, **mapping):

33799

4e6dc34b5d7a py3: convert kwargs keys' back to bytes using pycompat.byteskwargs()

Pulkit Goyal <7895pulkit@gmail.com>

parents: 33757

diff changeset

1452 mapping = pycompat.byteskwargs(mapping)

8361

d8c5a7f25a40 templater: make the templating engine pluggable to some extent

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8360

diff changeset

1453 ttype = t in self.map and self.map[t][0] or 'default'

13187

e3b87fb34d00 templater: clarify engine caching

Matt Mackall <mpm@selenic.com>

parents: 13177

diff changeset

1454 if ttype not in self.ecache:

29581

6b86ce3e3576 templater: give better error message for invalid engine type

Yuya Nishihara <yuya@tcha.org>

parents: 29446

diff changeset

1455 try:

6b86ce3e3576 templater: give better error message for invalid engine type

Yuya Nishihara <yuya@tcha.org>

parents: 29446

diff changeset

1456 ecls = engines[ttype]

6b86ce3e3576 templater: give better error message for invalid engine type

Yuya Nishihara <yuya@tcha.org>

parents: 29446

diff changeset

1457 except KeyError:

6b86ce3e3576 templater: give better error message for invalid engine type

Yuya Nishihara <yuya@tcha.org>

parents: 29446

diff changeset

1458 raise error.Abort(_('invalid template engine: %s') % ttype)

29707

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1459 self.ecache[ttype] = ecls(self.load, self.filters, self.defaults,

d813132ea361 templater: load and expand aliases by template engine (API) (issue4842)

Yuya Nishihara <yuya@tcha.org>

parents: 29706

diff changeset

1460 self._aliases)

13187

e3b87fb34d00 templater: clarify engine caching

Matt Mackall <mpm@selenic.com>

parents: 13177

diff changeset

1461 proc = self.ecache[ttype]

8361

d8c5a7f25a40 templater: make the templating engine pluggable to some extent

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8360

diff changeset

1462

10850

90f4367535a5 templater: map -> mapping

Matt Mackall <mpm@selenic.com>

parents: 10849

diff changeset

1463 stream = proc.process(t, mapping)

7394

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1464 if self.minchunk:

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1465 stream = util.increasingchunks(stream, min=self.minchunk,

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1466 max=self.maxchunk)

526c40a74bd0 templater: return data in increasing chunk sizes

Brendan Cully <brendan@kublai.com>

parents: 7107

diff changeset

1467 return stream

7434

cf7741aa1e96 kill some trailing spaces

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7394

diff changeset

1468

22634

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1469 def templatepaths():

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1470 '''return locations used for template files.'''

22636

d844e220792a templater: don't search randomly for templates - trust util.datapath

Mads Kiilerich <madski@unity3d.com>

parents: 22635

diff changeset

1471 pathsrel = ['templates']

22635

660861a6fad4 templater: inline global 'path' list in templatepaths

Mads Kiilerich <madski@unity3d.com>

parents: 22634

diff changeset

1472 paths = [os.path.normpath(os.path.join(util.datapath, f))

660861a6fad4 templater: inline global 'path' list in templatepaths

Mads Kiilerich <madski@unity3d.com>

parents: 22634

diff changeset

1473 for f in pathsrel]

660861a6fad4 templater: inline global 'path' list in templatepaths

Mads Kiilerich <madski@unity3d.com>

parents: 22634

diff changeset

1474 return [p for p in paths if os.path.isdir(p)]

2189

e3eba577a0ae move changeset_templater into templater module.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 2001

diff changeset

1475

22634

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1476 def templatepath(name):

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1477 '''return location of template file. returns None if not found.'''

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1478 for p in templatepaths():

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1479 f = os.path.join(p, name)

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1480 if os.path.exists(f):

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1481 return f

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1482 return None

2189

e3eba577a0ae move changeset_templater into templater module.

Vadim Gelfer <vadim.gelfer@gmail.com>

parents: 2001

diff changeset

1483

9842

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1484 def stylemap(styles, paths=None):

7966

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1485 """Return path to mapfile for a given style.

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1486

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1487 Searches mapfile in the following locations:

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1488 1. templatepath/style/map

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1489 2. templatepath/map-style

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1490 3. templatepath/map

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1491 """

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1492

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1493 if paths is None:

22634

e48a5d3996c2 templater: introduce templatepaths for getting paths searched for templates

Mads Kiilerich <madski@unity3d.com>

parents: 22633

diff changeset

1494 paths = templatepaths()

7966

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1495 elif isinstance(paths, str):

8223

02145b700fe4 templater: fix little problem from stylemap() changes

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 8218

diff changeset

1496 paths = [paths]

7966

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1497

9842

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1498 if isinstance(styles, str):

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1499 styles = [styles]

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1500

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1501 for style in styles:

24416

b73a22d1d9bf hgweb: prevent loading style map from directories other than specified paths

Yuya Nishihara <yuya@tcha.org>

parents: 23167

diff changeset

1502 # only plain name is allowed to honor template paths

b73a22d1d9bf hgweb: prevent loading style map from directories other than specified paths

Yuya Nishihara <yuya@tcha.org>

parents: 23167

diff changeset

1503 if (not style

b73a22d1d9bf hgweb: prevent loading style map from directories other than specified paths

Yuya Nishihara <yuya@tcha.org>

parents: 23167

diff changeset

1504 or style in (os.curdir, os.pardir)

31394

bb77654dc7ae py3: replace os.sep with pycompat.ossep (part 3 of 4)

Pulkit Goyal <7895pulkit@gmail.com>

parents: 31111

diff changeset

1505 or pycompat.ossep in style

31404

bcf4a975f93d py3: replace os.altsep with pycompat.altsep

Pulkit Goyal <7895pulkit@gmail.com>

parents: 31394

diff changeset

1506 or pycompat.osaltsep and pycompat.osaltsep in style):

9842

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1507 continue

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1508 locations = [os.path.join(style, 'map'), 'map-' + style]

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1509 locations.append('map')

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1510

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1511 for path in paths:

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1512 for location in locations:

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1513 mapfile = os.path.join(path, location)

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1514 if os.path.isfile(mapfile):

d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901)

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 9372

diff changeset

1515 return style, mapfile

7966

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1516

aa983c3d94a9 templater: move stylemap function from hgweb to templater

Dirkjan Ochtman <dirkjan@ochtman.nl>

parents: 7434

diff changeset

1517 raise RuntimeError("No hgweb templates found in %r" % paths)

24734

d80819f67d59 templater: tell hggettext to collect help of template functions

Yuya Nishihara <yuya@tcha.org>

parents: 24719

diff changeset

1518

29445

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1519 def loadfunction(ui, extname, registrarobj):

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1520 """Load template function from specified registrarobj

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1521 """

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1522 for name, func in registrarobj._table.iteritems():

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1523 funcs[name] = func

cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API)

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 29437

diff changeset

1524

24734

d80819f67d59 templater: tell hggettext to collect help of template functions

Yuya Nishihara <yuya@tcha.org>

parents: 24719

diff changeset

1525 # tell hggettext to extract docstrings from these functions:

d80819f67d59 templater: tell hggettext to collect help of template functions

Yuya Nishihara <yuya@tcha.org>

parents: 24719

diff changeset

1526 i18nfunctions = funcs.values()

Mercurial > hg > mercurial-source

annotate mercurial/templater.py @ 35793:b81ad5b78a81