bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
2 |
#
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
16 |
|
|
6670.4.10
by Jelmer Vernooij
Move serializer to bzr. |
17 |
from ...bzr.xml_serializer import ( |
|
4237.3.1
by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in |
18 |
Element, |
19 |
SubElement, |
|
20 |
XMLSerializer, |
|
|
4416.5.1
by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer. |
21 |
escape_invalid_chars, |
|
4237.3.1
by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in |
22 |
)
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
23 |
from ...bzr.inventory import ROOT_ID, Inventory |
|
6670.4.12
by Jelmer Vernooij
Move inventorytree to breezy.bzr. |
24 |
from ...bzr import inventory |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
25 |
from ...revision import Revision |
26 |
from ...errors import BzrError |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
27 |
|
28 |
||
|
4237.3.1
by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in |
29 |
class _Serializer_v4(XMLSerializer): |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
30 |
"""Version 0.0.4 serializer |
31 |
||
|
2817.2.1
by Robert Collins
* Inventory serialisation no longer double-sha's the content. |
32 |
You should use the serializer_v4 singleton.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
33 |
|
|
2817.2.1
by Robert Collins
* Inventory serialisation no longer double-sha's the content. |
34 |
v4 serialisation is no longer supported, only deserialisation.
|
35 |
"""
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
36 |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
37 |
__slots__ = [] |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
38 |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
39 |
def _pack_entry(self, ie): |
40 |
"""Convert InventoryEntry to XML element""" |
|
41 |
e = Element('entry') |
|
42 |
e.set('name', ie.name) |
|
|
6973.7.10
by Jelmer Vernooij
More fixes. |
43 |
e.set('file_id', ie.file_id.decode('ascii')) |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
44 |
e.set('kind', ie.kind) |
45 |
||
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
46 |
if ie.text_size is not None: |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
47 |
e.set('text_size', '%d' % ie.text_size) |
48 |
||
|
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
49 |
for f in ['text_id', 'text_sha1', 'symlink_target']: |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
50 |
v = getattr(ie, f) |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
51 |
if v is not None: |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
52 |
e.set(f, v) |
53 |
||
54 |
# to be conservative, we don't externalize the root pointers
|
|
55 |
# for now, leaving them as null in the xml form. in a future
|
|
56 |
# version it will be implied by nested elements.
|
|
57 |
if ie.parent_id != ROOT_ID: |
|
58 |
e.set('parent_id', ie.parent_id) |
|
59 |
||
60 |
e.tail = '\n' |
|
61 |
||
62 |
return e |
|
63 |
||
|
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
64 |
def _unpack_inventory(self, elt, revision_id=None, entry_cache=None, |
65 |
return_from_cache=False): |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
66 |
"""Construct from XML Element |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
67 |
|
68 |
:param revision_id: Ignored parameter used by xml5.
|
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
69 |
"""
|
|
6973.7.10
by Jelmer Vernooij
More fixes. |
70 |
root_id = elt.get('file_id') |
71 |
root_id = (root_id.encode('ascii') if root_id else ROOT_ID) |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
72 |
inv = Inventory(root_id) |
73 |
for e in elt: |
|
|
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
74 |
ie = self._unpack_entry(e, entry_cache=entry_cache, |
75 |
return_from_cache=return_from_cache) |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
76 |
if ie.parent_id == ROOT_ID: |
77 |
ie.parent_id = root_id |
|
78 |
inv.add(ie) |
|
79 |
return inv |
|
80 |
||
|
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
81 |
def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False): |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
82 |
# original format inventories don't have a parent_id for
|
83 |
# nodes in the root directory, but it's cleaner to use one
|
|
84 |
# internally.
|
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
85 |
parent_id = elt.get('parent_id') |
|
6973.7.10
by Jelmer Vernooij
More fixes. |
86 |
parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID) |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
87 |
|
|
6973.7.10
by Jelmer Vernooij
More fixes. |
88 |
file_id = elt.get('file_id').encode('ascii') |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
89 |
kind = elt.get('kind') |
90 |
if kind == 'directory': |
|
|
6973.7.10
by Jelmer Vernooij
More fixes. |
91 |
ie = inventory.InventoryDirectory(file_id, |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
92 |
elt.get('name'), |
93 |
parent_id) |
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
94 |
elif kind == 'file': |
|
6973.7.10
by Jelmer Vernooij
More fixes. |
95 |
ie = inventory.InventoryFile(file_id, |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
96 |
elt.get('name'), |
97 |
parent_id) |
|
98 |
ie.text_id = elt.get('text_id') |
|
|
7045.4.10
by Jelmer Vernooij
Fix a couple more tests. |
99 |
if ie.text_id is not None: |
100 |
ie.text_id = ie.text_id.encode('utf-8') |
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
101 |
ie.text_sha1 = elt.get('text_sha1') |
|
6973.7.10
by Jelmer Vernooij
More fixes. |
102 |
if ie.text_sha1 is not None: |
103 |
ie.text_sha1 = ie.text_sha1.encode('ascii') |
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
104 |
v = elt.get('text_size') |
105 |
ie.text_size = v and int(v) |
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
106 |
elif kind == 'symlink': |
|
6973.7.10
by Jelmer Vernooij
More fixes. |
107 |
ie = inventory.InventoryLink(file_id, |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
108 |
elt.get('name'), |
109 |
parent_id) |
|
110 |
ie.symlink_target = elt.get('symlink_target') |
|
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
111 |
else: |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
112 |
raise BzrError("unknown kind %r" % kind) |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
113 |
|
|
1185.31.4
by John Arbash Meinel
Fixing mutter() calls to not have to do string processing. |
114 |
## mutter("read inventoryentry: %r", elt.attrib)
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
115 |
|
116 |
return ie |
|
117 |
||
118 |
def _pack_revision(self, rev): |
|
119 |
"""Revision object -> xml tree""" |
|
120 |
root = Element('revision', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
121 |
committer=rev.committer, |
122 |
timestamp='%.9f' % rev.timestamp, |
|
123 |
revision_id=rev.revision_id, |
|
124 |
inventory_id=rev.inventory_id, |
|
125 |
inventory_sha1=rev.inventory_sha1, |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
126 |
)
|
127 |
if rev.timezone: |
|
128 |
root.set('timezone', str(rev.timezone)) |
|
129 |
root.text = '\n' |
|
130 |
||
131 |
msg = SubElement(root, 'message') |
|
|
4416.5.1
by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer. |
132 |
msg.text = escape_invalid_chars(rev.message)[0] |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
133 |
msg.tail = '\n' |
134 |
||
135 |
if rev.parents: |
|
136 |
pelts = SubElement(root, 'parents') |
|
137 |
pelts.tail = pelts.text = '\n' |
|
|
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
138 |
for i, parent_id in enumerate(rev.parents): |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
139 |
p = SubElement(pelts, 'revision_ref') |
140 |
p.tail = '\n' |
|
|
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
141 |
p.set('revision_id', parent_id) |
142 |
if i < len(rev.parent_sha1s): |
|
143 |
p.set('revision_sha1', rev.parent_sha1s[i]) |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
144 |
return root |
145 |
||
|
7290.46.1
by Jelmer Vernooij
Add custom generator for XML revisions. |
146 |
def write_revision_to_string(self, rev): |
147 |
return tostring(self._pack_revision(rev)) + b'\n' |
|
148 |
||
149 |
def _write_element(self, elt, f): |
|
150 |
ElementTree(elt).write(f, 'utf-8') |
|
151 |
f.write(b'\n') |
|
152 |
||
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
153 |
def _unpack_revision(self, elt): |
154 |
"""XML Element -> Revision object""" |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
155 |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
156 |
# <changeset> is deprecated...
|
157 |
if elt.tag not in ('revision', 'changeset'): |
|
158 |
raise BzrError("unexpected tag in revision file: %r" % elt) |
|
159 |
||
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
160 |
rev = Revision(committer=elt.get('committer'), |
161 |
timestamp=float(elt.get('timestamp')), |
|
162 |
revision_id=elt.get('revision_id'), |
|
163 |
inventory_id=elt.get('inventory_id'), |
|
164 |
inventory_sha1=elt.get('inventory_sha1') |
|
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
165 |
)
|
166 |
||
167 |
precursor = elt.get('precursor') |
|
168 |
precursor_sha1 = elt.get('precursor_sha1') |
|
169 |
||
170 |
pelts = elt.find('parents') |
|
171 |
||
172 |
if pelts: |
|
173 |
for p in pelts: |
|
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
174 |
rev.parent_ids.append(p.get('revision_id')) |
|
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
175 |
rev.parent_sha1s.append(p.get('revision_sha1')) |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
176 |
if precursor: |
177 |
# must be consistent
|
|
|
1314
by Martin Pool
- Fix up one more RevisionReference bit |
178 |
prec_parent = rev.parent_ids[0] |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
179 |
elif precursor: |
180 |
# revisions written prior to 0.0.5 have a single precursor
|
|
181 |
# give as an attribute
|
|
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
182 |
rev.parent_ids.append(precursor) |
|
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
183 |
rev.parent_sha1s.append(precursor_sha1) |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
184 |
|
185 |
v = elt.get('timezone') |
|
186 |
rev.timezone = v and int(v) |
|
187 |
||
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
188 |
rev.message = elt.findtext('message') # text of <message> |
|
1297
by Martin Pool
- split old xml v4 serialization into separate file |
189 |
return rev |
190 |
||
191 |
||
192 |
"""singleton instance"""
|
|
193 |
serializer_v4 = _Serializer_v4() |