This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: make `_maketempfiles()` more reusable
ClosedPublic

Authored by martinvonz on Feb 15 2022, 11:09 PM.

Details

Summary

_maketempfiles() is very specialized for its current use. I hope to
use it also when creating temporary files for input for tools that do
partial conflict resolution. That'll be possible if the function is
more generic. Instead of passing in two contexts (for "other" and
"base") and an optional path (for "local"), let's pass a single list
of files to make backups for. Even if we don't end up using for
partial conflict resolution, this is still a simplification (but I do
have a WIP patch for partial conflict resolution and it is able to
benefit from this).

Diff Detail

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

Event Timeline

martinvonz created this revision.Feb 15 2022, 11:09 PM
Alphare accepted this revision.Feb 16 2022, 5:27 AM
This revision is now accepted and ready to land.Feb 16 2022, 5:27 AM
This revision was automatically updated to reflect the committed changes.