1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
17
from bzrlib import (
25
from bzrlib.xml_serializer import (
28
unpack_inventory_entry,
32
24
class Serializer_v5(xml6.Serializer_v6):
33
25
"""Version 5 serializer
38
30
root_id = inventory.ROOT_ID
40
def _unpack_inventory(self, elt, revision_id, entry_cache=None,
41
return_from_cache=False):
32
def _unpack_inventory(self, elt, revision_id):
42
33
"""Construct from XML Element
44
35
root_id = elt.get('file_id') or inventory.ROOT_ID
45
root_id = get_utf8_or_ascii(root_id)
36
root_id = xml8._get_utf8_or_ascii(root_id)
47
38
format = elt.get('format')
48
39
if format is not None:
50
raise errors.BzrError("invalid format version %r on inventory"
41
raise BzrError("invalid format version %r on inventory"
52
43
data_revision_id = elt.get('revision_id')
53
44
if data_revision_id is not None:
54
45
revision_id = cache_utf8.encode(data_revision_id)
55
46
inv = inventory.Inventory(root_id, revision_id=revision_id)
56
# Optimizations tested
57
# baseline w/entry cache 2.85s
58
# using inv._byid 2.55s
59
# avoiding attributes 2.46s
60
# adding assertions 2.50s
61
# last_parent cache 2.52s (worse, removed)
64
ie = unpack_inventory_entry(e, entry_cache=entry_cache,
65
return_from_cache=return_from_cache)
66
parent_id = ie.parent_id
68
ie.parent_id = parent_id = root_id
70
parent = byid[parent_id]
72
raise errors.BzrError("parent_id {%s} not in inventory"
74
if ie.file_id in byid:
75
raise errors.DuplicateFileId(ie.file_id,
77
if ie.name in parent.children:
78
raise errors.BzrError("%s is already versioned"
79
% (osutils.pathjoin(inv.id2path(parent_id),
80
ie.name).encode('utf-8'),))
81
parent.children[ie.name] = ie
48
ie = self._unpack_entry(e)
49
if ie.parent_id is None:
50
ie.parent_id = root_id
83
52
if revision_id is not None:
84
53
inv.root.revision = revision_id
85
self._check_cache_size(len(inv), entry_cache)
88
56
def _check_revisions(self, inv):
91
59
In this version, no checking is done.
93
61
:param inv: An inventory about to be serialised, to be checked.
94
:raises: AssertionError if an error has occurred.
62
:raises: AssertionError if an error has occured.
97
65
def _append_inventory_root(self, append, inv):
98
66
"""Append the inventory root to output."""
99
67
if inv.root.file_id not in (None, inventory.ROOT_ID):
100
68
fileid1 = ' file_id="'
101
fileid2 = encode_and_escape(inv.root.file_id)
69
fileid2 = xml8._encode_and_escape(inv.root.file_id)
105
73
if inv.revision_id is not None:
106
74
revid1 = ' revision_id="'
107
revid2 = encode_and_escape(inv.revision_id)
75
revid2 = xml8._encode_and_escape(inv.revision_id)