Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: simplify slightly by using filectx.decodeddata()
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 19 Nov 2021 18:48:34 -0800
changeset 48348 6ce9ccfcac23
parent 48347 1eeec02cd919
child 48349 c12ed33558cb
filemerge: simplify slightly by using filectx.decodeddata() Differential Revision: https://phab.mercurial-scm.org/D11802
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Fri Nov 19 18:14:25 2021 -0800
+++ b/mercurial/filemerge.py	Fri Nov 19 18:48:34 2021 -0800
@@ -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
Mercurial