2255.7.83
by John Arbash Meinel
Update some obvious copyright headers to include 2007. |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2 |
#
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
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 |
#
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
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 |
#
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
17 |
import cStringIO |
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
18 |
import re |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
19 |
|
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
20 |
from bzrlib import ( |
21 |
cache_utf8, |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
22 |
errors, |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
23 |
inventory, |
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
24 |
revision as _mod_revision, |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
25 |
)
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
26 |
from bzrlib.xml_serializer import SubElement, Element, Serializer |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
27 |
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
28 |
from bzrlib.revision import Revision |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
29 |
from bzrlib.errors import BzrError |
30 |
||
31 |
||
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
32 |
_utf8_re = None |
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
33 |
_unicode_re = None |
34 |
_xml_escape_map = { |
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
35 |
"&":'&', |
36 |
"'":"'", # FIXME: overkill |
|
37 |
"\"":""", |
|
38 |
"<":"<", |
|
39 |
">":">", |
|
40 |
}
|
|
41 |
||
42 |
||
43 |
def _ensure_utf8_re(): |
|
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
44 |
"""Make sure the _utf8_re and _unicode_re regexes have been compiled."""
|
45 |
global _utf8_re, _unicode_re |
|
46 |
if _utf8_re is None: |
|
47 |
_utf8_re = re.compile('[&<>\'\"]|[\x80-\xff]+') |
|
48 |
if _unicode_re is None: |
|
49 |
_unicode_re = re.compile(u'[&<>\'\"\u0080-\uffff]') |
|
50 |
||
51 |
||
52 |
def _unicode_escape_replace(match, _map=_xml_escape_map): |
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
53 |
"""Replace a string of non-ascii, non XML safe characters with their escape
|
54 |
||
55 |
This will escape both Standard XML escapes, like <>"', etc.
|
|
56 |
As well as escaping non ascii characters, because ElementTree did.
|
|
57 |
This helps us remain compatible to older versions of bzr. We may change
|
|
58 |
our policy in the future, though.
|
|
59 |
"""
|
|
1934.1.7
by John Arbash Meinel
Comment why we do caching the way we do |
60 |
# jam 20060816 Benchmarks show that try/KeyError is faster if you
|
61 |
# expect the entity to rarely miss. There is about a 10% difference
|
|
62 |
# in overall time. But if you miss frequently, then if None is much
|
|
63 |
# faster. For our use case, we *rarely* have a revision id, file id
|
|
64 |
# or path name that is unicode. So use try/KeyError.
|
|
1934.1.12
by John Arbash Meinel
Switch back to using Entity serializer, since performance is equivalent, yet still compatible |
65 |
try: |
66 |
return _map[match.group()] |
|
67 |
except KeyError: |
|
68 |
return "&#%d;" % ord(match.group()) |
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
69 |
|
70 |
||
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
71 |
def _utf8_escape_replace(match, _map=_xml_escape_map): |
72 |
"""Escape utf8 characters into XML safe ones.
|
|
73 |
||
74 |
This uses 2 tricks. It is either escaping "standard" characters, like "&<>,
|
|
75 |
or it is handling characters with the high-bit set. For ascii characters,
|
|
76 |
we just lookup the replacement in the dictionary. For everything else, we
|
|
77 |
decode back into Unicode, and then use the XML escape code.
|
|
78 |
"""
|
|
79 |
try: |
|
80 |
return _map[match.group()] |
|
81 |
except KeyError: |
|
82 |
return ''.join('&#%d;' % ord(uni_chr) |
|
83 |
for uni_chr in match.group().decode('utf8')) |
|
84 |
||
85 |
||
86 |
_to_escaped_map = {} |
|
87 |
||
88 |
def _encode_and_escape(unicode_or_utf8_str, _map=_to_escaped_map): |
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
89 |
"""Encode the string into utf8, and escape invalid XML characters"""
|
1934.1.7
by John Arbash Meinel
Comment why we do caching the way we do |
90 |
# We frequently get entities we have not seen before, so it is better
|
91 |
# to check if None, rather than try/KeyError
|
|
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
92 |
text = _map.get(unicode_or_utf8_str) |
1934.1.5
by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms |
93 |
if text is None: |
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
94 |
if unicode_or_utf8_str.__class__ == unicode: |
95 |
# The alternative policy is to do a regular UTF8 encoding
|
|
96 |
# and then escape only XML meta characters.
|
|
97 |
# Performance is equivalent once you use cache_utf8. *However*
|
|
98 |
# this makes the serialized texts incompatible with old versions
|
|
99 |
# of bzr. So no net gain. (Perhaps the read code would handle utf8
|
|
100 |
# better than entity escapes, but cElementTree seems to do just fine
|
|
101 |
# either way)
|
|
102 |
text = str(_unicode_re.sub(_unicode_escape_replace, |
|
103 |
unicode_or_utf8_str)) + '"' |
|
104 |
else: |
|
105 |
# Plain strings are considered to already be in utf-8 so we do a
|
|
106 |
# slightly different method for escaping.
|
|
107 |
text = _utf8_re.sub(_utf8_escape_replace, |
|
108 |
unicode_or_utf8_str) + '"' |
|
109 |
_map[unicode_or_utf8_str] = text |
|
1934.1.5
by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms |
110 |
return text |
111 |
||
112 |
||
2249.5.4
by John Arbash Meinel
When reading XML, always return utf-8 revision ids. |
113 |
def _get_utf8_or_ascii(a_str, |
114 |
_encode_utf8=cache_utf8.encode, |
|
115 |
_get_cached_ascii=cache_utf8.get_cached_ascii): |
|
116 |
"""Return a cached version of the string.
|
|
117 |
||
118 |
cElementTree will return a plain string if the XML is plain ascii. It only
|
|
119 |
returns Unicode when it needs to. We want to work in utf-8 strings. So if
|
|
120 |
cElementTree returns a plain string, we can just return the cached version.
|
|
121 |
If it is Unicode, then we need to encode it.
|
|
122 |
||
123 |
:param a_str: An 8-bit string or Unicode as returned by
|
|
124 |
cElementTree.Element.get()
|
|
125 |
:return: A utf-8 encoded 8-bit string.
|
|
126 |
"""
|
|
127 |
# This is fairly optimized because we know what cElementTree does, this is
|
|
128 |
# not meant as a generic function for all cases. Because it is possible for
|
|
129 |
# an 8-bit string to not be ascii or valid utf8.
|
|
130 |
if a_str.__class__ == unicode: |
|
131 |
return _encode_utf8(a_str) |
|
132 |
else: |
|
133 |
return _get_cached_ascii(a_str) |
|
134 |
||
135 |
||
1934.1.5
by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms |
136 |
def _clear_cache(): |
137 |
"""Clean out the unicode => escaped map"""
|
|
2249.5.10
by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings |
138 |
_to_escaped_map.clear() |
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
139 |
|
140 |
||
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
141 |
class Serializer_v5(Serializer): |
142 |
"""Version 5 serializer
|
|
143 |
||
144 |
Packs objects into XML and vice versa.
|
|
145 |
"""
|
|
146 |
||
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
147 |
__slots__ = [] |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
148 |
|
1910.2.48
by Aaron Bentley
Update from review comments |
149 |
support_altered_by_hack = True |
150 |
# This format supports the altered-by hack that reads file ids directly out
|
|
151 |
# of the versionedfile, without doing XML parsing.
|
|
152 |
||
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
153 |
supported_kinds = set(['file', 'directory', 'symlink']) |
2520.4.97
by Aaron Bentley
Hack in support for inventory conversion |
154 |
format_num = '5' |
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
155 |
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
156 |
def write_inventory_to_string(self, inv): |
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
157 |
"""Just call write_inventory with a StringIO and return the value"""
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
158 |
sio = cStringIO.StringIO() |
159 |
self.write_inventory(inv, sio) |
|
160 |
return sio.getvalue() |
|
161 |
||
162 |
def write_inventory(self, inv, f): |
|
163 |
"""Write inventory to a file.
|
|
164 |
|
|
165 |
:param inv: the inventory to write.
|
|
166 |
:param f: the file to write.
|
|
167 |
"""
|
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
168 |
_ensure_utf8_re() |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
169 |
output = [] |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
170 |
append = output.append |
171 |
self._append_inventory_root(append, inv) |
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
172 |
entries = inv.iter_entries() |
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
173 |
# Skip the root
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
174 |
root_path, root_ie = entries.next() |
175 |
for path, ie in entries: |
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
176 |
self._append_entry(append, ie) |
177 |
append('</inventory>\n') |
|
1934.1.4
by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8') |
178 |
f.writelines(output) |
1934.1.5
by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms |
179 |
# Just to keep the cache from growing without bounds
|
180 |
# but we may actually not want to do clear the cache
|
|
1934.1.6
by John Arbash Meinel
With a full cache the time is down to 381 ms |
181 |
#_clear_cache()
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
182 |
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
183 |
def _append_inventory_root(self, append, inv): |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
184 |
"""Append the inventory root to output."""
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
185 |
append('<inventory') |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
186 |
if inv.root.file_id not in (None, ROOT_ID): |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
187 |
append(' file_id="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
188 |
append(_encode_and_escape(inv.root.file_id)) |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
189 |
append(' format="5"') |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
190 |
if inv.revision_id is not None: |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
191 |
append(' revision_id="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
192 |
append(_encode_and_escape(inv.revision_id)) |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
193 |
append('>\n') |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
194 |
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
195 |
def _append_entry(self, append, ie): |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
196 |
"""Convert InventoryEntry to XML element and append to output."""
|
197 |
# TODO: should just be a plain assertion
|
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
198 |
if ie.kind not in self.supported_kinds: |
199 |
raise errors.UnsupportedInventoryKind(ie.kind) |
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
200 |
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
201 |
append("<") |
202 |
append(ie.kind) |
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
203 |
if ie.executable: |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
204 |
append(' executable="yes"') |
205 |
append(' file_id="') |
|
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
206 |
append(_encode_and_escape(ie.file_id)) |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
207 |
append(' name="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
208 |
append(_encode_and_escape(ie.name)) |
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
209 |
if self._parent_condition(ie): |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
210 |
assert isinstance(ie.parent_id, basestring) |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
211 |
append(' parent_id="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
212 |
append(_encode_and_escape(ie.parent_id)) |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
213 |
if ie.revision is not None: |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
214 |
append(' revision="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
215 |
append(_encode_and_escape(ie.revision)) |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
216 |
if ie.symlink_target is not None: |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
217 |
append(' symlink_target="') |
1934.1.9
by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached |
218 |
append(_encode_and_escape(ie.symlink_target)) |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
219 |
if ie.text_sha1 is not None: |
1934.1.15
by John Arbash Meinel
One field was incorrect, need text_sha1 not text_size |
220 |
append(' text_sha1="') |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
221 |
append(ie.text_sha1) |
222 |
append('"') |
|
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
223 |
if ie.text_size is not None: |
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
224 |
append(' text_size="%d"' % ie.text_size) |
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
225 |
if getattr(ie, 'reference_revision', None) is not None: |
226 |
append(' reference_revision="') |
|
227 |
append(_encode_and_escape(ie.reference_revision)) |
|
1934.1.8
by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms |
228 |
append(" />\n") |
1934.1.3
by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences |
229 |
return
|
230 |
||
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
231 |
def _parent_condition(self, ie): |
232 |
return ie.parent_id != ROOT_ID |
|
233 |
||
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
234 |
def _pack_revision(self, rev): |
235 |
"""Revision object -> xml tree"""
|
|
2249.5.5
by John Arbash Meinel
better comment for why we are decoding |
236 |
# For the XML format, we need to write them as Unicode rather than as
|
237 |
# utf-8 strings. So that cElementTree can handle properly escaping
|
|
238 |
# them.
|
|
2249.5.4
by John Arbash Meinel
When reading XML, always return utf-8 revision ids. |
239 |
decode_utf8 = cache_utf8.decode |
2249.5.5
by John Arbash Meinel
better comment for why we are decoding |
240 |
revision_id = rev.revision_id |
241 |
if isinstance(revision_id, str): |
|
242 |
revision_id = decode_utf8(revision_id) |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
243 |
root = Element('revision', |
244 |
committer = rev.committer, |
|
2102.4.1
by John Arbash Meinel
Switch to using millisecond resolution in Revision XML |
245 |
timestamp = '%.3f' % rev.timestamp, |
2249.5.5
by John Arbash Meinel
better comment for why we are decoding |
246 |
revision_id = revision_id, |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
247 |
inventory_sha1 = rev.inventory_sha1, |
1393.1.59
by Martin Pool
- put 'format=5' on inventory and revision xml |
248 |
format='5', |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
249 |
)
|
1913.1.1
by John Arbash Meinel
Fix bug #55783 |
250 |
if rev.timezone is not None: |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
251 |
root.set('timezone', str(rev.timezone)) |
252 |
root.text = '\n' |
|
253 |
msg = SubElement(root, 'message') |
|
254 |
msg.text = rev.message |
|
255 |
msg.tail = '\n' |
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
256 |
if rev.parent_ids: |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
257 |
pelts = SubElement(root, 'parents') |
258 |
pelts.tail = pelts.text = '\n' |
|
1313
by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage |
259 |
for parent_id in rev.parent_ids: |
1311
by Martin Pool
- remove RevisionReference; just hold parent ids directly |
260 |
assert isinstance(parent_id, basestring) |
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
261 |
_mod_revision.check_not_reserved_id(parent_id) |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
262 |
p = SubElement(pelts, 'revision_ref') |
263 |
p.tail = '\n' |
|
2249.5.5
by John Arbash Meinel
better comment for why we are decoding |
264 |
if isinstance(parent_id, str): |
265 |
parent_id = decode_utf8(parent_id) |
|
266 |
p.set('revision_id', parent_id) |
|
1185.16.36
by Martin Pool
- store revision properties in revision xml |
267 |
if rev.properties: |
268 |
self._pack_revision_properties(rev, root) |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
269 |
return root |
1185.16.36
by Martin Pool
- store revision properties in revision xml |
270 |
|
271 |
def _pack_revision_properties(self, rev, under_element): |
|
272 |
top_elt = SubElement(under_element, 'properties') |
|
273 |
for prop_name, prop_value in sorted(rev.properties.items()): |
|
274 |
assert isinstance(prop_name, basestring) |
|
275 |
assert isinstance(prop_value, basestring) |
|
276 |
prop_elt = SubElement(top_elt, 'property') |
|
277 |
prop_elt.set('name', prop_name) |
|
278 |
prop_elt.text = prop_value |
|
279 |
prop_elt.tail = '\n' |
|
280 |
top_elt.tail = '\n' |
|
281 |
||
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
282 |
def _unpack_inventory(self, elt): |
283 |
"""Construct from XML Element
|
|
284 |
"""
|
|
285 |
assert elt.tag == 'inventory' |
|
286 |
root_id = elt.get('file_id') or ROOT_ID |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
287 |
root_id = _get_utf8_or_ascii(root_id) |
288 |
||
1393.1.59
by Martin Pool
- put 'format=5' on inventory and revision xml |
289 |
format = elt.get('format') |
290 |
if format is not None: |
|
291 |
if format != '5': |
|
292 |
raise BzrError("invalid format version %r on inventory" |
|
293 |
% format) |
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
294 |
revision_id = elt.get('revision_id') |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
295 |
if revision_id is not None: |
2249.5.4
by John Arbash Meinel
When reading XML, always return utf-8 revision ids. |
296 |
revision_id = cache_utf8.encode(revision_id) |
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
297 |
inv = Inventory(root_id, revision_id=revision_id) |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
298 |
for e in elt: |
299 |
ie = self._unpack_entry(e) |
|
2294.1.9
by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID |
300 |
if ie.parent_id is None: |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
301 |
ie.parent_id = root_id |
302 |
inv.add(ie) |
|
303 |
return inv |
|
304 |
||
2294.1.9
by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID |
305 |
def _unpack_entry(self, elt): |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
306 |
kind = elt.tag |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
307 |
if not InventoryEntry.versionable_kind(kind): |
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
308 |
raise AssertionError('unsupported entry kind %s' % kind) |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
309 |
|
2249.5.4
by John Arbash Meinel
When reading XML, always return utf-8 revision ids. |
310 |
get_cached = _get_utf8_or_ascii |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
311 |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
312 |
parent_id = elt.get('parent_id') |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
313 |
if parent_id is not None: |
314 |
parent_id = get_cached(parent_id) |
|
315 |
file_id = get_cached(elt.get('file_id')) |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
316 |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
317 |
if kind == 'directory': |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
318 |
ie = inventory.InventoryDirectory(file_id, |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
319 |
elt.get('name'), |
320 |
parent_id) |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
321 |
elif kind == 'file': |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
322 |
ie = inventory.InventoryFile(file_id, |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
323 |
elt.get('name'), |
324 |
parent_id) |
|
325 |
ie.text_sha1 = elt.get('text_sha1') |
|
326 |
if elt.get('executable') == 'yes': |
|
327 |
ie.executable = True |
|
328 |
v = elt.get('text_size') |
|
329 |
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 |
330 |
elif kind == 'symlink': |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
331 |
ie = inventory.InventoryLink(file_id, |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
332 |
elt.get('name'), |
333 |
parent_id) |
|
334 |
ie.symlink_target = elt.get('symlink_target') |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
335 |
else: |
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
336 |
raise errors.UnsupportedInventoryKind(kind) |
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
337 |
revision = elt.get('revision') |
338 |
if revision is not None: |
|
339 |
revision = get_cached(revision) |
|
340 |
ie.revision = revision |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
341 |
|
342 |
return ie |
|
343 |
||
344 |
def _unpack_revision(self, elt): |
|
345 |
"""XML Element -> Revision object"""
|
|
346 |
assert elt.tag == 'revision' |
|
1393.1.59
by Martin Pool
- put 'format=5' on inventory and revision xml |
347 |
format = elt.get('format') |
348 |
if format is not None: |
|
349 |
if format != '5': |
|
350 |
raise BzrError("invalid format version %r on inventory" |
|
351 |
% format) |
|
2249.5.4
by John Arbash Meinel
When reading XML, always return utf-8 revision ids. |
352 |
get_cached = _get_utf8_or_ascii |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
353 |
rev = Revision(committer = elt.get('committer'), |
354 |
timestamp = float(elt.get('timestamp')), |
|
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
355 |
revision_id = get_cached(elt.get('revision_id')), |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
356 |
inventory_sha1 = elt.get('inventory_sha1') |
357 |
)
|
|
358 |
parents = elt.find('parents') or [] |
|
359 |
for p in parents: |
|
360 |
assert p.tag == 'revision_ref', \ |
|
361 |
"bad parent node tag %r" % p.tag |
|
1911.2.6
by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly. |
362 |
rev.parent_ids.append(get_cached(p.get('revision_id'))) |
1185.16.37
by Martin Pool
- properties are retrieved when revisions are loaded |
363 |
self._unpack_revision_properties(elt, rev) |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
364 |
v = elt.get('timezone') |
1913.1.1
by John Arbash Meinel
Fix bug #55783 |
365 |
if v is None: |
366 |
rev.timezone = 0 |
|
367 |
else: |
|
368 |
rev.timezone = int(v) |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
369 |
rev.message = elt.findtext('message') # text of <message> |
370 |
return rev |
|
371 |
||
1185.16.37
by Martin Pool
- properties are retrieved when revisions are loaded |
372 |
def _unpack_revision_properties(self, elt, rev): |
373 |
"""Unpack properties onto a revision."""
|
|
374 |
props_elt = elt.find('properties') |
|
375 |
assert len(rev.properties) == 0 |
|
376 |
if not props_elt: |
|
377 |
return
|
|
378 |
for prop_elt in props_elt: |
|
379 |
assert prop_elt.tag == 'property', \ |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
380 |
"bad tag under properties list: %r" % prop_elt.tag |
1185.16.37
by Martin Pool
- properties are retrieved when revisions are loaded |
381 |
name = prop_elt.get('name') |
382 |
value = prop_elt.text |
|
1886.1.1
by John Arbash Meinel
Fix bug #47782, |
383 |
# If a property had an empty value ('') cElementTree reads
|
384 |
# that back as None, convert it back to '', so that all
|
|
385 |
# properties have string values
|
|
386 |
if value is None: |
|
387 |
value = '' |
|
1185.16.37
by Martin Pool
- properties are retrieved when revisions are loaded |
388 |
assert name not in rev.properties, \ |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
389 |
"repeated property %r" % name |
1185.16.37
by Martin Pool
- properties are retrieved when revisions are loaded |
390 |
rev.properties[name] = value |
391 |
||
392 |
||
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
393 |
serializer_v5 = Serializer_v5() |