dirstate: use pathutil.normasprefix to ensure os.sep at the end of root 3cc630be5f09 replaced "os.path.join(root, '')" by "root.endswith(os.sep)" examination, because Python 2.7.9 changes behavior of "os.path.join(path, '')" on UNC path. But some problematic encodings use 0x5c (= "os.sep" on Windows) as the tail byte of some multi-byte characters, and replacement above prevents Mercurial from working on the repository, of which root path ends with such multi-byte character, regardless of enabling win32mbcs. This patch uses "pathutil.normasprefix()" instead of "root.endswith(os.sep)" examination, to ensure "os.sep" at the end of "dirstate._rootdir" even with problematic encodings. "root" of dirstate can be passed to "pathutil.normasprefix()" without normalization, because it is always given from "repo.root" = "repo.wvfs.base", which is normalized by "os.path.realpath()". Using "util.endswithsep()" instead of "str.endswith(os.sep)" also fixes this problem, but this patch chooses "pathutil.normasprefix()" to centralize "adding os.sep if endswith(os.sep)" logic into it.

     1

import os, __builtin__

     2

from mercurial import util

     3

     4

def lowerwrap(scope, funcname):

     5

    f = getattr(scope, funcname)

     6

    def wrap(fname, *args, **kwargs):

     7

        d, base = os.path.split(fname)

     8

        try:

     9

            files = os.listdir(d or '.')

    10

        except OSError:

    11

            files = []

    12

        if base in files:

    13

            return f(fname, *args, **kwargs)

    14

        for fn in files:

    15

            if fn.lower() == base.lower():

    16

                return f(os.path.join(d, fn), *args, **kwargs)

    17

        return f(fname, *args, **kwargs)

    18

    scope.__dict__[funcname] = wrap

    19

    20

def normcase(path):

    21

    return path.lower()

    22

    23

os.path.normcase = normcase

    24

    25

for f in 'file open'.split():

    26

    lowerwrap(__builtin__, f)

    27

    28

for f in "chmod chown open lstat stat remove unlink".split():

    29

    lowerwrap(os, f)

    30

    31

for f in "exists lexists".split():

    32

    lowerwrap(os.path, f)

    33

    34

lowerwrap(util, 'posixfile')