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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 19:47:19 UTC
  • mfrom: (7178 work)
  • mto: This revision was merged to the branch mainline in revision 7179.
  • Revision ID: jelmer@jelmer.uk-20181116194719-m5ut2wfuze5x9s1p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/testament.py
120
120
        self.parent_ids = rev.parent_ids[:]
121
121
        if not isinstance(tree, Tree):
122
122
            raise TypeError("As of bzr 2.4 Testament.__init__() takes a "
123
 
                "Revision and a Tree.")
 
123
                            "Revision and a Tree.")
124
124
        self.tree = tree
125
125
        self.revprops = copy(rev.properties)
126
126
        if contains_whitespace(self.revision_id):
173
173
        if contains_whitespace(ie.file_id):
174
174
            raise ValueError(ie.file_id)
175
175
        content = ''
176
 
        content_spacer=  ''
 
176
        content_spacer = ''
177
177
        if ie.kind == 'file':
178
178
            # TODO: avoid switching on kind
179
179
            if not ie.text_sha1:
224
224
    long_header = 'bazaar-ng testament version 2.1\n'
225
225
    short_header = 'bazaar-ng testament short form 2.1\n'
226
226
    include_root = False
 
227
 
227
228
    def _entry_to_line(self, path, ie):
228
229
        l = Testament._entry_to_line(self, path, ie)[:-1]
229
230
        l += ' ' + ie.revision.decode('utf-8')