/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-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

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,
27
 
                                      _get_bundle_header,
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 (
 
26
from breezy.bundle.serializer import (
 
27
    BundleSerializer,
 
28
    _get_bundle_header,
 
29
    )
 
30
from breezy.bundle.serializer import binary_diff
 
31
from breezy.bundle.bundle_data import (
 
32
    RevisionInfo,
 
33
    BundleInfo,
 
34
    )
 
35
from breezy.diff import internal_diff
 
36
from breezy.revision import NULL_REVISION
 
37
from breezy.sixish import text_type
 
38
from breezy.testament import StrictTestament
 
39
from breezy.timestamp import (
36
40
    format_highres_date,
37
 
    unpack_highres_date,
38
 
)
39
 
from bzrlib.textfile import text_file
40
 
from bzrlib.trace import mutter
 
41
    )
 
42
from breezy.textfile import text_file
 
43
from breezy.trace import mutter
41
44
 
42
45
bool_text = {True: 'yes', False: 'no'}
43
46
 
86
89
        while len(text_line) > available:
87
90
            to_file.write(text_line[:available])
88
91
            text_line = text_line[available:]
89
 
            to_file.write('\n... ')
90
 
            available = 79 - len('... ')
91
 
        to_file.write(text_line+'\n')
 
92
            to_file.write(b'\n... ')
 
93
            available = 79 - len(b'... ')
 
94
        to_file.write(text_line+b'\n')
92
95
 
93
96
 
94
97
class BundleSerializerV08(BundleSerializer):
 
98
 
95
99
    def read(self, f):
96
100
        """Read the rest of the bundles from the supplied file.
97
101
 
117
121
        self.forced_bases = forced_bases
118
122
        self.to_file = f
119
123
        self.check_compatible()
120
 
        source.lock_read()
121
 
        try:
 
124
        with source.lock_read():
122
125
            self._write_main_header()
123
 
            pb = ui.ui_factory.nested_progress_bar()
124
 
            try:
 
126
            with ui.ui_factory.nested_progress_bar() as pb:
125
127
                self._write_revisions(pb)
126
 
            finally:
127
 
                pb.finished()
128
 
        finally:
129
 
            source.unlock()
130
128
 
131
129
    def write_bundle(self, repository, target, base, fileobj):
132
130
        return self._write_bundle(repository, target, base, fileobj)
135
133
        """Write the header for the changes"""
136
134
        f = self.to_file
137
135
        f.write(_get_bundle_header('0.8'))
138
 
        f.write('#\n')
 
136
        f.write(b'#\n')
139
137
 
140
138
    def _write(self, key, value, indent=1, trailing_space_when_empty=False):
141
139
        """Write out meta information, with proper indenting, etc.
149
147
        if indent < 1:
150
148
            raise ValueError('indentation must be greater than 0')
151
149
        f = self.to_file
152
 
        f.write('#' + (' ' * indent))
 
150
        f.write(b'#' + (b' ' * indent))
153
151
        f.write(key.encode('utf-8'))
154
152
        if not value:
155
153
            if trailing_space_when_empty and value == '':
156
 
                f.write(': \n')
 
154
                f.write(b': \n')
157
155
            else:
158
 
                f.write(':\n')
159
 
        elif isinstance(value, str):
160
 
            f.write(': ')
 
156
                f.write(b':\n')
 
157
        elif isinstance(value, bytes):
 
158
            f.write(b': ')
161
159
            f.write(value)
162
 
            f.write('\n')
163
 
        elif isinstance(value, unicode):
164
 
            f.write(': ')
 
160
            f.write(b'\n')
 
161
        elif isinstance(value, text_type):
 
162
            f.write(b': ')
165
163
            f.write(value.encode('utf-8'))
166
 
            f.write('\n')
 
164
            f.write(b'\n')
167
165
        else:
168
 
            f.write(':\n')
 
166
            f.write(b':\n')
169
167
            for entry in value:
170
 
                f.write('#' + (' ' * (indent+2)))
171
 
                if isinstance(entry, str):
 
168
                f.write(b'#' + (b' ' * (indent+2)))
 
169
                if isinstance(entry, bytes):
172
170
                    f.write(entry)
173
171
                else:
174
172
                    f.write(entry.encode('utf-8'))
175
 
                f.write('\n')
 
173
                f.write(b'\n')
176
174
 
177
175
    def _write_revisions(self, pb):
178
176
        """Write the information for all of the revisions."""
225
223
        w('message', rev.message.split('\n'))
226
224
        w('committer', rev.committer)
227
225
        w('date', format_highres_date(rev.timestamp, rev.timezone))
228
 
        self.to_file.write('\n')
 
226
        self.to_file.write(b'\n')
229
227
 
230
228
        self._write_delta(rev_tree, base_tree, rev.revision_id, force_binary)
231
229
 
243
241
                            trailing_space_when_empty=True)
244
242
 
245
243
        # Add an extra blank space at the end
246
 
        self.to_file.write('\n')
 
244
        self.to_file.write(b'\n')
247
245
 
248
246
    def _write_action(self, name, parameters, properties=None):
249
247
        if properties is None:
262
260
        new_label = ''
263
261
 
264
262
        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)
 
263
            def tree_lines(tree, path, require_text=False):
 
264
                if tree.has_id(file_id):
 
265
                    tree_file = tree.get_file(path, file_id)
268
266
                    if require_text is True:
269
267
                        tree_file = text_file(tree_file)
270
268
                    return tree_file.readlines()
274
272
            try:
275
273
                if force_binary:
276
274
                    raise errors.BinaryFile()
277
 
                old_lines = tree_lines(old_tree, require_text=True)
278
 
                new_lines = tree_lines(new_tree, require_text=True)
 
275
                old_lines = tree_lines(old_tree, old_path, require_text=True)
 
276
                new_lines = tree_lines(new_tree, new_path, require_text=True)
279
277
                action.write(self.to_file)
280
278
                internal_diff(old_path, old_lines, new_path, new_lines,
281
279
                              self.to_file)
282
280
            except errors.BinaryFile:
283
 
                old_lines = tree_lines(old_tree, require_text=False)
284
 
                new_lines = tree_lines(new_tree, require_text=False)
 
281
                old_lines = tree_lines(old_tree, old_path, require_text=False)
 
282
                new_lines = tree_lines(new_tree, new_path, require_text=False)
285
283
                action.add_property('encoding', 'base64')
286
284
                action.write(self.to_file)
287
285
                binary_diff(old_path, old_lines, new_path, new_lines,
289
287
 
290
288
        def finish_action(action, file_id, kind, meta_modified, text_modified,
291
289
                          old_path, new_path):
292
 
            entry = new_tree.inventory[file_id]
 
290
            entry = new_tree.root_inventory.get_entry(file_id)
293
291
            if entry.revision != default_revision_id:
294
292
                action.add_utf8_property('last-changed', entry.revision)
295
293
            if meta_modified:
309
307
        for path, file_id, kind in delta.added:
310
308
            action = Action('added', [kind, path], [('file-id', file_id)])
311
309
            meta_modified = (kind=='file' and
312
 
                             new_tree.is_executable(file_id))
 
310
                             new_tree.is_executable(path, file_id))
313
311
            finish_action(action, file_id, kind, meta_modified, True,
314
312
                          DEVNULL, path)
315
313
 
326
324
                          path, path)
327
325
 
328
326
        for path, file_id, kind in delta.unchanged:
329
 
            ie = new_tree.inventory[file_id]
330
 
            new_rev = getattr(ie, 'revision', None)
 
327
            new_rev = new_tree.get_file_revision(path, file_id)
331
328
            if new_rev is None:
332
329
                continue
333
 
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
 
330
            old_rev = old_tree.get_file_revision(old_tree.id2path(file_id), file_id)
334
331
            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)
 
332
                action = Action('modified', [new_tree.kind(path, file_id),
 
333
                                             path])
 
334
                action.add_utf8_property('last-changed', new_rev)
338
335
                action.write(self.to_file)
339
336
 
340
337
 
363
360
        return BundleInfo08()
364
361
 
365
362
    def _read(self):
366
 
        self._next().next()
 
363
        next(self._next())
367
364
        while self._next_line is not None:
368
365
            if not self._read_revision_header():
369
366
                break
401
398
        for line in self._next():
402
399
            # The bzr header is terminated with a blank line
403
400
            # which does not start with '#'
404
 
            if line is None or line == '\n':
 
401
            if line is None or line == b'\n':
405
402
                break
406
 
            if not line.startswith('#'):
 
403
            if not line.startswith(b'#'):
407
404
                continue
408
405
            found_something = True
409
406
            self._handle_next(line)
415
412
    def _read_next_entry(self, line, indent=1):
416
413
        """Read in a key-value pair
417
414
        """
418
 
        if not line.startswith('#'):
 
415
        if not line.startswith(b'#'):
419
416
            raise errors.MalformedHeader('Bzr header did not start with #')
420
417
        line = line[1:-1].decode('utf-8') # Remove the '#' and '\n'
421
418
        if line[:indent] == ' '*indent:
470
467
        does not start properly indented.
471
468
        """
472
469
        values = []
473
 
        start = '#' + (' '*indent)
 
470
        start = b'#' + (b' '*indent)
474
471
 
475
 
        if self._next_line is None or self._next_line[:len(start)] != start:
 
472
        if self._next_line is None or not self._next_line.startswith(start):
476
473
            return values
477
474
 
478
475
        for line in self._next():
479
476
            values.append(line[len(start):-1].decode('utf-8'))
480
 
            if self._next_line is None or self._next_line[:len(start)] != start:
 
477
            if self._next_line is None or not self._next_line.startswith(start):
481
478
                break
482
479
        return values
483
480
 
489
486
        """
490
487
        #mutter('_read_one_patch: %r' % self._next_line)
491
488
        # Peek and see if there are no patches
492
 
        if self._next_line is None or self._next_line.startswith('#'):
 
489
        if self._next_line is None or self._next_line.startswith(b'#'):
493
490
            return None, [], False
494
491
 
495
492
        first = True
538
535
            self._handle_next(line)
539
536
            if self._next_line is None:
540
537
                break
541
 
            if not self._next_line.startswith('#'):
 
538
            if not self._next_line.startswith(b'#'):
542
539
                # Consume the trailing \n and stop processing
543
 
                self._next().next()
 
540
                next(self._next())
544
541
                break
545
542
 
546
543
class BundleInfo08(BundleInfo):
553
550
        testament = StrictTestament.from_revision(repository, revision_id)
554
551
        return testament.as_sha1()
555
552
 
556
 
    def _testament_sha1(self, revision, inventory):
557
 
        return StrictTestament(revision, inventory).as_sha1()
 
553
    def _testament_sha1(self, revision, tree):
 
554
        return StrictTestament(revision, tree).as_sha1()