Merge with crew-stable

hgext/convert/bzr.py

@@ -21,6 +21,8 b' try:'
 except ImportError:
     pass
 
+supportedkinds = ('file', 'symlink')
+
 class bzr_source(converter_source):
     """Reads Bazaar repositories by using the Bazaar Python libraries"""
 
@@ -71,7 +73,7 b' class bzr_source(converter_source):'
     def getfile(self, name, rev):
         revtree = self.sourcerepo.revision_tree(rev)
         fileid = revtree.path2id(name)
-        if fileid is None:
+        if fileid is None or revtree.kind(fileid) not in supportedkinds:
             # the file is not available anymore - was deleted
             raise IOError(_('%s is not available in %s anymore') %
                     (name, rev))

tests/test-convert-bzr

@@ -9,12 +9,15 b' bzr init -q source'
 cd source
 echo a > a
 echo c > c
-bzr add -q a c
-bzr commit -q -m 'Initial add: a, c'
+echo e > e
+bzr add -q a c e
+bzr commit -q -m 'Initial add: a, c, e'
 bzr mv a b
 bzr mv c d
+bzr mv e f
 echo a2 >> a
-bzr add -q a
+mkdir e
+bzr add -q a e
 bzr commit -q -m 'rename a into b, create a, rename c into d'
 cd ..
 hg convert source source-hg

tests/test-convert-bzr.out

@@ -1,27 +1,29 b''
 % create and rename on the same file in the same step
 a => b
 c => d
+e => f
 initializing destination source-hg repository
 scanning source...
 sorting...
 converting...
-1 Initial add: a, c
+1 Initial add: a, c, e
 0 rename a into b, create a, rename c into d
-o  1 "rename a into b, create a, rename c into d" files: a b c d
+o  1 "rename a into b, create a, rename c into d" files: a b c d e f
 |
-o  0 "Initial add: a, c" files: a c
+o  0 "Initial add: a, c, e" files: a c e
 
 % manifest
 a
 b
 d
+f
 % test --rev option
 initializing destination source-1-hg repository
 scanning source...
 sorting...
 converting...
-0 Initial add: a, c
-o  0 "Initial add: a, c" files: a c
+0 Initial add: a, c, e
+o  0 "Initial add: a, c, e" files: a c e
 
 % merge
 initializing destination source-hg repository