Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 20072:6d4fda48b4e3

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 Tue, 19 Nov 2013 11:29:56 -0500
parents f962870712da 64b4f0cd7336
children a6cf48b2880d b0153cb8b64e
comparison
equal deleted inserted replaced
20065:08fffc33af47 20072:6d4fda48b4e3
938 if opts.get('patch') or opts.get('stat'): 938 if opts.get('patch') or opts.get('stat'):
939 patch = scmutil.matchall(repo) 939 patch = scmutil.matchall(repo)
940 940
941 tmpl = opts.get('template') 941 tmpl = opts.get('template')
942 style = None 942 style = None
943 if tmpl: 943 if not tmpl:
944 tmpl = templater.parsestring(tmpl, quoted=False)
945 else:
946 style = opts.get('style') 944 style = opts.get('style')
947 945
948 # ui settings 946 # ui settings
949 if not (tmpl or style): 947 if not (tmpl or style):
950 tmpl = ui.config('ui', 'logtemplate') 948 tmpl = ui.config('ui', 'logtemplate')