/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 bzrlib/chk_serializer.py

  • Committer: Ian Clatworthy
  • Date: 2009-10-27 09:45:35 UTC
  • mto: (4634.103.1 385879)
  • mto: This revision was merged to the branch mainline in revision 4857.
  • Revision ID: ian.clatworthy@canonical.com-20091027094535-wii07udtqgtsxbp4
Use the working tree for path lookups as Robert suggested. We still need to fall back to the other tree though in the case of files being added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 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
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 xml7.Serializer_v7._unpack_entry(self, elt)
157
156
 
158
157
    def __init__(self, node_size, search_key_name):
159
158
        self.maximum_size = node_size