Show More
@@ -15,6 +15,7 b' from mercurial import (' | |||||
15 | extensions, |
|
15 | extensions, | |
16 | hg, |
|
16 | hg, | |
17 | localrepo, |
|
17 | localrepo, | |
|
18 | util, | |||
18 | wireprotov1peer, |
|
19 | wireprotov1peer, | |
19 | wireprotov1server, |
|
20 | wireprotov1server, | |
20 | ) |
|
21 | ) | |
@@ -166,6 +167,8 b' def clientfetch(repo, paths, lastnodemap' | |||||
166 | ui.debug('fastannotate: server returned\n') |
|
167 | ui.debug('fastannotate: server returned\n') | |
167 | for result in results: |
|
168 | for result in results: | |
168 | r = result.result() |
|
169 | r = result.result() | |
|
170 | # TODO: pconvert these paths on the server? | |||
|
171 | r = {util.pconvert(p): v for p, v in r.iteritems()} | |||
169 | for path in sorted(r): |
|
172 | for path in sorted(r): | |
170 | # ignore malicious paths |
|
173 | # ignore malicious paths | |
171 | if not path.startswith('fastannotate/') or '/../' in (path + '/'): |
|
174 | if not path.startswith('fastannotate/') or '/../' in (path + '/'): |
General Comments 0
You need to be logged in to leave comments.
Login now