This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12192

filemerge: reduce some duplication in `_maketempfiles()`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG69000dc0dced: filemerge: reduce some duplication in `_maketempfiles()`
Summary

The two callers of the local maketempfrompath() function used the
returned file object in the same way. We can reduce duplication by
moving that code into the function.

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:19 AM
This revision is now accepted and ready to land.Feb 16 2022, 5:19 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (17 lines)

Diff 32249

mercurial/filemerge.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
short, short,
) )
from .pycompat import ( from .pycompat import (
getattr, getattr,
open,
) )
from . import ( from . import (
encoding, encoding,
error, error,
formatter, formatter,
match, match,
pycompat, pycompat,
@contextlib.contextmanager @contextlib.contextmanager
def _maketempfiles(fco, fca, localpath): def _maketempfiles(fco, fca, localpath):
"""Writes out `fco` and `fca` as temporary files, and (if localpath is not """Writes out `fco` and `fca` as temporary files, and (if localpath is not
None) copies `localpath` to another temporary file, so an external merge None) copies `localpath` to another temporary file, so an external merge
tool may use them. tool may use them.
""" """
tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
def maketempfrompath(prefix, path): def maketempfrompath(prefix, path, data):
fullbase, ext = os.path.splitext(path) fullbase, ext = os.path.splitext(path)
pre = b"%s~%s" % (os.path.basename(fullbase), prefix) pre = b"%s~%s" % (os.path.basename(fullbase), prefix)
name = os.path.join(tmproot, pre) name = os.path.join(tmproot, pre)
if ext: if ext:
name += ext name += ext
f = open(name, "wb") util.writefile(name, data)
return f, name return name
def tempfromcontext(prefix, ctx): def tempfromcontext(prefix, ctx):
f, name = maketempfrompath(prefix, ctx.path()) return maketempfrompath(prefix, ctx.path(), ctx.decodeddata())
data = ctx.decodeddata()
f.write(data)
f.close()
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:
f, d = maketempfrompath(b"local", d)
data = util.readfile(localpath) data = util.readfile(localpath)
f.write(data) d = maketempfrompath(b"local", localpath, data)
f.close()
try: try:
yield b, c, d yield b, c, d
finally: finally:
shutil.rmtree(tmproot) shutil.rmtree(tmproot)
def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):