This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11886

simplemerge: avoid a call to `pycompat.strkwargs()`
ClosedPublic

Authored by martinvonz on Dec 8 2021, 12:56 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfa159bb463e6: simplemerge: avoid a call to `pycompat.strkwargs()`

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (20 lines)

Diff 31374

mercurial/simplemerge.py

localtext = readctx(localctx) localtext = readctx(localctx)
basetext = readctx(basectx) basetext = readctx(basectx)
othertext = readctx(otherctx) othertext = readctx(otherctx)
except error.Abort: except error.Abort:
return 1 return 1
m3 = Merge3Text(basetext, localtext, othertext) m3 = Merge3Text(basetext, localtext, othertext)
extrakwargs = { extrakwargs = {
b"localorother": opts.get("localorother", None), "localorother": opts.get("localorother", None),
b'minimize': True, 'minimize': True,
} }
if mode == b'union': if mode == b'union':
extrakwargs[b'start_marker'] = None extrakwargs['start_marker'] = None
extrakwargs[b'mid_marker'] = None extrakwargs['mid_marker'] = None
extrakwargs[b'end_marker'] = None extrakwargs['end_marker'] = None
elif name_base is not None: elif name_base is not None:
extrakwargs[b'base_marker'] = b'|||||||' extrakwargs['base_marker'] = b'|||||||'
extrakwargs[b'name_base'] = name_base extrakwargs['name_base'] = name_base
extrakwargs[b'minimize'] = False extrakwargs['minimize'] = False
if mode == b'mergediff': if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base) lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else: else:
lines = list( lines = list(
m3.merge_lines( m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
)
) )
conflicts = m3.conflicts and not mode == b'union' conflicts = m3.conflicts and not mode == b'union'
mergedtext = b''.join(lines) mergedtext = b''.join(lines)
if opts.get('print'): if opts.get('print'):
ui.fout.write(mergedtext) ui.fout.write(mergedtext)
else: else:
# localctx.flags() already has the merged flags (done in # localctx.flags() already has the merged flags (done in
# mergestate.resolve()) # mergestate.resolve())
localctx.write(mergedtext, localctx.flags()) localctx.write(mergedtext, localctx.flags())
if conflicts: if conflicts:
return 1 return 1