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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-29 13:16:26 UTC
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190629131626-qioafloyemhdbm4w
Remove Tree.get_root_id() in favour of Tree.path2id('').

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
529
529
            else:
530
530
                base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
531
531
                root_tree = self[self[base_sha1].tree]
532
 
            root_key_data = (tree.get_root_id(), tree.get_revision_id())
 
532
            root_key_data = (tree.path2id(''), tree.get_revision_id())
533
533
        if not lossy and self.mapping.BZR_FILE_IDS_FILE is not None:
534
534
            b = self._create_fileid_map_blob(tree)
535
535
            if b is not None:
631
631
            path,
632
632
            bzr_tree.iter_child_entries(path),
633
633
            get_ie_sha1, unusual_modes, self.mapping.BZR_DUMMY_FILE,
634
 
            bzr_tree.get_root_id() == fileid)
635
 
        if (bzr_tree.get_root_id() == fileid and
 
634
            bzr_tree.path2id('') == fileid)
 
635
        if (bzr_tree.path2id('') == fileid and
636
636
                self.mapping.BZR_FILE_IDS_FILE is not None):
637
637
            if tree is None:
638
638
                tree = Tree()