make parsestring work with strings that do not have quotes.

mercurial/templater.py

@@ -1,157 +1,159
 import re
 from demandload import demandload
 from i18n import gettext as _
 demandload(globals(), "cStringIO cgi os time urllib util")
 
 esctable = {
     '\\': '\\',
     'r': '\r',
     't': '\t',
     'n': '\n',
     'v': '\v',
     }
 
-def parsestring(s):
+def parsestring(s, quoted=True):
     fp = cStringIO.StringIO()
-    escape = False
+    if quoted:
     first = s[0]
     if len(s) < 2: raise SyntaxError(_('string too short'))
     if first not in "'\"": raise SyntaxError(_('invalid quote'))
     if s[-1] != first: raise SyntaxError(_('unmatched quotes'))
-    for c in s[1:-1]:
+        s = s[1:-1]
+    escape = False
+    for c in s:
         if escape:
             fp.write(esctable.get(c, c))
             escape = False
         elif c == '\\': escape = True
-        elif c == first: raise SyntaxError(_('string ends early'))
+        elif quoted and c == first: raise SyntaxError(_('string ends early'))
         else: fp.write(c)
     if escape: raise SyntaxError(_('unterminated escape'))
     return fp.getvalue()
 
 class templater(object):
     def __init__(self, mapfile, filters={}, defaults={}):
         self.cache = {}
         self.map = {}
         self.base = os.path.dirname(mapfile)
         self.filters = filters
         self.defaults = defaults
 
         i = 0
         for l in file(mapfile):
             i += 1
             m = re.match(r'(\S+)\s*=\s*(["\'].*["\'])$', l)
             if m:
                 try:
                     s = m.group(2)
                     self.cache[m.group(1)] = parsestring(s)
                 except SyntaxError, inst:
                     raise SyntaxError('%s:%s: %s' % (mapfile, i, inst.args[0]))
             else:
                 m = re.match(r'(\S+)\s*=\s*(\S+)', l)
                 if m:
                     self.map[m.group(1)] = os.path.join(self.base, m.group(2))
                 else:
                     raise LookupError(_("unknown map entry '%s'") % l)
 
     def __contains__(self, key):
         return key in self.cache
 
     def __call__(self, t, **map):
         m = self.defaults.copy()
         m.update(map)
         try:
             tmpl = self.cache[t]
         except KeyError:
             tmpl = self.cache[t] = file(self.map[t]).read()
         return self.template(tmpl, self.filters, **m)
 
     template_re = re.compile(r"#([a-zA-Z_][a-zA-Z0-9_]*)"
                              r"((%[a-zA-Z_][a-zA-Z0-9_]*)*)"
                              r"((\|[a-zA-Z_][a-zA-Z0-9_]*)*)#")
 
     def template(self, tmpl, filters={}, **map):
         lm = map.copy()
         while tmpl:
             m = self.template_re.search(tmpl)
             if m:
                 start = m.start(0)
                 if start:
                     yield tmpl[:start]
                 v = map.get(m.group(1), "")
                 v = callable(v) and v(**map) or v
 
                 format = m.group(2)
                 fl = m.group(4)
 
                 if format:
                     q = v.__iter__
                     for i in q():
                         lm.update(i)
                         yield self(format[1:], **lm)
 
                     v = ""
 
                 elif fl:
                     for f in fl.split("|")[1:]:
                         v = filters[f](v)
 
                 yield v
                 tmpl = tmpl[m.end(0):]
             else:
                 yield tmpl
                 break
 
 agescales = [("second", 1),
              ("minute", 60),
              ("hour", 3600),
              ("day", 3600 * 24),
              ("week", 3600 * 24 * 7),
              ("month", 3600 * 24 * 30),
              ("year", 3600 * 24 * 365)]
 
 agescales.reverse()
 
 def age(x):
     def plural(t, c):
         if c == 1:
             return t
         return t + "s"
     def fmt(t, c):
         return "%d %s" % (c, plural(t, c))
 
     now = time.time()
     then = x[0]
     delta = max(1, int(now - then))
 
     for t, s in agescales:
         n = delta / s
         if n >= 2 or s == 1:
             return fmt(t, n)
 
 def nl2br(text):
     return text.replace('\n', '<br/>\n')
 
 def obfuscate(text):
     return ''.join(['&#%d;' % ord(c) for c in text])
 
 common_filters = {
     "escape": lambda x: cgi.escape(x, True),
     "urlescape": urllib.quote,
     "strip": lambda x: x.strip(),
     "age": age,
     "date": lambda x: util.datestr(x),
     "addbreaks": nl2br,
     "obfuscate": obfuscate,
     "short": (lambda x: x[:12]),
     "firstline": (lambda x: x.splitlines(1)[0]),
     "permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--"),
     "rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
     }
 
 def templatepath(name=None):
     for f in 'templates', '../templates':
         fl = f.split('/')
         if name: fl.append(name)
         p = os.path.join(os.path.dirname(__file__), *fl)
         if (name and os.path.exists(p)) or os.path.isdir(p):
             return os.path.normpath(p)