~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v09.py

  • Committer: Aaron Bentley
  • Date: 2006-09-26 13:28:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: abentley@panoramicfeedback.com-20060926132839-cee32159ab268eeb
Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# (C) 2006 Canonical Development Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
1
17
from bzrlib.bundle.serializer import BUNDLE_HEADER
2
18
from bzrlib.bundle.serializer.v08 import BundleSerializerV08, BundleReader
3
 
from bzrlib.testament import StrictTestament2
 
19
from bzrlib.testament import StrictTestament3
4
20
from bzrlib.bundle.bundle_data import BundleInfo
5
21
 
6
22
 
 
23
"""Serializer for bundle format 0.9"""
 
24
 
 
25
 
7
26
class BundleSerializerV09(BundleSerializerV08):
8
27
    """Serializer for bzr bundle format 0.9
9
28
    
19
38
    def _write_main_header(self):
20
39
        """Write the header for the changes"""
21
40
        f = self.to_file
22
 
        f.write(BUNDLE_HEADER)
23
 
        f.write('0.9\n')
24
 
        f.write('#\n')
 
41
        f.write(BUNDLE_HEADER + '0.9\n#\n')
25
42
 
26
43
    def _testament_sha1(self, revision_id):
27
 
        return StrictTestament2.from_revision(self.source, 
 
44
        return StrictTestament3.from_revision(self.source, 
28
45
                                              revision_id).as_sha1()
29
46
 
30
47
    def read(self, f):
37
54
 
38
55
 
39
56
class BundleInfo09(BundleInfo):
40
 
    """BundleInfo that uses StrictTestament2
 
57
    """BundleInfo that uses StrictTestament3
41
58
    
42
59
    This means that the root data is included in the testament.
43
60
    """
44
61
 
45
62
    def _testament_sha1_from_revision(self, repository, revision_id):
46
 
        testament = StrictTestament2.from_revision(repository, revision_id)
 
63
        testament = StrictTestament3.from_revision(repository, revision_id)
47
64
        return testament.as_sha1()
48
65
 
49
66
    def _testament_sha1(self, revision, inventory):
50
 
        return StrictTestament2(revision, inventory).as_sha1()
 
67
        return StrictTestament3(revision, inventory).as_sha1()
51
68
 
52
69
 
53
70
class BundleReaderV09(BundleReader):