← 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: Aaron Bentley
  • Date: 2007-03-09 21:46:40 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070309214640-nnxk7g37bygoz50c
Add (set|get)_public_branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
1
 
# Copyright (C) 2005, 2006, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Serializer factory for reading and writing bundles.
18
18
"""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    errors,
24
 
    ui,
25
 
    )
 
22
from bzrlib import errors
26
23
from bzrlib.bundle.serializer import (BundleSerializer,
27
 
                                      _get_bundle_header,
 
24
                                      BUNDLE_HEADER,
28
25
                                     )
29
26
from bzrlib.bundle.serializer import binary_diff
30
27
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo, BundleTree)
31
28
from bzrlib.diff import internal_diff
32
29
from bzrlib.osutils import pathjoin
 
30
from bzrlib.progress import DummyProgress
33
31
from bzrlib.revision import NULL_REVISION
 
32
from bzrlib.rio import RioWriter, read_stanzas
 
33
import bzrlib.ui
34
34
from bzrlib.testament import StrictTestament
35
35
from bzrlib.timestamp import (
36
36
    format_highres_date,
120
120
        source.lock_read()
121
121
        try:
122
122
            self._write_main_header()
123
 
            pb = ui.ui_factory.nested_progress_bar()
 
123
            pb = DummyProgress()
124
124
            try:
125
125
                self._write_revisions(pb)
126
126
            finally:
127
 
                pb.finished()
 
127
                pass
 
128
                #pb.finished()
128
129
        finally:
129
130
            source.unlock()
130
131
 
131
 
    def write_bundle(self, repository, target, base, fileobj):
132
 
        return self._write_bundle(repository, target, base, fileobj)
133
 
 
134
132
    def _write_main_header(self):
135
133
        """Write the header for the changes"""
136
134
        f = self.to_file
137
 
        f.write(_get_bundle_header('0.8'))
 
135
        f.write(BUNDLE_HEADER)
 
136
        f.write('0.8\n')
138
137
        f.write('#\n')
139
138
 
140
 
    def _write(self, key, value, indent=1, trailing_space_when_empty=False):
141
 
        """Write out meta information, with proper indenting, etc.
142
 
 
143
 
        :param trailing_space_when_empty: To work around a bug in earlier
144
 
            bundle readers, when writing an empty property, we use "prop: \n"
145
 
            rather than writing "prop:\n".
146
 
            If this parameter is True, and value is the empty string, we will
147
 
            write an extra space.
148
 
        """
149
 
        if indent < 1:
150
 
            raise ValueError('indentation must be greater than 0')
 
139
    def _write(self, key, value, indent=1):
 
140
        """Write out meta information, with proper indenting, etc"""
 
141
        assert indent > 0, 'indentation must be greater than 0'
151
142
        f = self.to_file
152
143
        f.write('#' + (' ' * indent))
153
144
        f.write(key.encode('utf-8'))
154
145
        if not value:
155
 
            if trailing_space_when_empty and value == '':
156
 
                f.write(': \n')
157
 
            else:
158
 
                f.write(':\n')
 
146
            f.write(':\n')
159
147
        elif isinstance(value, str):
160
148
            f.write(': ')
161
149
            f.write(value)
183
171
 
184
172
        i_max = len(self.revision_ids)
185
173
        for i, rev_id in enumerate(self.revision_ids):
186
 
            pb.update("Generating revision data", i, i_max)
 
174
            pb.update("Generating revsion data", i, i_max)
187
175
            rev = self.source.get_revision(rev_id)
188
176
            if rev_id == last_rev_id:
189
177
                rev_tree = last_rev_tree
206
194
            else:
207
195
                base_tree = self.source.revision_tree(base_id)
208
196
            force_binary = (i != 0)
209
 
            self._write_revision(rev, rev_tree, base_id, base_tree,
 
197
            self._write_revision(rev, rev_tree, base_id, base_tree, 
210
198
                                 explicit_base, force_binary)
211
199
 
212
200
            last_rev_id = base_id
213
201
            last_rev_tree = base_tree
214
202
 
215
203
    def _testament_sha1(self, revision_id):
216
 
        return StrictTestament.from_revision(self.source,
 
204
        return StrictTestament.from_revision(self.source, 
217
205
                                             revision_id).as_sha1()
218
206
 
219
 
    def _write_revision(self, rev, rev_tree, base_rev, base_tree,
 
207
    def _write_revision(self, rev, rev_tree, base_rev, base_tree, 
220
208
                        explicit_base, force_binary):
221
209
        """Write out the information for a revision."""
222
210
        def w(key, value):
238
226
            w('base id', base_rev)
239
227
        if rev.properties:
240
228
            self._write('properties', None, indent=1)
241
 
            for name, value in sorted(rev.properties.items()):
242
 
                self._write(name, value, indent=3,
243
 
                            trailing_space_when_empty=True)
244
 
 
 
229
            for name, value in rev.properties.items():
 
230
                self._write(name, value, indent=3)
 
231
        
245
232
        # Add an extra blank space at the end
246
233
        self.to_file.write('\n')
247
234
 
254
241
        self.to_file.write(' // '.join(p_texts).encode('utf-8'))
255
242
        self.to_file.write('\n')
256
243
 
257
 
    def _write_delta(self, new_tree, old_tree, default_revision_id,
 
244
    def _write_delta(self, new_tree, old_tree, default_revision_id, 
258
245
                     force_binary):
259
246
        """Write out the changes between the trees."""
260
247
        DEVNULL = '/dev/null'
277
264
                old_lines = tree_lines(old_tree, require_text=True)
278
265
                new_lines = tree_lines(new_tree, require_text=True)
279
266
                action.write(self.to_file)
280
 
                internal_diff(old_path, old_lines, new_path, new_lines,
 
267
                internal_diff(old_path, old_lines, new_path, new_lines, 
281
268
                              self.to_file)
282
269
            except errors.BinaryFile:
283
270
                old_lines = tree_lines(old_tree, require_text=False)
284
271
                new_lines = tree_lines(new_tree, require_text=False)
285
272
                action.add_property('encoding', 'base64')
286
273
                action.write(self.to_file)
287
 
                binary_diff(old_path, old_lines, new_path, new_lines,
 
274
                binary_diff(old_path, old_lines, new_path, new_lines, 
288
275
                            self.to_file)
289
276
 
290
277
        def finish_action(action, file_id, kind, meta_modified, text_modified,
308
295
 
309
296
        for path, file_id, kind in delta.added:
310
297
            action = Action('added', [kind, path], [('file-id', file_id)])
311
 
            meta_modified = (kind=='file' and
 
298
            meta_modified = (kind=='file' and 
312
299
                             new_tree.is_executable(file_id))
313
300
            finish_action(action, file_id, kind, meta_modified, True,
314
301
                          DEVNULL, path)
332
319
                continue
333
320
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
334
321
            if new_rev != old_rev:
335
 
                action = Action('modified', [ie.kind,
 
322
                action = Action('modified', [ie.kind, 
336
323
                                             new_tree.id2path(ie.file_id)])
337
324
                action.add_utf8_property('last-changed', ie.revision)
338
325
                action.write(self.to_file)
350
337
        object.__init__(self)
351
338
        self.from_file = iter(from_file)
352
339
        self._next_line = None
353
 
 
 
340
        
354
341
        self.info = self._get_info()
355
342
        # We put the actual inventory ids in the footer, so that the patch
356
343
        # is easier to read for humans.
461
448
        else:
462
449
            # What do we do with a key we don't recognize
463
450
            raise errors.MalformedHeader('Unknown Key: "%s"' % key)
464
 
 
 
451
    
465
452
    def _read_many(self, indent):
466
453
        """If a line ends with no entry, that means that it should be
467
454
        followed with multiple lines of values.
504
491
            elif line.startswith('... '):
505
492
                action += line[len('... '):-1].decode('utf-8')
506
493
 
507
 
            if (self._next_line is not None and
 
494
            if (self._next_line is not None and 
508
495
                self._next_line.startswith('===')):
509
496
                return action, lines, True
510
497
            elif self._next_line is None or self._next_line.startswith('#'):
516
503
                lines.append(line)
517
504
 
518
505
        return action, lines, False
519
 
 
 
506
            
520
507
    def _read_patches(self):
521
508
        do_continue = True
522
509
        revision_actions = []
524
511
            action, lines, do_continue = self._read_one_patch()
525
512
            if action is not None:
526
513
                revision_actions.append((action, lines))
527
 
        if self.info.revisions[-1].tree_actions is not None:
528
 
            raise AssertionError()
 
514
        assert self.info.revisions[-1].tree_actions is None
529
515
        self.info.revisions[-1].tree_actions = revision_actions
530
516
 
531
517
    def _read_footer(self):
543
529
                self._next().next()
544
530
                break
545
531
 
 
532
 
546
533
class BundleInfo08(BundleInfo):
547
534
 
548
535
    def _update_tree(self, bundle_tree, revision_id):