Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 24988:e8ff0b09acac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: rename parsestring() to unquotestring() (API) Since db7463aa080f, it doesn't parse string escapes.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 04 May 2015 10:03:13 +0900
parents fd7287f0b43c
children 4169a4f83548
comparison
equal deleted inserted replaced
24987:fd7287f0b43c 24988:e8ff0b09acac
1441 # ui settings 1441 # ui settings
1442 if not tmpl and not style: # template are stronger than style 1442 if not tmpl and not style: # template are stronger than style
1443 tmpl = ui.config('ui', 'logtemplate') 1443 tmpl = ui.config('ui', 'logtemplate')
1444 if tmpl: 1444 if tmpl:
1445 try: 1445 try:
1446 tmpl = templater.parsestring(tmpl) 1446 tmpl = templater.unquotestring(tmpl)
1447 except SyntaxError: 1447 except SyntaxError:
1448 pass 1448 pass
1449 return tmpl, None 1449 return tmpl, None
1450 else: 1450 else:
1451 style = util.expandpath(ui.config('ui', 'style', '')) 1451 style = util.expandpath(ui.config('ui', 'style', ''))
1475 1475
1476 # perhaps it's a reference to [templates] 1476 # perhaps it's a reference to [templates]
1477 t = ui.config('templates', tmpl) 1477 t = ui.config('templates', tmpl)
1478 if t: 1478 if t:
1479 try: 1479 try:
1480 tmpl = templater.parsestring(t) 1480 tmpl = templater.unquotestring(t)
1481 except SyntaxError: 1481 except SyntaxError:
1482 tmpl = t 1482 tmpl = t
1483 return tmpl, None 1483 return tmpl, None
1484 1484
1485 if tmpl == 'list': 1485 if tmpl == 'list':