This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12190

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

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb53f2f5a18de: filemerge: move removal of `.orig` extension on temp file close to context
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.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (7 lines)

Diff 32247

mercurial/filemerge.py

% (tool, uipathfn(fcd.path())) % (tool, uipathfn(fcd.path()))
) )
return False, 1, None return False, 1, None
localpath = _workingpath(repo, fcd) localpath = _workingpath(repo, fcd)
args = _toolstr(repo.ui, tool, b"args") args = _toolstr(repo.ui, tool, b"args")
localoutputpath = None localoutputpath = None
if b"$output" in args: if b"$output" in args:
localoutputpath = backup.path() localoutputpath = backup.path()
# Remove the .orig to make syntax-highlighting more likely.
if localoutputpath.endswith(b'.orig'):
localoutputpath, ext = os.path.splitext(localoutputpath)
with _maketempfiles( with _maketempfiles(
fco, fco,
fca, fca,
localoutputpath, localoutputpath,
) as temppaths: ) as temppaths:
basepath, otherpath, localoutputpath = temppaths basepath, otherpath, localoutputpath = temppaths
outpath = b"" outpath = b""
f.write(data) f.write(data)
f.close() f.close()
return name return name
b = tempfromcontext(b"base", fca) b = tempfromcontext(b"base", fca)
c = tempfromcontext(b"other", fco) c = tempfromcontext(b"other", fco)
d = localpath d = localpath
if localpath is not None: if localpath is not None:
# We start off with this being the backup filename, so remove the .orig
# to make syntax-highlighting more likely.
if d.endswith(b'.orig'):
d, _ = os.path.splitext(d)
f, d = maketempfrompath(b"local", d) f, d = maketempfrompath(b"local", d)
with open(localpath, b'rb') as src: with open(localpath, b'rb') as src:
f.write(src.read()) f.write(src.read())
f.close() f.close()
try: try:
yield b, c, d yield b, c, d
finally: finally: