# HG changeset patch # User Matt Harbison # Date 2019-02-06 01:50:54 # Node ID 87a6e3c953e045d92147925fc71aad7c327fdbfd # Parent 8b2892d5a9f2c06c998c977015a9ad3e3a3c9b5f subrepo: avoid false unsafe path detection on Windows Subrepo paths are not normalized for the OS, so what was happening in the subsequent root path check was: root -> $TESTTMP\issue1852a\sub/repo util.expandpath(...) -> $TESTTMP\issue1852a\sub/repo os.path.realpath(...) -> $TESTTMP\issue1852a\sub\repo diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -405,7 +405,7 @@ class hgsubrepo(abstractsubrepo): super(hgsubrepo, self).__init__(ctx, path) self._state = state r = ctx.repo() - root = r.wjoin(path) + root = r.wjoin(util.localpath(path)) create = allowcreate and not r.wvfs.exists('%s/.hg' % path) # repository constructor does expand variables in path, which is # unsafe since subrepo path might come from untrusted source.