mercurial/filemerge.py
changeset 30924 48dea083f66d
parent 30898 4d019d0e1b3b
child 31204 84e8a6834223
equal deleted inserted replaced
30923:78de43ab585f 30924:48dea083f66d
   583     def temp(prefix, ctx):
   583     def temp(prefix, ctx):
   584         fullbase, ext = os.path.splitext(ctx.path())
   584         fullbase, ext = os.path.splitext(ctx.path())
   585         pre = "%s~%s." % (os.path.basename(fullbase), prefix)
   585         pre = "%s~%s." % (os.path.basename(fullbase), prefix)
   586         (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
   586         (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
   587         data = repo.wwritedata(ctx.path(), ctx.data())
   587         data = repo.wwritedata(ctx.path(), ctx.data())
   588         f = os.fdopen(fd, "wb")
   588         f = os.fdopen(fd, pycompat.sysstr("wb"))
   589         f.write(data)
   589         f.write(data)
   590         f.close()
   590         f.close()
   591         return name
   591         return name
   592 
   592 
   593     if not fco.cmp(fcd): # files identical?
   593     if not fco.cmp(fcd): # files identical?