Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: optionally strip quotes from merge marker template (BC)
authorYuya Nishihara <yuya@tcha.org>
Sat, 25 Feb 2017 19:36:02 +0900
changeset 32047 458f7294dfee
parent 32046 5b630f2ccb4e
child 32048 c3ef33fd0058
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.
mercurial/filemerge.py file | annotate | diff | comparison | revisions
tests/test-conflict.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial