This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9550

simplemerge: write output only once it's complete
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa771ffc378a8: simplemerge: write output only once it's complete
Summary

simplemerge() can write either to ui.fout or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.

Diff Detail

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

Event Timeline

martinvonz created this revision.Dec 9 2020, 4:28 AM
pulkit accepted this revision.Dec 9 2020, 7:00 AM
This revision is now accepted and ready to land.Dec 9 2020, 7:00 AM
martinvonz added a commit: rHGa771ffc378a8: simplemerge: write output only once it's complete.Dec 10 2020, 4:42 AM
Closed by commit rHGa771ffc378a8: simplemerge: write output only once it's complete (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (15 lines)

Diff 24141

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
lines = [] lines = 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'):
ui.fout.write(line)
else:
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'):
mergedtext = b''.join(lines) mergedtext = b''.join(lines)
if opts.get('print'):
ui.fout.write(mergedtext)
else:
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