Mercurial > hg
comparison mercurial/filemerge.py @ 24987:fd7287f0b43c
templater: remove noop calls of parsestring(s, quoted=False) (API)
Since db7463aa080f, parsestring(s, quoted=False) just returns s.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Mon, 04 May 2015 10:01:03 +0900 |
| parents | 5668202cfaaf |
| children | 34ffe4c29782 |
comparison
equal
deleted
inserted
replaced
| 24986:fb9b7b937b3e | 24987:fd7287f0b43c |
|---|---|
| 352 co = fco.changectx() | 352 co = fco.changectx() |
| 353 ca = fca.changectx() | 353 ca = fca.changectx() |
| 354 | 354 |
| 355 ui = repo.ui | 355 ui = repo.ui |
| 356 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) | 356 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
| 357 template = templater.parsestring(template, quoted=False) | |
| 358 tmpl = templater.templater(None, cache={'conflictmarker': template}) | 357 tmpl = templater.templater(None, cache={'conflictmarker': template}) |
| 359 | 358 |
| 360 pad = max(len(l) for l in labels) | 359 pad = max(len(l) for l in labels) |
| 361 | 360 |
| 362 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), | 361 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |