Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 16699:d947e1da1259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 13 May 2012 12:52:24 +0200
parents e34106fa0dc3 48b1674ac1e7
children 34c30506dd4e
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun May 13 11:47:55 2012 +0200
+++ b/mercurial/cmdutil.py	Sun May 13 12:52:24 2012 +0200
@@ -910,7 +910,10 @@
     if not (tmpl or style):
         tmpl = ui.config('ui', 'logtemplate')
         if tmpl:
-            tmpl = templater.parsestring(tmpl)
+            try:
+                tmpl = templater.parsestring(tmpl)
+            except SyntaxError:
+                tmpl = templater.parsestring(tmpl, quoted=False)
         else:
             style = util.expandpath(ui.config('ui', 'style', ''))