# HG changeset patch # User Pierre-Yves David # Date 1628160816 -7200 # Node ID 23921bc857b5afb02628457a2e17281878d652a7 # Parent bc74cb9a8e408f1bc7f25d02609c16ebf2074bab subrepo: compare normalised vfs path Otherwise the realpath call can turn `/` into `\` on windows confusing the check. (We probably needs this in more location) Differential Revision: https://phab.mercurial-scm.org/D11259 diff -r bc74cb9a8e40 -r 23921bc857b5 mercurial/subrepo.py --- a/mercurial/subrepo.py Thu Aug 05 18:25:35 2021 +0200 +++ b/mercurial/subrepo.py Thu Aug 05 12:53:36 2021 +0200 @@ -458,12 +458,14 @@ create = allowcreate and not r.wvfs.exists(b'%s/.hg' % path) # repository constructor does expand variables in path, which is # unsafe since subrepo path might come from untrusted source. - if os.path.realpath(util.expandpath(root)) != root: + norm_root = os.path.normcase(root) + real_root = os.path.normcase(os.path.realpath(util.expandpath(root))) + if real_root != norm_root: raise error.Abort( _(b'subrepo path contains illegal component: %s') % path ) self._repo = hg.repository(r.baseui, root, create=create) - if self._repo.root != root: + if os.path.normcase(self._repo.root) != os.path.normcase(root): raise error.ProgrammingError( b'failed to reject unsafe subrepo ' b'path: %s (expanded to %s)' % (root, self._repo.root)