tests: convert the `root` arg of matchmod.match() to local path separators This fixes tests that broke with 8b1a9ba375e5, complaining that "X not under root /repo". The vast majority of real uses are to pass `repo.root`, which is normalized by `wdirvfs.base` being set to the result of `os.path.realpath()`. Failure to convert looks like this: --- c:/Users/Matt/hg/tests/test-match.py.out +++ c:/Users/Matt/hg/tests/test-match.py.err @@ -0,0 +1,48 @@ +ERROR: testVisitchildrensetGlob (__main__.IncludeMatcherTests) + +Traceback (most recent call last): + File "c:\Users\Matt\hg\tests\test-match.py", line 180, in testVisitchildrensetGlob + m = matchmod.match(b'/repo', b'', include=[b'glob:dir/z*']) + File "c:\Users\Matt\hg\mercurial\match.py", line 271, in match + kindpats = normalize(include, b'glob', root, cwd, auditor, warn) + File "c:\Users\Matt\hg\mercurial\match.py", line 322, in _donormalize + pat = pathutil.canonpath(root, cwd, pat, auditor=auditor) + File "c:\Users\Matt\hg\mercurial\pathutil.py", line 251, in canonpath + _(b"%s not under root '%s'") % (myname, root), hint=hint +Abort: dir/z* not under root '/repo' +ERROR: testVisitdirGlob (__main__.IncludeMatcherTests) Differential Revision: https://phab.mercurial-scm.org/D7724

     1

from __future__ import absolute_import

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

    extensions,

     6

    ui as uimod,

     7

)

     8

     9

    10

def testdispatch(cmd):

    11

    """Simple wrapper around dispatch.dispatch()

    12

    13

    Prints command and result value, but does not handle quoting.

    14

    """

    15

    ui = uimod.ui.load()

    16

    extensions.populateui(ui)

    17

    ui.statusnoi18n(b"running: %s\n" % cmd)

    18

    req = dispatch.request(cmd.split(), ui)

    19

    result = dispatch.dispatch(req)

    20

    ui.statusnoi18n(b"result: %r\n" % result)

    21

    22

    23

# create file 'foo', add and commit

    24

f = open(b'foo', 'wb')

    25

f.write(b'foo\n')

    26

f.close()

    27

testdispatch(b"--debug add foo")

    28

testdispatch(b"--debug commit -m commit1 -d 2000-01-01 foo")

    29

    30

# append to file 'foo' and commit

    31

f = open(b'foo', 'ab')

    32

f.write(b'bar\n')

    33

f.close()

    34

# remove blackbox.log directory (proxy for readonly log file)

    35

os.rmdir(b".hg/blackbox.log")

    36

# replace it with the real blackbox.log file

    37

os.rename(b".hg/blackbox.log-", b".hg/blackbox.log")

    38

testdispatch(b"--debug commit -m commit2 -d 2000-01-02 foo")

    39

    40

# check 88803a69b24 (fancyopts modified command table)

    41

testdispatch(b"--debug log -r 0")

    42

testdispatch(b"--debug log -r tip")