/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Daniel Knittl-Frank
  • Date: 2010-09-14 13:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 5427.
  • Revision ID: knittl89+bzr@googlemail.com-20100914131220-rzphka9ajmmnciri
 Do not descend directories in CommonInventory.entries() when root is None
    
 This was the case at least for `bzr inventory -r0`.
 Simply check if self.root is not Null before descending

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
836
836
                if ie.kind == 'directory':
837
837
                    descend(ie, child_path)
838
838
 
839
 
        descend(self.root, u'')
 
839
        if self.root is not None:
 
840
            descend(self.root, u'')
840
841
        return accum
841
842
 
842
843
    def directories(self):