( )⚙ D12190 filemerge: move removal of `.orig` extension on temp file close to context

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: move removal of `.orig` extension on temp file close to context
ClosedPublic

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

Details

Summary

The place where the .orig extension is removed in _maketempfiles()
doesn't make it clear that it's the backup path, which is why we have
a comment in the code explaining it. Let's instead move it out of the
function and close to where we get it from backup.path(), so that
becomes clear.

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.