/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-06 23:36:14 UTC
  • mto: (7027.3.2 python3-n)
  • mto: This revision was merged to the branch mainline in revision 7030.
  • Revision ID: jelmer@jelmer.uk-20180706233614-t4m8krag15t4z4lp
Update python3.passing.

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.sixish import text_type
 
34
from breezy.testament import StrictTestament
 
35
from breezy.timestamp import (
36
36
    format_highres_date,
37
 
    unpack_highres_date,
38
 
)
39
 
from bzrlib.textfile import text_file
40
 
from bzrlib.trace import mutter
 
37
    )
 
38
from breezy.textfile import text_file
 
39
from breezy.trace import mutter
41
40
 
42
41
bool_text = {True: 'yes', False: 'no'}
43
42
 
70
69
 
71
70
    def write(self, to_file):
72
71
        """Write action as to a file"""
73
 
        p_texts = [' '.join([self.name]+self.parameters)]
 
72
        p_texts = [b' '.join([self.name]+self.parameters)]
74
73
        for prop in self.properties:
75
74
            if len(prop) == 1:
76
75
                p_texts.append(prop[0])
77
76
            else:
78
77
                try:
79
 
                    p_texts.append('%s:%s' % prop)
 
78
                    p_texts.append(b'%s:%s' % prop)
80
79
                except:
81
80
                    raise repr(prop)
82
 
        text = ['=== ']
83
 
        text.append(' // '.join(p_texts))
 
81
        text = [b'=== ']
 
82
        text.append(b' // '.join(p_texts))
84
83
        text_line = ''.join(text).encode('utf-8')
85
84
        available = 79
86
85
        while len(text_line) > available:
87
86
            to_file.write(text_line[:available])
88
87
            text_line = text_line[available:]
89
 
            to_file.write('\n... ')
90
 
            available = 79 - len('... ')
91
 
        to_file.write(text_line+'\n')
 
88
            to_file.write(b'\n... ')
 
89
            available = 79 - len(b'... ')
 
90
        to_file.write(text_line+b'\n')
92
91
 
93
92
 
94
93
class BundleSerializerV08(BundleSerializer):
117
116
        self.forced_bases = forced_bases
118
117
        self.to_file = f
119
118
        self.check_compatible()
120
 
        source.lock_read()
121
 
        try:
 
119
        with source.lock_read():
122
120
            self._write_main_header()
123
 
            pb = ui.ui_factory.nested_progress_bar()
124
 
            try:
 
121
            with ui.ui_factory.nested_progress_bar() as pb:
125
122
                self._write_revisions(pb)
126
 
            finally:
127
 
                pb.finished()
128
 
        finally:
129
 
            source.unlock()
130
123
 
131
124
    def write_bundle(self, repository, target, base, fileobj):
132
125
        return self._write_bundle(repository, target, base, fileobj)
135
128
        """Write the header for the changes"""
136
129
        f = self.to_file
137
130
        f.write(_get_bundle_header('0.8'))
138
 
        f.write('#\n')
 
131
        f.write(b'#\n')
139
132
 
140
133
    def _write(self, key, value, indent=1, trailing_space_when_empty=False):
141
134
        """Write out meta information, with proper indenting, etc.
149
142
        if indent < 1:
150
143
            raise ValueError('indentation must be greater than 0')
151
144
        f = self.to_file
152
 
        f.write('#' + (' ' * indent))
 
145
        f.write(b'#' + (b' ' * indent))
153
146
        f.write(key.encode('utf-8'))
154
147
        if not value:
155
148
            if trailing_space_when_empty and value == '':
156
 
                f.write(': \n')
 
149
                f.write(b': \n')
157
150
            else:
158
 
                f.write(':\n')
159
 
        elif isinstance(value, str):
160
 
            f.write(': ')
 
151
                f.write(b':\n')
 
152
        elif isinstance(value, bytes):
 
153
            f.write(b': ')
161
154
            f.write(value)
162
 
            f.write('\n')
163
 
        elif isinstance(value, unicode):
164
 
            f.write(': ')
 
155
            f.write(b'\n')
 
156
        elif isinstance(value, text_type):
 
157
            f.write(b': ')
165
158
            f.write(value.encode('utf-8'))
166
 
            f.write('\n')
 
159
            f.write(b'\n')
167
160
        else:
168
 
            f.write(':\n')
 
161
            f.write(b':\n')
169
162
            for entry in value:
170
 
                f.write('#' + (' ' * (indent+2)))
171
 
                if isinstance(entry, str):
 
163
                f.write(b'#' + (b' ' * (indent+2)))
 
164
                if isinstance(entry, bytes):
172
165
                    f.write(entry)
173
166
                else:
174
167
                    f.write(entry.encode('utf-8'))
175
 
                f.write('\n')
 
168
                f.write(b'\n')
176
169
 
177
170
    def _write_revisions(self, pb):
178
171
        """Write the information for all of the revisions."""
225
218
        w('message', rev.message.split('\n'))
226
219
        w('committer', rev.committer)
227
220
        w('date', format_highres_date(rev.timestamp, rev.timezone))
228
 
        self.to_file.write('\n')
 
221
        self.to_file.write(b'\n')
229
222
 
230
223
        self._write_delta(rev_tree, base_tree, rev.revision_id, force_binary)
231
224
 
262
255
        new_label = ''
263
256
 
264
257
        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)
 
258
            def tree_lines(tree, path, require_text=False):
 
259
                if tree.has_id(file_id):
 
260
                    tree_file = tree.get_file(path, file_id)
268
261
                    if require_text is True:
269
262
                        tree_file = text_file(tree_file)
270
263
                    return tree_file.readlines()
274
267
            try:
275
268
                if force_binary:
276
269
                    raise errors.BinaryFile()
277
 
                old_lines = tree_lines(old_tree, require_text=True)
278
 
                new_lines = tree_lines(new_tree, require_text=True)
 
270
                old_lines = tree_lines(old_tree, old_path, require_text=True)
 
271
                new_lines = tree_lines(new_tree, new_path, require_text=True)
279
272
                action.write(self.to_file)
280
273
                internal_diff(old_path, old_lines, new_path, new_lines,
281
274
                              self.to_file)
282
275
            except errors.BinaryFile:
283
 
                old_lines = tree_lines(old_tree, require_text=False)
284
 
                new_lines = tree_lines(new_tree, require_text=False)
 
276
                old_lines = tree_lines(old_tree, old_path, require_text=False)
 
277
                new_lines = tree_lines(new_tree, new_path, require_text=False)
285
278
                action.add_property('encoding', 'base64')
286
279
                action.write(self.to_file)
287
280
                binary_diff(old_path, old_lines, new_path, new_lines,
289
282
 
290
283
        def finish_action(action, file_id, kind, meta_modified, text_modified,
291
284
                          old_path, new_path):
292
 
            entry = new_tree.inventory[file_id]
 
285
            entry = new_tree.root_inventory.get_entry(file_id)
293
286
            if entry.revision != default_revision_id:
294
287
                action.add_utf8_property('last-changed', entry.revision)
295
288
            if meta_modified:
309
302
        for path, file_id, kind in delta.added:
310
303
            action = Action('added', [kind, path], [('file-id', file_id)])
311
304
            meta_modified = (kind=='file' and
312
 
                             new_tree.is_executable(file_id))
 
305
                             new_tree.is_executable(path, file_id))
313
306
            finish_action(action, file_id, kind, meta_modified, True,
314
307
                          DEVNULL, path)
315
308
 
326
319
                          path, path)
327
320
 
328
321
        for path, file_id, kind in delta.unchanged:
329
 
            ie = new_tree.inventory[file_id]
330
 
            new_rev = getattr(ie, 'revision', None)
 
322
            new_rev = new_tree.get_file_revision(path, file_id)
331
323
            if new_rev is None:
332
324
                continue
333
 
            old_rev = getattr(old_tree.inventory[ie.file_id], 'revision', None)
 
325
            old_rev = old_tree.get_file_revision(old_tree.id2path(file_id), file_id)
334
326
            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)
 
327
                action = Action('modified', [new_tree.kind(path, file_id),
 
328
                                             path])
 
329
                action.add_utf8_property('last-changed', new_rev)
338
330
                action.write(self.to_file)
339
331
 
340
332
 
363
355
        return BundleInfo08()
364
356
 
365
357
    def _read(self):
366
 
        self._next().next()
 
358
        next(self._next())
367
359
        while self._next_line is not None:
368
360
            if not self._read_revision_header():
369
361
                break
540
532
                break
541
533
            if not self._next_line.startswith('#'):
542
534
                # Consume the trailing \n and stop processing
543
 
                self._next().next()
 
535
                next(self._next())
544
536
                break
545
537
 
546
538
class BundleInfo08(BundleInfo):
553
545
        testament = StrictTestament.from_revision(repository, revision_id)
554
546
        return testament.as_sha1()
555
547
 
556
 
    def _testament_sha1(self, revision, inventory):
557
 
        return StrictTestament(revision, inventory).as_sha1()
 
548
    def _testament_sha1(self, revision, tree):
 
549
        return StrictTestament(revision, tree).as_sha1()