D11802: filemerge: simplify slightly by using filectx.decodeddata()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Nov 24 17:05:25 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11802
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -995,7 +995,7 @@
def tempfromcontext(prefix, ctx):
f, name = maketempfrompath(prefix, ctx.path())
- data = repo.wwritedata(ctx.path(), ctx.data())
+ data = ctx.decodeddata()
f.write(data)
f.close()
return name
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list