Mercurial > hg
changeset 32047:458f7294dfee
filemerge: optionally strip quotes from merge marker template (BC)
For consistency with the other template options. Quotes are necessary if
you want to preserve leading/trailing whitespace, which would be stripped
by config parser.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 25 Feb 2017 19:36:02 +0900 |
| parents | 5b630f2ccb4e |
| children | c3ef33fd0058 |
| files | mercurial/filemerge.py tests/test-conflict.t |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sat Feb 25 19:32:39 2017 +0900 +++ b/mercurial/filemerge.py Sat Feb 25 19:36:02 2017 +0900 @@ -543,6 +543,7 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) + template = templater.unquotestring(template) tmpl = formatter.maketemplater(ui, 'conflictmarker', template) pad = max(len(l) for l in labels)
--- a/tests/test-conflict.t Sat Feb 25 19:32:39 2017 +0900 +++ b/tests/test-conflict.t Sat Feb 25 19:36:02 2017 +0900 @@ -65,7 +65,10 @@ Verify custom conflict markers $ hg up -q --clean . - $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc + $ cat <<EOF >> .hg/hgrc + > [ui] + > mergemarkertemplate = '{author} {rev}' + > EOF $ hg merge 1 merging a