← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/chk_serializer.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 17:42:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731174229-w2zdsdlfpeddk8gl
Now we got to the per-workingtree tests, etc.

The main causes seem to break down into:
  bzrdir.clone() is known to be broken wrt locking, this effects
  everything that tries to 'push'

  shelf code is not compatible with strict locking

  merge code seems to have an issue. This might actually be the
  root cause of the clone() problems.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_serializer.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
21
21
    cache_utf8,
22
22
    inventory,
23
23
    revision as _mod_revision,
 
24
    xml5,
24
25
    xml6,
25
 
    xml7,
26
26
    )
27
27
 
28
28
 
131
131
        return self.read_revision_from_string(f.read())
132
132
 
133
133
 
134
 
class CHKSerializerSubtree(BEncodeRevisionSerializer1, xml7.Serializer_v7):
 
134
class CHKSerializerSubtree(BEncodeRevisionSerializer1, xml6.Serializer_v6):
135
135
    """A CHKInventory based serializer that supports tree references"""
136
136
 
137
137
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
139
139
    revision_format_num = None
140
140
    support_altered_by_hack = False
141
141
 
142
 
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
 
142
    def _unpack_entry(self, elt):
143
143
        kind = elt.tag
144
144
        if not kind in self.supported_kinds:
145
145
            raise AssertionError('unsupported entry kind %s' % kind)
152
152
            return inventory.TreeReference(file_id, name, parent_id, revision,
153
153
                                           reference_revision)
154
154
        else:
155
 
            return xml7.Serializer_v7._unpack_entry(self, elt,
156
 
                entry_cache=entry_cache, return_from_cache=return_from_cache)
 
155
            return xml6.Serializer_v6._unpack_entry(self, elt)
157
156
 
158
157
    def __init__(self, node_size, search_key_name):
159
158
        self.maximum_size = node_size
160
159
        self.search_key_name = search_key_name
161
160
 
162
161
 
163
 
class CHKSerializer(xml6.Serializer_v6):
 
162
class CHKSerializer(xml5.Serializer_v5):
164
163
    """A CHKInventory based serializer with 'plain' behaviour."""
165
164
 
166
165
    format_num = '9'