mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
convert/svn: fix _iterfiles() output in root dir case (issue2647)
When converting directory additions/replacement with project directory set to root, _iterfiles() sometimes returned paths starting with a slash making following svn calls to fail. I could not reproduce the issue with hand-crafted repositories. Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>
This commit is contained in:
parent
2fb8bf1f24
commit
ec6a1a3ed2
@ -866,7 +866,9 @@ class svn_source(converter_source):
|
||||
pool = Pool()
|
||||
rpath = '/'.join([self.baseurl, urllib.quote(path)]).strip('/')
|
||||
entries = svn.client.ls(rpath, optrev(revnum), True, self.ctx, pool)
|
||||
return ((path + '/' + p) for p, e in entries.iteritems()
|
||||
if path:
|
||||
path += '/'
|
||||
return ((path + p) for p, e in entries.iteritems()
|
||||
if e.kind == svn.core.svn_node_file)
|
||||
|
||||
def getrelpath(self, path, module=None):
|
||||
|
Loading…
Reference in New Issue
Block a user