/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/weave_fmt/repository.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
    )
62
62
from ...sixish import (
63
63
    BytesIO,
 
64
    text_type,
64
65
    )
65
66
from .store.text import TextStore
66
67
from ...bzr.versionedfile import (
88
89
        return xml5.serializer_v5
89
90
 
90
91
    def _escape(self, file_or_path):
91
 
        if not isinstance(file_or_path, basestring):
 
92
        if not isinstance(file_or_path, (str, text_type)):
92
93
            file_or_path = '/'.join(file_or_path)
93
94
        if file_or_path == '':
94
95
            return u''
165
166
        self.start_write_group()
166
167
        return result
167
168
 
168
 
    @needs_read_lock
169
 
    def get_revisions(self, revision_ids):
170
 
        revs = self._get_revisions(revision_ids)
171
 
        return revs
172
 
 
173
169
    def _inventory_add_lines(self, revision_id, parents, lines,
174
170
        check_content=True):
175
171
        """Store lines in inv_vf and return the sha1 of the inventory."""