/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/v09.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-04 12:50:55 UTC
  • mfrom: (7027.2.8 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180704125055-8nni25pn2439p48v
Fix eol handling in knits on Python 3, port fastimport plugin to Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/fastimport-fixes/+merge/348924

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/v09.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from bzrlib.bundle.serializer import _get_bundle_header
18
 
from bzrlib.bundle.serializer.v08 import BundleSerializerV08, BundleReader
19
 
from bzrlib.testament import StrictTestament3
20
 
from bzrlib.bundle.bundle_data import BundleInfo
 
17
from __future__ import absolute_import
 
18
 
 
19
from breezy.bundle.serializer import _get_bundle_header
 
20
from breezy.bundle.serializer.v08 import BundleSerializerV08, BundleReader
 
21
from breezy.testament import StrictTestament3
 
22
from breezy.bundle.bundle_data import BundleInfo
21
23
 
22
24
 
23
25
"""Serializer for bundle format 0.9"""
38
40
    def _write_main_header(self):
39
41
        """Write the header for the changes"""
40
42
        f = self.to_file
41
 
        f.write(_get_bundle_header('0.9') + '#\n')
 
43
        f.write(_get_bundle_header('0.9') + b'#\n')
42
44
 
43
45
    def _testament_sha1(self, revision_id):
44
46
        return StrictTestament3.from_revision(self.source,
63
65
        testament = StrictTestament3.from_revision(repository, revision_id)
64
66
        return testament.as_sha1()
65
67
 
66
 
    def _testament_sha1(self, revision, inventory):
67
 
        return StrictTestament3(revision, inventory).as_sha1()
 
68
    def _testament_sha1(self, revision, tree):
 
69
        return StrictTestament3(revision, tree).as_sha1()
68
70
 
69
71
 
70
72
class BundleReaderV09(BundleReader):