This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11802

filemerge: simplify slightly by using filectx.decodeddata()
ClosedPublic

Authored by martinvonz on Nov 24 2021, 12:05 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6ce9ccfcac23: filemerge: simplify slightly by using filectx.decodeddata()

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.Nov 24 2021, 12:05 PM
Alphare accepted this revision.Nov 26 2021, 9:50 AM
This revision is now accepted and ready to land.Nov 26 2021, 9:50 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (2 lines)

Diff 31154

mercurial/filemerge.py

f = open(name, "wb") f = open(name, "wb")
else: else:
fd, name = pycompat.mkstemp(prefix=pre + b'.', suffix=ext) fd, name = pycompat.mkstemp(prefix=pre + b'.', suffix=ext)
f = os.fdopen(fd, "wb") f = os.fdopen(fd, "wb")
return f, name return f, name
def tempfromcontext(prefix, ctx): def tempfromcontext(prefix, ctx):
f, name = maketempfrompath(prefix, ctx.path()) f, name = maketempfrompath(prefix, ctx.path())
data = repo.wwritedata(ctx.path(), ctx.data()) data = ctx.decodeddata()
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 uselocalpath: if uselocalpath: