comparison mercurial/filemerge.py @ 38198:2ce60954b1b7

py3: wrap tempfile.mkdtemp() to use bytes path

This also flips the default to use a bytes path on Python 3.

38197:aac4be30e250

import contextlib
import os
import re
import shutil
import tempfile

from .i18n import _
from .node import nullid, short

from . import (

    use them.
    """
    tmproot = None
    tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
    if tmprootprefix:
        tmproot = tempfile.mkdtemp(prefix=tmprootprefix)

    def maketempfrompath(prefix, path):
        fullbase, ext = os.path.splitext(path)
        pre = "%s~%s" % (os.path.basename(fullbase), prefix)
        if tmproot:

38198:2ce60954b1b7

import contextlib
import os
import re
import shutil

from .i18n import _
from .node import nullid, short

from . import (

    use them.
    """
    tmproot = None
    tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
    if tmprootprefix:
        tmproot = pycompat.mkdtemp(prefix=tmprootprefix)

    def maketempfrompath(prefix, path):
        fullbase, ext = os.path.splitext(path)
        pre = "%s~%s" % (os.path.basename(fullbase), prefix)
        if tmproot: