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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-09 23:53:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180509235311-k1zk8mwcb09b8vm0
Update TODO.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/v08.py
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 (
 
22
from breezy import (
23
23
    errors,
24
24
    ui,
25
25
    )
26
 
from bzrlib.bundle.serializer import (BundleSerializer,
 
26
from breezy.bundle.serializer import (BundleSerializer,
27
27
                                      _get_bundle_header,
28
28
                                     )
29
 
from bzrlib.bundle.serializer import binary_diff
30
 
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo, BundleTree)
31
 
from bzrlib.diff import internal_diff
32
 
from bzrlib.osutils import pathjoin
33
 
from bzrlib.revision import NULL_REVISION
34
 
from bzrlib.testament import StrictTestament
35
 
from bzrlib.timestamp import (
 
29
from breezy.bundle.serializer import binary_diff
 
30
from breezy.bundle.bundle_data import (RevisionInfo, BundleInfo)
 
31
from breezy.diff import internal_diff
 
32
from breezy.revision import NULL_REVISION
 
33
from breezy.testament import StrictTestament
 
34
from breezy.timestamp import (
36
35
    format_highres_date,
37
 
    unpack_highres_date,
38
 
)
39
 
from bzrlib.textfile import text_file
40
 
from bzrlib.trace import mutter
 
36
    )
 
37
from breezy.textfile import text_file
 
38
from breezy.trace import mutter
41
39
 
42
40
bool_text = {True: 'yes', False: 'no'}
43
41
 
117
115
        self.forced_bases = forced_bases
118
116
        self.to_file = f
119
117
        self.check_compatible()
120
 
        source.lock_read()
121
 
        try:
 
118
        with source.lock_read():
122
119
            self._write_main_header()
123
 
            pb = ui.ui_factory.nested_progress_bar()
124
 
            try:
 
120
            with ui.ui_factory.nested_progress_bar() as pb:
125
121
                self._write_revisions(pb)
126
 
            finally:
127
 
                pb.finished()
128
 
        finally:
129
 
            source.unlock()
130
122
 
131
123
    def write_bundle(self, repository, target, base, fileobj):
132
124
        return self._write_bundle(repository, target, base, fileobj)
262
254
        new_label = ''
263
255
 
264
256
        def do_diff(file_id, old_path, new_path, action, force_binary):
265
 
            def tree_lines(tree, require_text=False):
266
 
                if file_id in tree:
267
 
                    tree_file = tree.get_file(file_id)
 
257
            def tree_lines(tree, path, require_text=False):
 
258
                if tree.has_id(file_id):
 
259
                    tree_file = tree.get_file(path, file_id)
268
260
                    if require_text is True:
269
261
                        tree_file = text_file(tree_file)
270
262
                    return tree_file.readlines()
274
266
            try:
275
267
                if force_binary:
276
268
                    raise errors.BinaryFile()
277
 
                old_lines = tree_lines(old_tree, require_text=True)
278
 
                new_lines = tree_lines(new_tree, require_text=True)
 
269
                old_lines = tree_lines(old_tree, old_path, require_text=True)
 
270
                new_lines = tree_lines(new_tree, new_path, require_text=True)
279
271
                action.write(self.to_file)
280
272
                internal_diff(old_path, old_lines, new_path, new_lines,
281
273
                              self.to_file)
282
274
            except errors.BinaryFile:
283
 
                old_lines = tree_lines(old_tree, require_text=False)
284
 
                new_lines = tree_lines(new_tree, require_text=False)
 
275
                old_lines = tree_lines(old_tree, old_path, require_text=False)
 
276
                new_lines = tree_lines(new_tree, new_path, require_text=False)
285
277
                action.add_property('encoding', 'base64')
286
278
                action.write(self.to_file)
287
279
                binary_diff(old_path, old_lines, new_path, new_lines,
289
281
 
290
282
        def finish_action(action, file_id, kind, meta_modified, text_modified,
291
283
                          old_path, new_path):
292
 
            entry = new_tree.inventory[file_id]
 
284
            entry = new_tree.root_inventory.get_entry(file_id)
293
285
            if entry.revision != default_revision_id:
294
286
                action.add_utf8_property('last-changed', entry.revision)
295
287
            if meta_modified:
309
301
        for path, file_id, kind in delta.added:
310
302
            action = Action('added', [kind, path], [('file-id', file_id)])
311
303
            meta_modified = (kind=='file' and
312
 
                             new_tree.is_executable(file_id))
 
304
                             new_tree.is_executable(path, file_id))
313
305
            finish_action(action, file_id, kind, meta_modified, True,
314
306
                          DEVNULL, path)
315
307
 
326
318
                          path, path)
327
319
 
328
320
        for path, file_id, kind in delta.unchanged:
329
 
            ie = new_tree.inventory[file_id]
330
 
            new_rev = getattr(ie, 'revision', None)
 
321
            new_rev = new_tree.get_file_revision(path, file_id)
331
322
            if new_rev is None:
332
323
                continue
333
 
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
 
324
            old_rev = old_tree.get_file_revision(old_tree.id2path(file_id), file_id)
334
325
            if new_rev != old_rev:
335
 
                action = Action('modified', [ie.kind,
336
 
                                             new_tree.id2path(ie.file_id)])
337
 
                action.add_utf8_property('last-changed', ie.revision)
 
326
                action = Action('modified', [new_tree.kind(path, file_id),
 
327
                                             path])
 
328
                action.add_utf8_property('last-changed', new_rev)
338
329
                action.write(self.to_file)
339
330
 
340
331
 
363
354
        return BundleInfo08()
364
355
 
365
356
    def _read(self):
366
 
        self._next().next()
 
357
        next(self._next())
367
358
        while self._next_line is not None:
368
359
            if not self._read_revision_header():
369
360
                break
540
531
                break
541
532
            if not self._next_line.startswith('#'):
542
533
                # Consume the trailing \n and stop processing
543
 
                self._next().next()
 
534
                next(self._next())
544
535
                break
545
536
 
546
537
class BundleInfo08(BundleInfo):
553
544
        testament = StrictTestament.from_revision(repository, revision_id)
554
545
        return testament.as_sha1()
555
546
 
556
 
    def _testament_sha1(self, revision, inventory):
557
 
        return StrictTestament(revision, inventory).as_sha1()
 
547
    def _testament_sha1(self, revision, tree):
 
548
        return StrictTestament(revision, tree).as_sha1()