Mercurial > hg
comparison mercurial/filemerge.py @ 35469:f1c54d003327
templater: move repo, ui and cache to per-engine resources
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 21 Dec 2017 22:05:30 +0900 |
| parents | ef7e667a4f7b |
| children | c240657febb7 |
comparison
equal
deleted
inserted
replaced
| 35468:32c278eb876f | 35469:f1c54d003327 |
|---|---|
| 579 ca = fca.changectx() | 579 ca = fca.changectx() |
| 580 | 580 |
| 581 ui = repo.ui | 581 ui = repo.ui |
| 582 template = ui.config('ui', 'mergemarkertemplate') | 582 template = ui.config('ui', 'mergemarkertemplate') |
| 583 template = templater.unquotestring(template) | 583 template = templater.unquotestring(template) |
| 584 tmpl = formatter.maketemplater(ui, template) | 584 tres = formatter.templateresources(ui, repo) |
| 585 tmpl = formatter.maketemplater(ui, template, resources=tres) | |
| 585 | 586 |
| 586 pad = max(len(l) for l in labels) | 587 pad = max(len(l) for l in labels) |
| 587 | 588 |
| 588 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), | 589 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
| 589 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] | 590 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |