Show More
@@ -535,8 +535,6 b' def _imerge3(repo, mynode, fcd, fco, fca' | |||||
535 | files. It will fail if there are any conflicts and leave markers in |
|
535 | files. It will fail if there are any conflicts and leave markers in | |
536 | the partially merged file. Marker will have three sections, one from each |
|
536 | the partially merged file. Marker will have three sections, one from each | |
537 | side of the merge and one for the base content.""" |
|
537 | side of the merge and one for the base content.""" | |
538 | if not labels: |
|
|||
539 | labels = _defaultconflictlabels |
|
|||
540 | if len(labels) < 3: |
|
538 | if len(labels) < 3: | |
541 | labels.append(b'base') |
|
539 | labels.append(b'base') | |
542 | return _merge(repo, fcd, fco, fca, labels, b'merge3') |
|
540 | return _merge(repo, fcd, fco, fca, labels, b'merge3') | |
@@ -577,8 +575,6 b' def _imerge_diff(repo, mynode, fcd, fco,' | |||||
577 | the partially merged file. The marker will have two sections, one with the |
|
575 | the partially merged file. The marker will have two sections, one with the | |
578 | content from one side of the merge, and one with a diff from the base |
|
576 | content from one side of the merge, and one with a diff from the base | |
579 | content to the content on the other side. (experimental)""" |
|
577 | content to the content on the other side. (experimental)""" | |
580 | if not labels: |
|
|||
581 | labels = _defaultconflictlabels |
|
|||
582 | if len(labels) < 3: |
|
578 | if len(labels) < 3: | |
583 | labels.append(b'base') |
|
579 | labels.append(b'base') | |
584 | return _merge(repo, fcd, fco, fca, labels, b'mergediff') |
|
580 | return _merge(repo, fcd, fco, fca, labels, b'mergediff') | |
@@ -841,9 +837,6 b' def _formatlabel(ctx, template, label, p' | |||||
841 | return stringutil.ellipsis(mark, 80 - 8) |
|
837 | return stringutil.ellipsis(mark, 80 - 8) | |
842 |
|
838 | |||
843 |
|
839 | |||
844 | _defaultconflictlabels = [b'local', b'other'] |
|
|||
845 |
|
||||
846 |
|
||||
847 | def _formatlabels(repo, fcd, fco, fca, labels, tool=None): |
|
840 | def _formatlabels(repo, fcd, fco, fca, labels, tool=None): | |
848 | """Formats the given labels using the conflict marker template. |
|
841 | """Formats the given labels using the conflict marker template. | |
849 |
|
842 | |||
@@ -1068,6 +1061,8 b' def filemerge(repo, wctx, mynode, orig, ' | |||||
1068 |
|
1061 | |||
1069 | toolconf = tool, toolpath, binary, symlink, scriptfn |
|
1062 | toolconf = tool, toolpath, binary, symlink, scriptfn | |
1070 |
|
1063 | |||
|
1064 | if not labels: | |||
|
1065 | labels = [b'local', b'other'] | |||
1071 | if mergetype == nomerge: |
|
1066 | if mergetype == nomerge: | |
1072 | return func(repo, mynode, fcd, fco, fca, toolconf, labels) |
|
1067 | return func(repo, mynode, fcd, fco, fca, toolconf, labels) | |
1073 |
|
1068 | |||
@@ -1099,8 +1094,6 b' def filemerge(repo, wctx, mynode, orig, ' | |||||
1099 | else: |
|
1094 | else: | |
1100 | markerstyle = internalmarkerstyle |
|
1095 | markerstyle = internalmarkerstyle | |
1101 |
|
1096 | |||
1102 | if not labels: |
|
|||
1103 | labels = _defaultconflictlabels |
|
|||
1104 | formattedlabels = labels |
|
1097 | formattedlabels = labels | |
1105 | if markerstyle != b'basic': |
|
1098 | if markerstyle != b'basic': | |
1106 | formattedlabels = _formatlabels( |
|
1099 | formattedlabels = _formatlabels( |
General Comments 0
You need to be logged in to leave comments.
Login now