/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 object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-07 15:43:02 UTC
  • mto: (0.200.1925 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180407154302-iqeb48vpdv7pv6lv
Remove use of inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
289
289
    for path in unusual_modes:
290
290
        dirty_dirs.add(posixpath.dirname(path))
291
291
 
292
 
    try:
293
 
        inv = tree.root_inventory
294
 
    except AttributeError:
295
 
        inv = tree.inventory
296
 
 
297
292
    for dir in list(dirty_dirs):
298
293
        for parent in osutils.parent_directories(dir):
299
294
            if parent in dirty_dirs:
586
581
                return self._lookup_revision_sha1(entry.reference_revision)
587
582
            else:
588
583
                raise AssertionError("unknown entry kind '%s'" % entry.kind)
589
 
        try:
590
 
            inv = bzr_tree.root_inventory
591
 
        except AttributeError:
592
 
            inv = bzr_tree.inventory
593
584
        path = bzr_tree.id2path(fileid)
594
585
        tree = directory_to_tree(
595
586
                path,