/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: Aaron Bentley
  • Date: 2006-10-20 01:46:22 UTC
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: aaron.bentley@utoronto.ca-20061020014622-745c98fdc87811a8
When 'directory' path element isn't a directory, return None from path2id

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1204
1204
            return None
1205
1205
        for f in name:
1206
1206
            try:
1207
 
                cie = parent.children[f]
 
1207
                children = getattr(parent, 'children', None)
 
1208
                if children == None:
 
1209
                    return None
 
1210
                cie = children[f]
1208
1211
                assert cie.name == f
1209
1212
                assert cie.parent_id == parent.file_id
1210
1213
                parent = cie