Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 10250:af24805aa37c
Merge with crew-stab le
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 15 Jan 2010 10:38:11 +0100 |
parents | 3af4b39afe2a 8ebb34b0f6f7 |
children | fe699ca08a45 |
comparison
equal
deleted
inserted
replaced
10248:4441e8d7f04f | 10250:af24805aa37c |
---|---|
889 if not (tmpl or style): | 889 if not (tmpl or style): |
890 tmpl = ui.config('ui', 'logtemplate') | 890 tmpl = ui.config('ui', 'logtemplate') |
891 if tmpl: | 891 if tmpl: |
892 tmpl = templater.parsestring(tmpl) | 892 tmpl = templater.parsestring(tmpl) |
893 else: | 893 else: |
894 style = ui.config('ui', 'style') | 894 style = util.expandpath(ui.config('ui', 'style', '')) |
895 | 895 |
896 if not (tmpl or style): | 896 if not (tmpl or style): |
897 return changeset_printer(ui, repo, patch, opts, buffered) | 897 return changeset_printer(ui, repo, patch, opts, buffered) |
898 | 898 |
899 mapfile = None | 899 mapfile = None |