Show More
@@ -846,7 +846,7 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||||
846 | return True, r, False |
|
846 | return True, r, False | |
847 |
|
847 | |||
848 |
|
848 | |||
849 |
def _format |
|
849 | def _formatlabel(ctx, template, label, pad): | |
850 | """Applies the given template to the ctx, prefixed by the label. |
|
850 | """Applies the given template to the ctx, prefixed by the label. | |
851 |
|
851 | |||
852 | Pad is the minimum width of the label prefix, so that multiple markers |
|
852 | Pad is the minimum width of the label prefix, so that multiple markers | |
@@ -893,11 +893,11 b' def _formatlabels(repo, fcd, fco, fca, l' | |||||
893 | pad = max(len(l) for l in labels) |
|
893 | pad = max(len(l) for l in labels) | |
894 |
|
894 | |||
895 | newlabels = [ |
|
895 | newlabels = [ | |
896 |
_format |
|
896 | _formatlabel(cd, tmpl, labels[0], pad), | |
897 |
_format |
|
897 | _formatlabel(co, tmpl, labels[1], pad), | |
898 | ] |
|
898 | ] | |
899 | if len(labels) > 2: |
|
899 | if len(labels) > 2: | |
900 |
newlabels.append(_format |
|
900 | newlabels.append(_formatlabel(ca, tmpl, labels[2], pad)) | |
901 | return newlabels |
|
901 | return newlabels | |
902 |
|
902 | |||
903 |
|
903 |
General Comments 0
You need to be logged in to leave comments.
Login now