← 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: Jelmer Vernooij
  • Date: 2012-06-18 11:43:07 UTC
  • mfrom: (6437.54.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6525.
  • Revision ID: jelmer@samba.org-20120618114307-zeazlym311p38m98
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2009 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Serializer factory for reading and writing bundles.
18
18
"""
19
19
 
20
 
import os
 
20
from __future__ import absolute_import
21
21
 
22
 
from bzrlib import errors
 
22
from bzrlib import (
 
23
    errors,
 
24
    ui,
 
25
    )
23
26
from bzrlib.bundle.serializer import (BundleSerializer,
24
 
                                      BUNDLE_HEADER,
 
27
                                      _get_bundle_header,
25
28
                                     )
26
29
from bzrlib.bundle.serializer import binary_diff
27
 
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo, BundleTree)
 
30
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo)
28
31
from bzrlib.diff import internal_diff
29
 
from bzrlib.osutils import pathjoin
30
 
from bzrlib.progress import DummyProgress
31
32
from bzrlib.revision import NULL_REVISION
32
 
import bzrlib.ui
33
33
from bzrlib.testament import StrictTestament
34
34
from bzrlib.timestamp import (
35
35
    format_highres_date,
36
 
    unpack_highres_date,
37
 
)
 
36
    )
38
37
from bzrlib.textfile import text_file
39
38
from bzrlib.trace import mutter
40
39
 
119
118
        source.lock_read()
120
119
        try:
121
120
            self._write_main_header()
122
 
            pb = DummyProgress()
 
121
            pb = ui.ui_factory.nested_progress_bar()
123
122
            try:
124
123
                self._write_revisions(pb)
125
124
            finally:
126
 
                pass
127
 
                #pb.finished()
 
125
                pb.finished()
128
126
        finally:
129
127
            source.unlock()
130
128
 
 
129
    def write_bundle(self, repository, target, base, fileobj):
 
130
        return self._write_bundle(repository, target, base, fileobj)
 
131
 
131
132
    def _write_main_header(self):
132
133
        """Write the header for the changes"""
133
134
        f = self.to_file
134
 
        f.write(BUNDLE_HEADER)
135
 
        f.write('0.8\n')
 
135
        f.write(_get_bundle_header('0.8'))
136
136
        f.write('#\n')
137
137
 
138
138
    def _write(self, key, value, indent=1, trailing_space_when_empty=False):
144
144
            If this parameter is True, and value is the empty string, we will
145
145
            write an extra space.
146
146
        """
147
 
        assert indent > 0, 'indentation must be greater than 0'
 
147
        if indent < 1:
 
148
            raise ValueError('indentation must be greater than 0')
148
149
        f = self.to_file
149
150
        f.write('#' + (' ' * indent))
150
151
        f.write(key.encode('utf-8'))
180
181
 
181
182
        i_max = len(self.revision_ids)
182
183
        for i, rev_id in enumerate(self.revision_ids):
183
 
            pb.update("Generating revsion data", i, i_max)
 
184
            pb.update("Generating revision data", i, i_max)
184
185
            rev = self.source.get_revision(rev_id)
185
186
            if rev_id == last_rev_id:
186
187
                rev_tree = last_rev_tree
203
204
            else:
204
205
                base_tree = self.source.revision_tree(base_id)
205
206
            force_binary = (i != 0)
206
 
            self._write_revision(rev, rev_tree, base_id, base_tree, 
 
207
            self._write_revision(rev, rev_tree, base_id, base_tree,
207
208
                                 explicit_base, force_binary)
208
209
 
209
210
            last_rev_id = base_id
210
211
            last_rev_tree = base_tree
211
212
 
212
213
    def _testament_sha1(self, revision_id):
213
 
        return StrictTestament.from_revision(self.source, 
 
214
        return StrictTestament.from_revision(self.source,
214
215
                                             revision_id).as_sha1()
215
216
 
216
 
    def _write_revision(self, rev, rev_tree, base_rev, base_tree, 
 
217
    def _write_revision(self, rev, rev_tree, base_rev, base_tree,
217
218
                        explicit_base, force_binary):
218
219
        """Write out the information for a revision."""
219
220
        def w(key, value):
238
239
            for name, value in sorted(rev.properties.items()):
239
240
                self._write(name, value, indent=3,
240
241
                            trailing_space_when_empty=True)
241
 
        
 
242
 
242
243
        # Add an extra blank space at the end
243
244
        self.to_file.write('\n')
244
245
 
251
252
        self.to_file.write(' // '.join(p_texts).encode('utf-8'))
252
253
        self.to_file.write('\n')
253
254
 
254
 
    def _write_delta(self, new_tree, old_tree, default_revision_id, 
 
255
    def _write_delta(self, new_tree, old_tree, default_revision_id,
255
256
                     force_binary):
256
257
        """Write out the changes between the trees."""
257
258
        DEVNULL = '/dev/null'
260
261
 
261
262
        def do_diff(file_id, old_path, new_path, action, force_binary):
262
263
            def tree_lines(tree, require_text=False):
263
 
                if file_id in tree:
 
264
                if tree.has_id(file_id):
264
265
                    tree_file = tree.get_file(file_id)
265
266
                    if require_text is True:
266
267
                        tree_file = text_file(tree_file)
274
275
                old_lines = tree_lines(old_tree, require_text=True)
275
276
                new_lines = tree_lines(new_tree, require_text=True)
276
277
                action.write(self.to_file)
277
 
                internal_diff(old_path, old_lines, new_path, new_lines, 
 
278
                internal_diff(old_path, old_lines, new_path, new_lines,
278
279
                              self.to_file)
279
280
            except errors.BinaryFile:
280
281
                old_lines = tree_lines(old_tree, require_text=False)
281
282
                new_lines = tree_lines(new_tree, require_text=False)
282
283
                action.add_property('encoding', 'base64')
283
284
                action.write(self.to_file)
284
 
                binary_diff(old_path, old_lines, new_path, new_lines, 
 
285
                binary_diff(old_path, old_lines, new_path, new_lines,
285
286
                            self.to_file)
286
287
 
287
288
        def finish_action(action, file_id, kind, meta_modified, text_modified,
288
289
                          old_path, new_path):
289
 
            entry = new_tree.inventory[file_id]
 
290
            entry = new_tree.root_inventory[file_id]
290
291
            if entry.revision != default_revision_id:
291
292
                action.add_utf8_property('last-changed', entry.revision)
292
293
            if meta_modified:
305
306
 
306
307
        for path, file_id, kind in delta.added:
307
308
            action = Action('added', [kind, path], [('file-id', file_id)])
308
 
            meta_modified = (kind=='file' and 
 
309
            meta_modified = (kind=='file' and
309
310
                             new_tree.is_executable(file_id))
310
311
            finish_action(action, file_id, kind, meta_modified, True,
311
312
                          DEVNULL, path)
323
324
                          path, path)
324
325
 
325
326
        for path, file_id, kind in delta.unchanged:
326
 
            ie = new_tree.inventory[file_id]
327
 
            new_rev = getattr(ie, 'revision', None)
 
327
            new_rev = new_tree.get_file_revision(file_id)
328
328
            if new_rev is None:
329
329
                continue
330
 
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
 
330
            old_rev = old_tree.get_file_revision(file_id)
331
331
            if new_rev != old_rev:
332
 
                action = Action('modified', [ie.kind, 
333
 
                                             new_tree.id2path(ie.file_id)])
334
 
                action.add_utf8_property('last-changed', ie.revision)
 
332
                action = Action('modified', [new_tree.kind(file_id),
 
333
                                             new_tree.id2path(file_id)])
 
334
                action.add_utf8_property('last-changed', new_rev)
335
335
                action.write(self.to_file)
336
336
 
337
337
 
347
347
        object.__init__(self)
348
348
        self.from_file = iter(from_file)
349
349
        self._next_line = None
350
 
        
 
350
 
351
351
        self.info = self._get_info()
352
352
        # We put the actual inventory ids in the footer, so that the patch
353
353
        # is easier to read for humans.
458
458
        else:
459
459
            # What do we do with a key we don't recognize
460
460
            raise errors.MalformedHeader('Unknown Key: "%s"' % key)
461
 
    
 
461
 
462
462
    def _read_many(self, indent):
463
463
        """If a line ends with no entry, that means that it should be
464
464
        followed with multiple lines of values.
501
501
            elif line.startswith('... '):
502
502
                action += line[len('... '):-1].decode('utf-8')
503
503
 
504
 
            if (self._next_line is not None and 
 
504
            if (self._next_line is not None and
505
505
                self._next_line.startswith('===')):
506
506
                return action, lines, True
507
507
            elif self._next_line is None or self._next_line.startswith('#'):
513
513
                lines.append(line)
514
514
 
515
515
        return action, lines, False
516
 
            
 
516
 
517
517
    def _read_patches(self):
518
518
        do_continue = True
519
519
        revision_actions = []
521
521
            action, lines, do_continue = self._read_one_patch()
522
522
            if action is not None:
523
523
                revision_actions.append((action, lines))
524
 
        assert self.info.revisions[-1].tree_actions is None
 
524
        if self.info.revisions[-1].tree_actions is not None:
 
525
            raise AssertionError()
525
526
        self.info.revisions[-1].tree_actions = revision_actions
526
527
 
527
528
    def _read_footer(self):
549
550
        testament = StrictTestament.from_revision(repository, revision_id)
550
551
        return testament.as_sha1()
551
552
 
552
 
    def _testament_sha1(self, revision, inventory):
553
 
        return StrictTestament(revision, inventory).as_sha1()
 
553
    def _testament_sha1(self, revision, tree):
 
554
        return StrictTestament(revision, tree).as_sha1()