Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 48396:6ce9ccfcac23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: simplify slightly by using filectx.decodeddata() Differential Revision: https://phab.mercurial-scm.org/D11802
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Nov 2021 18:48:34 -0800
parents 1eeec02cd919
children 921853391276
comparison
equal deleted inserted replaced
48395:1eeec02cd919 48396:6ce9ccfcac23
993 f = os.fdopen(fd, "wb") 993 f = os.fdopen(fd, "wb")
994 return f, name 994 return f, name
995 995
996 def tempfromcontext(prefix, ctx): 996 def tempfromcontext(prefix, ctx):
997 f, name = maketempfrompath(prefix, ctx.path()) 997 f, name = maketempfrompath(prefix, ctx.path())
998 data = repo.wwritedata(ctx.path(), ctx.data()) 998 data = ctx.decodeddata()
999 f.write(data) 999 f.write(data)
1000 f.close() 1000 f.close()
1001 return name 1001 return name
1002 1002
1003 b = tempfromcontext(b"base", fca) 1003 b = tempfromcontext(b"base", fca)