##// END OF EJS Templates
windows: use normalized path to check repository nesting...
FUJIWARA Katsunori -
r15722:417127af stable
parent child Browse files
Show More
@@ -127,6 +127,7 b' class localrepository(repo.repository):'
127 if not path.startswith(self.root):
127 if not path.startswith(self.root):
128 return False
128 return False
129 subpath = path[len(self.root) + 1:]
129 subpath = path[len(self.root) + 1:]
130 normsubpath = util.pconvert(subpath)
130
131
131 # XXX: Checking against the current working copy is wrong in
132 # XXX: Checking against the current working copy is wrong in
132 # the sense that it can reject things like
133 # the sense that it can reject things like
@@ -148,9 +149,9 b' class localrepository(repo.repository):'
148 ctx = self[None]
149 ctx = self[None]
149 parts = util.splitpath(subpath)
150 parts = util.splitpath(subpath)
150 while parts:
151 while parts:
151 prefix = os.sep.join(parts)
152 prefix = '/'.join(parts)
152 if prefix in ctx.substate:
153 if prefix in ctx.substate:
153 if prefix == subpath:
154 if prefix == normsubpath:
154 return True
155 return True
155 else:
156 else:
156 sub = ctx.sub(prefix)
157 sub = ctx.sub(prefix)
General Comments 0
You need to be logged in to leave comments. Login now