facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

stupid: remove an incorrect, implicit assumption in fetch_branchrev()

Browse Source 
The code in fetch_branchrev() could fail under relatively obscure
circumstances: it combined two strings (path & child) by concatenating
them with '/' inserted in the middle. However, convert_rev() contains
an assertion that no touched file paths start with '/'. Combined,
these two amounted to an incorrect assumption that no files where
touched within an empty branchpath.
This commit is contained in:
Dan Villiom Podlaski Christiansen 2010-08-11 19:57:34 +02:00
parent 57e5b36411
commit 22ba8a8561
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgsubversion/stupid.py
View File

@ -423,7 +423,11 @@ def fetch_branchrev(svn, meta, branch, branchpath, r, parentctx):
dirpath = branchprefix + path
for child, k in svn.list_files(dirpath, r.revnum):
if k == 'f':
files.append(path + '/' + child)
if path:
childpath = '%s/%s' % (path, child)
else:
childpath = child
files.append(childpath)
if e.action == 'R':
# Check all files in replaced directory
path = path + '/'