[Updated] D11802: filemerge: simplify slightly by using filectx.decodeddata()

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG6ce9ccfcac23: filemerge: simplify slightly by using filectx.decodeddata() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11802?vs=31124&id=31154

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11802/new/

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, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211126/fbcb4093/attachment-0002.html>