/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/revisiontree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/revisiontree.py
16
16
 
17
17
"""RevisionTree - a Tree implementation backed by repository data for a revision."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
 
19
from io import BytesIO
21
20
from . import (
22
 
    errors,
23
21
    lock,
24
22
    revision,
25
23
    tree,
26
24
    )
27
 
from .sixish import (
28
 
    BytesIO,
29
 
    )
30
25
 
31
26
 
32
27
class RevisionTree(tree.Tree):
46
41
 
47
42
    def supports_tree_reference(self):
48
43
        return getattr(self._repository._format, "supports_tree_reference",
49
 
            False)
 
44
                       False)
50
45
 
51
46
    def get_parent_ids(self):
52
47
        """See Tree.get_parent_ids.
64
59
        """Return the revision id associated with this tree."""
65
60
        return self._revision_id
66
61
 
67
 
    def get_file_revision(self, path, file_id=None):
 
62
    def get_file_revision(self, path):
68
63
        """Return the revision id in which a file was last changed."""
69
64
        raise NotImplementedError(self.get_file_revision)
70
65
 
71
 
    def get_file_text(self, path, file_id=None):
72
 
        if file_id is None:
73
 
            file_id = self.path2id(path)
74
 
        for (identifier, content) in self.iter_files_bytes([(file_id, None)]):
75
 
            ret = "".join(content)
 
66
    def get_file_text(self, path):
 
67
        for (identifier, content) in self.iter_files_bytes([(path, None)]):
 
68
            ret = b"".join(content)
76
69
        return ret
77
70
 
78
 
    def get_file(self, path, file_id=None):
79
 
        return BytesIO(self.get_file_text(path, file_id))
 
71
    def get_file(self, path):
 
72
        return BytesIO(self.get_file_text(path))
80
73
 
81
74
    def is_locked(self):
82
75
        return self._repository.is_locked()
96
89
        """See Tree._get_rules_searcher."""
97
90
        if self._rules_searcher is None:
98
91
            self._rules_searcher = super(RevisionTree,
99
 
                self)._get_rules_searcher(default_searcher)
 
92
                                         self)._get_rules_searcher(default_searcher)
100
93
        return self._rules_searcher