/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: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
32
32
    ui,
33
33
    urlutils,
34
34
    )
35
 
from bzrlib.inventory import (
36
 
    InventoryDirectory,
37
 
    ROOT_ID,
38
 
    )
39
35
from bzrlib.revision import (
40
36
    NULL_REVISION,
41
37
    )
357
353
            # Pointless commit - get the tree sha elsewhere
358
354
            if not rev.parent_ids:
359
355
                root_tree = Tree()
360
 
                root_ie = InventoryDirectory(ROOT_ID, '', None)
361
356
            else:
362
357
                base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
363
358
                root_tree = self[base_sha1]
364
 
                root_ie = tree.inventory.root
 
359
            root_ie = tree.inventory.root
365
360
        if roundtrip:
366
 
            # FIXME: This can probably be a lot more efficient...
 
361
            # FIXME: This can probably be a lot more efficient, 
 
362
            # not all files necessarily have to be processed.
367
363
            file_ids = {}
368
364
            for (path, ie) in tree.inventory.iter_entries():
369
365
                if self.mapping.generate_file_id(path) != ie.file_id: