equal
deleted
inserted
replaced
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') |