← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v09.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
 
17
 
from bzrlib.bundle.serializer import BUNDLE_HEADER
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from __future__ import absolute_import
 
18
 
 
19
from bzrlib.bundle.serializer import _get_bundle_header
18
20
from bzrlib.bundle.serializer.v08 import BundleSerializerV08, BundleReader
19
21
from bzrlib.testament import StrictTestament3
20
22
from bzrlib.bundle.bundle_data import BundleInfo
25
27
 
26
28
class BundleSerializerV09(BundleSerializerV08):
27
29
    """Serializer for bzr bundle format 0.9
28
 
    
 
30
 
29
31
    This format supports rich root data, for the nested-trees work, but also
30
32
    supports repositories that don't have rich root data.  It cannot be
31
33
    used to transfer from a knit2 repo into a knit1 repo, because that would
38
40
    def _write_main_header(self):
39
41
        """Write the header for the changes"""
40
42
        f = self.to_file
41
 
        f.write(BUNDLE_HEADER + '0.9\n#\n')
 
43
        f.write(_get_bundle_header('0.9') + '#\n')
42
44
 
43
45
    def _testament_sha1(self, revision_id):
44
 
        return StrictTestament3.from_revision(self.source, 
 
46
        return StrictTestament3.from_revision(self.source,
45
47
                                              revision_id).as_sha1()
46
48
 
47
49
    def read(self, f):
55
57
 
56
58
class BundleInfo09(BundleInfo):
57
59
    """BundleInfo that uses StrictTestament3
58
 
    
 
60
 
59
61
    This means that the root data is included in the testament.
60
62
    """
61
63
 
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):
71
73
    """BundleReader for 0.9 bundles"""
72
 
    
 
74
 
73
75
    def _get_info(self):
74
76
        return BundleInfo09()