/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 bzrlib/bundle/serializer/v08.py

Merge from bzr.dev, resolving conflicts.

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
import bzrlib.ui
34
33
from bzrlib.testament import StrictTestament
35
34
from bzrlib.timestamp import (
36
35
    format_highres_date,
120
119
        source.lock_read()
121
120
        try:
122
121
            self._write_main_header()
123
 
            pb = ui.ui_factory.nested_progress_bar()
 
122
            pb = DummyProgress()
124
123
            try:
125
124
                self._write_revisions(pb)
126
125
            finally:
127
 
                pb.finished()
 
126
                pass
 
127
                #pb.finished()
128
128
        finally:
129
129
            source.unlock()
130
130
 
131
 
    def write_bundle(self, repository, target, base, fileobj):
132
 
        return self._write_bundle(repository, target, base, fileobj)
133
 
 
134
131
    def _write_main_header(self):
135
132
        """Write the header for the changes"""
136
133
        f = self.to_file
137
 
        f.write(_get_bundle_header('0.8'))
 
134
        f.write(BUNDLE_HEADER)
 
135
        f.write('0.8\n')
138
136
        f.write('#\n')
139
137
 
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')
 
138
    def _write(self, key, value, indent=1):
 
139
        """Write out meta information, with proper indenting, etc"""
 
140
        assert indent > 0, 'indentation must be greater than 0'
151
141
        f = self.to_file
152
142
        f.write('#' + (' ' * indent))
153
143
        f.write(key.encode('utf-8'))
154
144
        if not value:
155
 
            if trailing_space_when_empty and value == '':
156
 
                f.write(': \n')
157
 
            else:
158
 
                f.write(':\n')
 
145
            f.write(':\n')
159
146
        elif isinstance(value, str):
160
147
            f.write(': ')
161
148
            f.write(value)
183
170
 
184
171
        i_max = len(self.revision_ids)
185
172
        for i, rev_id in enumerate(self.revision_ids):
186
 
            pb.update("Generating revision data", i, i_max)
 
173
            pb.update("Generating revsion data", i, i_max)
187
174
            rev = self.source.get_revision(rev_id)
188
175
            if rev_id == last_rev_id:
189
176
                rev_tree = last_rev_tree
206
193
            else:
207
194
                base_tree = self.source.revision_tree(base_id)
208
195
            force_binary = (i != 0)
209
 
            self._write_revision(rev, rev_tree, base_id, base_tree,
 
196
            self._write_revision(rev, rev_tree, base_id, base_tree, 
210
197
                                 explicit_base, force_binary)
211
198
 
212
199
            last_rev_id = base_id
213
200
            last_rev_tree = base_tree
214
201
 
215
202
    def _testament_sha1(self, revision_id):
216
 
        return StrictTestament.from_revision(self.source,
 
203
        return StrictTestament.from_revision(self.source, 
217
204
                                             revision_id).as_sha1()
218
205
 
219
 
    def _write_revision(self, rev, rev_tree, base_rev, base_tree,
 
206
    def _write_revision(self, rev, rev_tree, base_rev, base_tree, 
220
207
                        explicit_base, force_binary):
221
208
        """Write out the information for a revision."""
222
209
        def w(key, value):
238
225
            w('base id', base_rev)
239
226
        if rev.properties:
240
227
            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
 
 
 
228
            for name, value in rev.properties.items():
 
229
                self._write(name, value, indent=3)
 
230
        
245
231
        # Add an extra blank space at the end
246
232
        self.to_file.write('\n')
247
233
 
254
240
        self.to_file.write(' // '.join(p_texts).encode('utf-8'))
255
241
        self.to_file.write('\n')
256
242
 
257
 
    def _write_delta(self, new_tree, old_tree, default_revision_id,
 
243
    def _write_delta(self, new_tree, old_tree, default_revision_id, 
258
244
                     force_binary):
259
245
        """Write out the changes between the trees."""
260
246
        DEVNULL = '/dev/null'
277
263
                old_lines = tree_lines(old_tree, require_text=True)
278
264
                new_lines = tree_lines(new_tree, require_text=True)
279
265
                action.write(self.to_file)
280
 
                internal_diff(old_path, old_lines, new_path, new_lines,
 
266
                internal_diff(old_path, old_lines, new_path, new_lines, 
281
267
                              self.to_file)
282
268
            except errors.BinaryFile:
283
269
                old_lines = tree_lines(old_tree, require_text=False)
284
270
                new_lines = tree_lines(new_tree, require_text=False)
285
271
                action.add_property('encoding', 'base64')
286
272
                action.write(self.to_file)
287
 
                binary_diff(old_path, old_lines, new_path, new_lines,
 
273
                binary_diff(old_path, old_lines, new_path, new_lines, 
288
274
                            self.to_file)
289
275
 
290
276
        def finish_action(action, file_id, kind, meta_modified, text_modified,
308
294
 
309
295
        for path, file_id, kind in delta.added:
310
296
            action = Action('added', [kind, path], [('file-id', file_id)])
311
 
            meta_modified = (kind=='file' and
 
297
            meta_modified = (kind=='file' and 
312
298
                             new_tree.is_executable(file_id))
313
299
            finish_action(action, file_id, kind, meta_modified, True,
314
300
                          DEVNULL, path)
332
318
                continue
333
319
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
334
320
            if new_rev != old_rev:
335
 
                action = Action('modified', [ie.kind,
 
321
                action = Action('modified', [ie.kind, 
336
322
                                             new_tree.id2path(ie.file_id)])
337
323
                action.add_utf8_property('last-changed', ie.revision)
338
324
                action.write(self.to_file)
350
336
        object.__init__(self)
351
337
        self.from_file = iter(from_file)
352
338
        self._next_line = None
353
 
 
 
339
        
354
340
        self.info = self._get_info()
355
341
        # We put the actual inventory ids in the footer, so that the patch
356
342
        # is easier to read for humans.
461
447
        else:
462
448
            # What do we do with a key we don't recognize
463
449
            raise errors.MalformedHeader('Unknown Key: "%s"' % key)
464
 
 
 
450
    
465
451
    def _read_many(self, indent):
466
452
        """If a line ends with no entry, that means that it should be
467
453
        followed with multiple lines of values.
504
490
            elif line.startswith('... '):
505
491
                action += line[len('... '):-1].decode('utf-8')
506
492
 
507
 
            if (self._next_line is not None and
 
493
            if (self._next_line is not None and 
508
494
                self._next_line.startswith('===')):
509
495
                return action, lines, True
510
496
            elif self._next_line is None or self._next_line.startswith('#'):
516
502
                lines.append(line)
517
503
 
518
504
        return action, lines, False
519
 
 
 
505
            
520
506
    def _read_patches(self):
521
507
        do_continue = True
522
508
        revision_actions = []
524
510
            action, lines, do_continue = self._read_one_patch()
525
511
            if action is not None:
526
512
                revision_actions.append((action, lines))
527
 
        if self.info.revisions[-1].tree_actions is not None:
528
 
            raise AssertionError()
 
513
        assert self.info.revisions[-1].tree_actions is None
529
514
        self.info.revisions[-1].tree_actions = revision_actions
530
515
 
531
516
    def _read_footer(self):