martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY By setting the default labels a little earlier, we can rely on them always being set, as far as I can tell. It may actually even be fine to rely on that even if we don't set them earlier, but it makes more sense to me to do it. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12015 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -535,8 +535,6 @@ files. It will fail if there are any conflicts and leave markers in the partially merged file. Marker will have three sections, one from each side of the merge and one for the base content.""" - if not labels: - labels = _defaultconflictlabels if len(labels) < 3: labels.append(b'base') return _merge(repo, fcd, fco, fca, labels, b'merge3') @@ -577,8 +575,6 @@ the partially merged file. The marker will have two sections, one with the content from one side of the merge, and one with a diff from the base content to the content on the other side. (experimental)""" - if not labels: - labels = _defaultconflictlabels if len(labels) < 3: labels.append(b'base') return _merge(repo, fcd, fco, fca, labels, b'mergediff') @@ -841,9 +837,6 @@ return stringutil.ellipsis(mark, 80 - 8) -_defaultconflictlabels = [b'local', b'other'] - - def _formatlabels(repo, fcd, fco, fca, labels, tool=None): """Formats the given labels using the conflict marker template. @@ -1068,6 +1061,8 @@ toolconf = tool, toolpath, binary, symlink, scriptfn + if not labels: + labels = [b'local', b'other'] if mergetype == nomerge: return func(repo, mynode, fcd, fco, fca, toolconf, labels) @@ -1099,8 +1094,6 @@ else: markerstyle = internalmarkerstyle - if not labels: - labels = _defaultconflictlabels formattedlabels = labels if markerstyle != b'basic': formattedlabels = _formatlabels( To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
