equal
deleted
inserted
replaced
532 |
532 |
533 props = templatekw.keywords.copy() |
533 props = templatekw.keywords.copy() |
534 props['templ'] = template |
534 props['templ'] = template |
535 props['ctx'] = ctx |
535 props['ctx'] = ctx |
536 props['repo'] = repo |
536 props['repo'] = repo |
537 templateresult = template('conflictmarker', **props) |
537 templateresult = template.render(props) |
538 |
538 |
539 label = ('%s:' % label).ljust(pad + 1) |
539 label = ('%s:' % label).ljust(pad + 1) |
540 mark = '%s %s' % (label, templater.stringify(templateresult)) |
540 mark = '%s %s' % (label, templateresult) |
541 |
541 |
542 if mark: |
542 if mark: |
543 mark = mark.splitlines()[0] # split for safety |
543 mark = mark.splitlines()[0] # split for safety |
544 |
544 |
545 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') |
545 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') |
564 ca = fca.changectx() |
564 ca = fca.changectx() |
565 |
565 |
566 ui = repo.ui |
566 ui = repo.ui |
567 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
567 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
568 template = templater.unquotestring(template) |
568 template = templater.unquotestring(template) |
569 tmpl = formatter.maketemplater(ui, 'conflictmarker', template) |
569 tmpl = formatter.maketemplater(ui, template) |
570 |
570 |
571 pad = max(len(l) for l in labels) |
571 pad = max(len(l) for l in labels) |
572 |
572 |
573 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
573 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
574 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |
574 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |