This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9549

simplemerge: avoid quadratic concatenation when building output text
ClosedPublic

Authored by martinvonz on Dec 9 2020, 4:28 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfd75e5c53ec3: simplemerge: avoid quadratic concatenation when building output text
Summary

I haven't checked if the difference is measurable, but the new version
is no less readable or idiomatic, so I don't think performance numbers
are needed.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (5 lines)

Diff 24140

mercurial/simplemerge.py

extrakwargs[b'start_marker'] = None extrakwargs[b'start_marker'] = None
extrakwargs[b'mid_marker'] = None extrakwargs[b'mid_marker'] = None
extrakwargs[b'end_marker'] = None extrakwargs[b'end_marker'] = None
elif name_base is not None: elif name_base is not None:
extrakwargs[b'base_marker'] = b'|||||||' extrakwargs[b'base_marker'] = b'|||||||'
extrakwargs[b'name_base'] = name_base extrakwargs[b'name_base'] = name_base
extrakwargs[b'minimize'] = False extrakwargs[b'minimize'] = False
mergedtext = b"" lines = []
for line in m3.merge_lines( for line in m3.merge_lines(
name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
): ):
if opts.get('print'): if opts.get('print'):
ui.fout.write(line) ui.fout.write(line)
else: else:
mergedtext += line lines.append(line)
# merge flags if necessary # merge flags if necessary
flags = localctx.flags() flags = localctx.flags()
localflags = set(pycompat.iterbytestr(flags)) localflags = set(pycompat.iterbytestr(flags))
otherflags = set(pycompat.iterbytestr(otherctx.flags())) otherflags = set(pycompat.iterbytestr(otherctx.flags()))
if is_not_null(basectx) and localflags != otherflags: if is_not_null(basectx) and localflags != otherflags:
baseflags = set(pycompat.iterbytestr(basectx.flags())) baseflags = set(pycompat.iterbytestr(basectx.flags()))
commonflags = localflags & otherflags commonflags = localflags & otherflags
addedflags = (localflags ^ otherflags) - baseflags addedflags = (localflags ^ otherflags) - baseflags
flags = b''.join(sorted(commonflags | addedflags)) flags = b''.join(sorted(commonflags | addedflags))
if not opts.get('print'): if not opts.get('print'):
mergedtext = b''.join(lines)
localctx.write(mergedtext, flags) localctx.write(mergedtext, flags)
if m3.conflicts and not mode == b'union': if m3.conflicts and not mode == b'union':
return 1 return 1