/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-07-26 00:52:04 UTC
  • mfrom: (7358.14.2 get-root-id)
  • Revision ID: breezy.the.bot@gmail.com-20190726005204-fapfcsnonmr0e3r3
Remove Tree.get_root_id() in favour of Tree.path2id('').

Merged from https://code.launchpad.net/~jelmer/brz/get-root-id/+merge/369477

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
518
518
            else:
519
519
                base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0])
520
520
                root_tree = self[self[base_sha1].tree]
521
 
            root_key_data = (tree.get_root_id(), tree.get_revision_id())
 
521
            root_key_data = (tree.path2id(''), tree.get_revision_id())
522
522
        if add_cache_entry is not None:
523
523
            add_cache_entry(root_tree, root_key_data, "")
524
524
        yield "", root_tree
614
614
            path,
615
615
            bzr_tree.iter_child_entries(path),
616
616
            get_ie_sha1, unusual_modes, self.mapping.BZR_DUMMY_FILE,
617
 
            bzr_tree.get_root_id() == fileid)
 
617
            bzr_tree.path2id('') == fileid)
618
618
        if tree is not None:
619
619
            _check_expected_sha(expected_sha, tree)
620
620
        return tree