/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/bundle/bundle_data.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:
579
579
            return None
580
580
        return new_path
581
581
 
582
 
    def get_root_id(self):
583
 
        return self.path2id('')
584
 
 
585
582
    def path2id(self, path):
586
583
        """Return the id of the file present at path in the target tree."""
587
584
        file_id = self._new_id.get(path)
629
626
        file_id = self.path2id(path)
630
627
        base_id = self.old_contents_id(file_id)
631
628
        if (base_id is not None and
632
 
                base_id != self.base_tree.get_root_id()):
 
629
                base_id != self.base_tree.path2id('')):
633
630
            old_path = self.base_tree.id2path(base_id)
634
631
            patch_original = self.base_tree.get_file(old_path)
635
632
        else: