This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: write output only once it's complete

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



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

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

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
This revision was automatically updated to reflect the committed changes.