Mercurial > public > mercurial-scm > hg

diff mercurial/filemerge.py @ 36835:5bc7ff103081

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use r'' instead of sysstr('') to get around code transformer Fewer function calls should be better.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 10 Mar 2018 15:57:16 +0900
parents 3ab9d74dd1c5
children a4a95bd7158d
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Mar 10 15:50:09 2018 +0900
+++ b/mercurial/filemerge.py	Sat Mar 10 15:57:16 2018 +0900
@@ -674,7 +674,7 @@
         pre = "%s~%s." % (os.path.basename(fullbase), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
         data = repo.wwritedata(ctx.path(), ctx.data())
-        f = os.fdopen(fd, pycompat.sysstr("wb"))
+        f = os.fdopen(fd, r"wb")
         f.write(data)
         f.close()
         return name