/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-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
44
44
from ..sixish import (
45
45
    viewitems,
46
46
    )
47
 
from ..testament import StrictTestament
 
47
from ..bzr.testament import StrictTestament
48
48
from ..trace import mutter, warning
49
49
from ..tree import Tree
50
50
from ..bzr.xml5 import serializer_v5
682
682
        old_path = self.old_path(path)
683
683
        return self.base_tree.get_file_revision(old_path)
684
684
 
685
 
    def get_size_and_sha1(self, new_path, file_id=None):
 
685
    def get_size_and_sha1(self, new_path):
686
686
        """Return the size and sha1 hash of the given file id.
687
687
        If the file was not locally modified, this is extracted
688
688
        from the base_tree. Rather than re-reading the file.
769
769
                return
770
770
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
771
771
        if inv.root is not None and not include_root and from_dir is None:
772
 
            # skip the root for compatability with the current apis.
 
772
            # skip the root for compatibility with the current apis.
773
773
            next(entries)
774
774
        for path, entry in entries:
775
 
            yield path, 'V', entry.kind, entry.file_id, entry
 
775
            yield path, 'V', entry.kind, entry
776
776
 
777
777
    def sorted_path_id(self):
778
778
        paths = []