# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1637374465 28800
# Node ID 1eeec02cd919c87512b1d13e9a44cdf309692320
# Parent  d5a91701f7dcdac14e4473f5fb005a5d5d585a88
filemerge: rename _formatconflictmarker() since it formats a label

`_formatconflictmarker()`'s name made me think that it would create
something like `<<<<<<<` and maybe some more stuff after it, but it's
actually just the label that comes after on the same line. So let's
rename it to `_formatlabel()`. That's better aligned with the
variables the result is assigned it.

Differential Revision: https://phab.mercurial-scm.org/D11801

diff -r d5a91701f7dc -r 1eeec02cd919 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Tue Nov 23 20:04:22 2021 +0100
+++ b/mercurial/filemerge.py	Fri Nov 19 18:14:25 2021 -0800
@@ -846,7 +846,7 @@
         return True, r, False
 
 
-def _formatconflictmarker(ctx, template, label, pad):
+def _formatlabel(ctx, template, label, pad):
     """Applies the given template to the ctx, prefixed by the label.
 
     Pad is the minimum width of the label prefix, so that multiple markers
@@ -893,11 +893,11 @@
     pad = max(len(l) for l in labels)
 
     newlabels = [
-        _formatconflictmarker(cd, tmpl, labels[0], pad),
-        _formatconflictmarker(co, tmpl, labels[1], pad),
+        _formatlabel(cd, tmpl, labels[0], pad),
+        _formatlabel(co, tmpl, labels[1], pad),
     ]
     if len(labels) > 2:
-        newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad))
+        newlabels.append(_formatlabel(ca, tmpl, labels[2], pad))
     return newlabels