##// END OF EJS Templates
templater: drop unneeded resources from conflict-marker data...
Yuya Nishihara -
r35498:c240657f default
parent child Browse files
Show More
@@ -543,7 +543,7 b' def _xmerge(repo, mynode, orig, fcd, fco'
543 543 util.unlink(b)
544 544 util.unlink(c)
545 545
546 def _formatconflictmarker(repo, ctx, template, label, pad):
546 def _formatconflictmarker(ctx, template, label, pad):
547 547 """Applies the given template to the ctx, prefixed by the label.
548 548
549 549 Pad is the minimum width of the label prefix, so that multiple markers
@@ -553,9 +553,7 b' def _formatconflictmarker(repo, ctx, tem'
553 553 ctx = ctx.p1()
554 554
555 555 props = templatekw.keywords.copy()
556 props['templ'] = template
557 556 props['ctx'] = ctx
558 props['repo'] = repo
559 557 templateresult = template.render(props)
560 558
561 559 label = ('%s:' % label).ljust(pad + 1)
@@ -586,10 +584,10 b' def _formatlabels(repo, fcd, fco, fca, l'
586 584
587 585 pad = max(len(l) for l in labels)
588 586
589 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
590 _formatconflictmarker(repo, co, tmpl, labels[1], pad)]
587 newlabels = [_formatconflictmarker(cd, tmpl, labels[0], pad),
588 _formatconflictmarker(co, tmpl, labels[1], pad)]
591 589 if len(labels) > 2:
592 newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad))
590 newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad))
593 591 return newlabels
594 592
595 593 def partextras(labels):
General Comments 0
You need to be logged in to leave comments. Login now