Skip to content
Snippets Groups Projects
Commit 59524cb1 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

simplemerge: don't calculate conflict labels when resolving automatically

Differential Revision: https://phab.mercurial-scm.org/D11903
parent bd27dad2
No related branches found
No related tags found
No related merge requests found
......@@ -503,13 +503,6 @@
# repository usually sees) might be more useful.
return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts)
mode = opts.get('mode', b'merge')
name_a, name_b, name_base = None, None, None
if mode != b'union':
name_a, name_b, name_base = _picklabels(
[localctx.path(), otherctx.path(), None], opts.get('label', [])
)
try:
localtext = readctx(localctx)
basetext = readctx(basectx)
......@@ -519,9 +512,10 @@
m3 = Merge3Text(basetext, localtext, othertext)
conflicts = False
mode = opts.get('mode', b'merge')
if mode == b'union':
lines = _resolve(m3, (1, 2))
elif mode == b'local':
lines = _resolve(m3, (1,))
elif mode == b'other':
lines = _resolve(m3, (2,))
......@@ -522,9 +516,7 @@
if mode == b'union':
lines = _resolve(m3, (1, 2))
elif mode == b'local':
lines = _resolve(m3, (1,))
elif mode == b'other':
lines = _resolve(m3, (2,))
elif mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else:
......@@ -530,11 +522,4 @@
else:
extrakwargs = {
'minimize': True,
}
if name_base is not None:
extrakwargs['base_marker'] = b'|||||||'
extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False
lines = list(
m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
name_a, name_b, name_base = _picklabels(
[localctx.path(), otherctx.path(), None], opts.get('label', [])
)
......@@ -540,5 +525,18 @@
)
conflicts = m3.conflicts
if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else:
extrakwargs = {
'minimize': True,
}
if name_base is not None:
extrakwargs['base_marker'] = b'|||||||'
extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False
lines = list(
m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
)
conflicts = m3.conflicts
mergedtext = b''.join(lines)
if opts.get('print'):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment