subrepo: normalize path in the specific way for problematic encodings Before this patch, "reporelpath()" uses "rstrip(os.sep)" to trim "os.sep" at the end of "parent.root" path. But it doesn't work correctly with some problematic encodings on Windows, because some multi-byte characters in such encodings contain '\\' (0x5c) as the tail byte of them. In such cases, "reporelpath()" leaves unexpected '\\' at the beginning of the path returned to callers. "lcalrepository.root" seems not to have tail "os.sep", because it is always normalized by "os.path.realpath()" in "vfs.__init__()", but in fact it has tail "os.sep", if it is a root (of the drive): path normalization trims tail "os.sep" off "/foo/bar/", but doesn't trim one off "/". So, just avoiding "rstrip(os.sep)" in "reporelpath()" causes regression around issue3033 fixed by fccd350acf79. This patch introduces "pathutil.normasprefix" to normalize specified path in the specific way for problematic encodings without regression around issue3033.

     1

# this is hack to make sure no escape characters are inserted into the output

     2

import os, sys

     3

if 'TERM' in os.environ:

     4

    del os.environ['TERM']

     5

import doctest

     6

     7

def testmod(name, optionflags=0, testtarget=None):

     8

    __import__(name)

     9

    mod = sys.modules[name]

    10

    if testtarget is not None:

    11

        mod = getattr(mod, testtarget)

    12

    doctest.testmod(mod, optionflags=optionflags)

    13

    14

testmod('mercurial.changelog')

    15

testmod('mercurial.dagparser', optionflags=doctest.NORMALIZE_WHITESPACE)

    16

testmod('mercurial.dispatch')

    17

testmod('mercurial.encoding')

    18

testmod('mercurial.hg')

    19

testmod('mercurial.hgweb.hgwebdir_mod')

    20

testmod('mercurial.match')

    21

testmod('mercurial.minirst')

    22

testmod('mercurial.pathutil')

    23

testmod('mercurial.revset')

    24

testmod('mercurial.store')

    25

testmod('mercurial.subrepo')

    26

testmod('mercurial.templatefilters')

    27

testmod('mercurial.ui')

    28

testmod('mercurial.url')

    29

testmod('mercurial.util')

    30

testmod('mercurial.util', testtarget='platform')

    31

testmod('hgext.convert.cvsps')

    32

testmod('hgext.convert.filemap')

    33

testmod('hgext.convert.subversion')