Mercurial > hg
changeset 10250:af24805aa37c
Merge with crew-stab le
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 15 Jan 2010 10:38:11 +0100 |
| parents | 4441e8d7f04f (current diff) 8ebb34b0f6f7 (diff) |
| children | 0bc93fa2cf2b |
| files | mercurial/cmdutil.py tests/test-command-template tests/test-command-template.out |
| diffstat | 3 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Jan 14 16:43:14 2010 +0100 +++ b/mercurial/cmdutil.py Fri Jan 15 10:38:11 2010 +0100 @@ -891,7 +891,7 @@ if tmpl: tmpl = templater.parsestring(tmpl) else: - style = ui.config('ui', 'style') + style = util.expandpath(ui.config('ui', 'style', '')) if not (tmpl or style): return changeset_printer(ui, repo, patch, opts, buffered)
--- a/tests/test-command-template Thu Jan 14 16:43:14 2010 +0100 +++ b/tests/test-command-template Fri Jan 15 10:38:11 2010 +0100 @@ -181,5 +181,18 @@ hg tag -r 5 -m t5 -d '9 0' t5 hg tag -r 3 -m at3 -d '10 0' at3 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' +cd .. + +echo '# style path expansion (issue1948)' +mkdir -p home/styles +cat > home/styles/teststyle <<EOF +changeset = 'test {rev}:{node|short}\n' +EOF +HOME=`pwd`/home; export HOME +cat > latesttag/.hg/hgrc <<EOF +[ui] +style = ~/styles/teststyle +EOF +hg -R latesttag tip echo '# done'