Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 38198:2ce60954b1b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: wrap tempfile.mkdtemp() to use bytes path This also flips the default to use a bytes path on Python 3.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 26 May 2018 12:20:36 +0900
parents aac4be30e250
children 6c8e3c847977
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat May 26 12:14:04 2018 +0900
+++ b/mercurial/filemerge.py	Sat May 26 12:20:36 2018 +0900
@@ -11,7 +11,6 @@
 import os
 import re
 import shutil
-import tempfile
 
 from .i18n import _
 from .node import nullid, short
@@ -713,7 +712,7 @@
     tmproot = None
     tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
     if tmprootprefix:
-        tmproot = tempfile.mkdtemp(prefix=tmprootprefix)
+        tmproot = pycompat.mkdtemp(prefix=tmprootprefix)
 
     def maketempfrompath(prefix, path):
         fullbase, ext = os.path.splitext(path)