← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v08.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
206
206
            else:
207
207
                base_tree = self.source.revision_tree(base_id)
208
208
            force_binary = (i != 0)
209
 
            self._write_revision(rev, rev_tree, base_id, base_tree, 
 
209
            self._write_revision(rev, rev_tree, base_id, base_tree,
210
210
                                 explicit_base, force_binary)
211
211
 
212
212
            last_rev_id = base_id
213
213
            last_rev_tree = base_tree
214
214
 
215
215
    def _testament_sha1(self, revision_id):
216
 
        return StrictTestament.from_revision(self.source, 
 
216
        return StrictTestament.from_revision(self.source,
217
217
                                             revision_id).as_sha1()
218
218
 
219
 
    def _write_revision(self, rev, rev_tree, base_rev, base_tree, 
 
219
    def _write_revision(self, rev, rev_tree, base_rev, base_tree,
220
220
                        explicit_base, force_binary):
221
221
        """Write out the information for a revision."""
222
222
        def w(key, value):
241
241
            for name, value in sorted(rev.properties.items()):
242
242
                self._write(name, value, indent=3,
243
243
                            trailing_space_when_empty=True)
244
 
        
 
244
 
245
245
        # Add an extra blank space at the end
246
246
        self.to_file.write('\n')
247
247
 
254
254
        self.to_file.write(' // '.join(p_texts).encode('utf-8'))
255
255
        self.to_file.write('\n')
256
256
 
257
 
    def _write_delta(self, new_tree, old_tree, default_revision_id, 
 
257
    def _write_delta(self, new_tree, old_tree, default_revision_id,
258
258
                     force_binary):
259
259
        """Write out the changes between the trees."""
260
260
        DEVNULL = '/dev/null'
277
277
                old_lines = tree_lines(old_tree, require_text=True)
278
278
                new_lines = tree_lines(new_tree, require_text=True)
279
279
                action.write(self.to_file)
280
 
                internal_diff(old_path, old_lines, new_path, new_lines, 
 
280
                internal_diff(old_path, old_lines, new_path, new_lines,
281
281
                              self.to_file)
282
282
            except errors.BinaryFile:
283
283
                old_lines = tree_lines(old_tree, require_text=False)
284
284
                new_lines = tree_lines(new_tree, require_text=False)
285
285
                action.add_property('encoding', 'base64')
286
286
                action.write(self.to_file)
287
 
                binary_diff(old_path, old_lines, new_path, new_lines, 
 
287
                binary_diff(old_path, old_lines, new_path, new_lines,
288
288
                            self.to_file)
289
289
 
290
290
        def finish_action(action, file_id, kind, meta_modified, text_modified,
308
308
 
309
309
        for path, file_id, kind in delta.added:
310
310
            action = Action('added', [kind, path], [('file-id', file_id)])
311
 
            meta_modified = (kind=='file' and 
 
311
            meta_modified = (kind=='file' and
312
312
                             new_tree.is_executable(file_id))
313
313
            finish_action(action, file_id, kind, meta_modified, True,
314
314
                          DEVNULL, path)
332
332
                continue
333
333
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
334
334
            if new_rev != old_rev:
335
 
                action = Action('modified', [ie.kind, 
 
335
                action = Action('modified', [ie.kind,
336
336
                                             new_tree.id2path(ie.file_id)])
337
337
                action.add_utf8_property('last-changed', ie.revision)
338
338
                action.write(self.to_file)
350
350
        object.__init__(self)
351
351
        self.from_file = iter(from_file)
352
352
        self._next_line = None
353
 
        
 
353
 
354
354
        self.info = self._get_info()
355
355
        # We put the actual inventory ids in the footer, so that the patch
356
356
        # is easier to read for humans.
461
461
        else:
462
462
            # What do we do with a key we don't recognize
463
463
            raise errors.MalformedHeader('Unknown Key: "%s"' % key)
464
 
    
 
464
 
465
465
    def _read_many(self, indent):
466
466
        """If a line ends with no entry, that means that it should be
467
467
        followed with multiple lines of values.
504
504
            elif line.startswith('... '):
505
505
                action += line[len('... '):-1].decode('utf-8')
506
506
 
507
 
            if (self._next_line is not None and 
 
507
            if (self._next_line is not None and
508
508
                self._next_line.startswith('===')):
509
509
                return action, lines, True
510
510
            elif self._next_line is None or self._next_line.startswith('#'):
516
516
                lines.append(line)
517
517
 
518
518
        return action, lines, False
519
 
            
 
519
 
520
520
    def _read_patches(self):
521
521
        do_continue = True
522
522
        revision_actions = []