Merge lp:~jelmer/ubuntu/maverick/bzr/2.2.5 into lp:ubuntu/maverick/bzr

Proposed by Jelmer Vernooij on 2011-09-27
Status: Superseded
Proposed branch: lp:~jelmer/ubuntu/maverick/bzr/2.2.5
Merge into: lp:ubuntu/maverick/bzr
Diff against target: 22226 lines (+6010/-3281)
170 files modified
.pc/applied-patches (+1/-1)
.pc/debian-changes-2.2.0-1/bzrlib/rules.py (+0/-155)
.pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py (+0/-195)
.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py (+155/-0)
.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py (+197/-0)
Makefile (+1/-1)
NEWS (+724/-232)
bzr (+12/-13)
bzrlib/__init__.py (+3/-3)
bzrlib/_annotator_pyx.c (+108/-108)
bzrlib/_bencode_pyx.c (+128/-128)
bzrlib/_btree_serializer_pyx.c (+150/-150)
bzrlib/_chk_map_pyx.c (+212/-212)
bzrlib/_chunks_to_lines_pyx.c (+36/-36)
bzrlib/_dirstate_helpers_pyx.c (+602/-602)
bzrlib/_groupcompress_pyx.c (+186/-186)
bzrlib/_knit_load_data_pyx.c (+90/-90)
bzrlib/_known_graph_pyx.c (+349/-349)
bzrlib/_patiencediff_c.c (+2/-2)
bzrlib/_readdir_pyx.c (+76/-76)
bzrlib/_rio_pyx.c (+77/-77)
bzrlib/_simple_set_pyx.c (+146/-146)
bzrlib/branch.py (+2/-7)
bzrlib/commands.py (+1/-0)
bzrlib/commit.py (+12/-1)
bzrlib/conflicts.py (+6/-7)
bzrlib/dirstate.py (+11/-5)
bzrlib/doc_generate/autodoc_man.py (+2/-2)
bzrlib/errors.py (+24/-0)
bzrlib/fetch.py (+5/-4)
bzrlib/generate_ids.py (+4/-4)
bzrlib/groupcompress.py (+2/-2)
bzrlib/help_topics/__init__.py (+1/-1)
bzrlib/help_topics/en/configuration.txt (+3/-1)
bzrlib/inventory.py (+0/-3)
bzrlib/knit.py (+1/-1)
bzrlib/lockdir.py (+44/-2)
bzrlib/merge.py (+8/-2)
bzrlib/mutabletree.py (+18/-0)
bzrlib/plugins/launchpad/__init__.py (+64/-4)
bzrlib/plugins/launchpad/lp_api.py (+19/-6)
bzrlib/plugins/launchpad/lp_api_lite.py (+285/-0)
bzrlib/plugins/launchpad/lp_propose.py (+1/-1)
bzrlib/plugins/launchpad/lp_registration.py (+2/-2)
bzrlib/plugins/launchpad/test_lp_api_lite.py (+557/-0)
bzrlib/plugins/launchpad/test_lp_service.py (+0/-12)
bzrlib/plugins/launchpad/test_register.py (+2/-2)
bzrlib/repofmt/groupcompress_repo.py (+13/-4)
bzrlib/repofmt/pack_repo.py (+38/-4)
bzrlib/repository.py (+1/-2)
bzrlib/revisiontree.py (+1/-1)
bzrlib/tests/__init__.py (+13/-1)
bzrlib/tests/blackbox/test_add.py (+9/-0)
bzrlib/tests/blackbox/test_alias.py (+4/-2)
bzrlib/tests/blackbox/test_commit.py (+2/-0)
bzrlib/tests/blackbox/test_conflicts.py (+45/-0)
bzrlib/tests/blackbox/test_export.py (+5/-8)
bzrlib/tests/blackbox/test_tags.py (+56/-9)
bzrlib/tests/features.py (+15/-0)
bzrlib/tests/per_interrepository/__init__.py (+14/-3)
bzrlib/tests/per_lock/test_lock.py (+2/-1)
bzrlib/tests/per_repository/test_commit_builder.py (+24/-0)
bzrlib/tests/per_repository_reference/__init__.py (+1/-0)
bzrlib/tests/per_repository_reference/test_graph.py (+45/-0)
bzrlib/tests/per_tree/__init__.py (+1/-0)
bzrlib/tests/per_tree/test_is_executable.py (+37/-0)
bzrlib/tests/per_workingtree/test_symlinks.py (+79/-2)
bzrlib/tests/test_branch.py (+9/-0)
bzrlib/tests/test_bzrdir.py (+10/-0)
bzrlib/tests/test_commands.py (+1/-0)
bzrlib/tests/test_config.py (+27/-1)
bzrlib/tests/test_conflicts.py (+153/-1)
bzrlib/tests/test_dirstate.py (+16/-0)
bzrlib/tests/test_errors.py (+16/-0)
bzrlib/tests/test_http.py (+2/-0)
bzrlib/tests/test_knit.py (+27/-0)
bzrlib/tests/test_lockdir.py (+103/-1)
bzrlib/tests/test_osutils.py (+10/-3)
bzrlib/tests/test_repository.py (+101/-1)
bzrlib/tests/test_rio.py (+8/-0)
bzrlib/tests/test_selftest.py (+42/-6)
bzrlib/tests/test_setup.py (+5/-5)
bzrlib/tests/test_transform.py (+5/-3)
bzrlib/tests/test_workingtree.py (+7/-7)
bzrlib/transform.py (+8/-3)
bzrlib/transport/ftp/__init__.py (+11/-1)
bzrlib/transport/http/_pycurl.py (+8/-6)
bzrlib/transport/http/_urllib.py (+4/-2)
bzrlib/transport/http/_urllib2_wrappers.py (+13/-9)
bzrlib/transport/ssh.py (+25/-8)
bzrlib/util/configobj/configobj.py (+4/-2)
bzrlib/versionedfile.py (+13/-0)
bzrlib/workingtree.py (+7/-2)
bzrlib/workingtree_4.py (+1/-1)
bzrlib/xml_serializer.py (+2/-0)
debian/changelog (+49/-0)
debian/patches/debian-changes-2.2.0-1 (+0/-86)
debian/patches/debian-changes-2.2.1-0ubuntu1 (+60/-0)
debian/patches/series (+1/-1)
debian/watch (+2/-2)
doc/developers/HACKING.txt (+4/-4)
doc/developers/bug-handling.txt (+13/-11)
doc/developers/case-insensitive-file-systems.txt (+1/-1)
doc/developers/content-filtering.txt (+3/-3)
doc/developers/contribution-quickstart.txt (+1/-1)
doc/developers/development-repo.txt (+1/-1)
doc/developers/ec2.txt (+3/-3)
doc/developers/index-plain.txt (+2/-2)
doc/developers/packrepo.txt (+1/-1)
doc/developers/planned-performance-changes.txt (+0/-7)
doc/developers/releasing.txt (+19/-15)
doc/en/_templates/index.html (+1/-1)
doc/en/admin-guide/code-browsing.txt (+2/-2)
doc/en/admin-guide/hooks-plugins.txt (+4/-4)
doc/en/admin-guide/migration.txt (+2/-2)
doc/en/admin-guide/simple-setups.txt (+1/-1)
doc/en/admin-guide/upgrade.txt (+2/-2)
doc/en/mini-tutorial/index.txt (+6/-6)
doc/en/tutorials/centralized_workflow.txt (+3/-3)
doc/en/tutorials/tutorial.txt (+3/-3)
doc/en/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/en/upgrade-guide/overview.txt (+1/-1)
doc/en/user-guide/branching_a_project.txt (+1/-1)
doc/en/user-guide/bzrtools_plugin.txt (+1/-1)
doc/en/user-guide/configuring_bazaar.txt (+2/-2)
doc/en/user-guide/hooks.txt (+1/-1)
doc/en/user-guide/installing_bazaar.txt (+4/-4)
doc/en/user-guide/introducing_bazaar.txt (+3/-3)
doc/en/user-guide/plugins.txt (+3/-3)
doc/en/user-guide/sending_changes.txt (+1/-1)
doc/en/user-guide/server.txt (+1/-1)
doc/en/user-guide/setting_up_email.txt (+1/-1)
doc/en/user-guide/shared_repository_layouts.txt (+1/-1)
doc/en/user-guide/specifying_revisions.txt (+1/-1)
doc/en/user-guide/svn_plugin.txt (+2/-2)
doc/en/user-guide/version_info.txt (+1/-1)
doc/en/user-guide/web_browsing.txt (+1/-1)
doc/en/user-guide/writing_a_plugin.txt (+2/-2)
doc/en/user-reference/readme.txt (+1/-1)
doc/en/whats-new/whats-new-in-2.1.txt (+10/-0)
doc/en/whats-new/whats-new-in-2.2.txt (+288/-44)
doc/es/index.txt (+6/-6)
doc/es/mini-tutorial/index.txt (+6/-6)
doc/index.es.txt (+7/-7)
doc/index.ja.txt (+5/-5)
doc/index.ru.txt (+5/-5)
doc/index.txt (+5/-5)
doc/ja/index.txt (+6/-6)
doc/ja/mini-tutorial/index.txt (+6/-6)
doc/ja/tutorials/centralized_workflow.txt (+3/-3)
doc/ja/tutorials/tutorial.txt (+3/-3)
doc/ja/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/ja/upgrade-guide/overview.txt (+1/-1)
doc/ja/user-guide/bzrtools_plugin.txt (+1/-1)
doc/ja/user-guide/installing_bazaar.txt (+5/-5)
doc/ja/user-guide/introducing_bazaar.txt (+3/-3)
doc/ja/user-guide/plugins.txt (+1/-1)
doc/ja/user-guide/server.txt (+1/-1)
doc/ja/user-guide/shared_repository_layouts.txt (+1/-1)
doc/ja/user-guide/svn_plugin.txt (+2/-2)
doc/ja/user-guide/web_browsing.txt (+1/-1)
doc/ja/user-reference/index.txt (+19/-22)
doc/ru/index.txt (+3/-3)
doc/ru/mini-tutorial/index.txt (+6/-6)
doc/ru/tutorials/centralized_workflow.txt (+3/-3)
doc/ru/tutorials/tutorial.txt (+3/-3)
doc/ru/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/ru/user-guide/introducing_bazaar.txt (+3/-3)
setup.py (+18/-5)
tools/check-newsbugs.py (+2/-1)
To merge this branch: bzr merge lp:~jelmer/ubuntu/maverick/bzr/2.2.5
Reviewer Review Type Date Requested Status
Ubuntu Stable Release Updates Team 2011-09-27 Pending
Review via email: mp+77152@code.launchpad.net

This proposal has been superseded by a proposal from 2011-09-27.

Description of the change

bzr microrelease 2.2.5

This fixes a couple of bugs that might be affecting users:

 * stacking is not fully transitive (715000)
 * merge failing with NoFinalPath (#805809)

To post a comment you must log in.

Unmerged revisions

23. By Jelmer Vernooij on 2011-09-27

releasing version 2.2.5-0ubuntu1

22. By Jelmer Vernooij on 2011-09-27

* New upstream release.
 + Fixes merge failing with NoFinalPath. LP: #805809
 + Warns users when brancing from UDD branches that are out of date.
   LP: #609187
 + stacking is now fully transitive. LP: #715000

21. By Jelmer Vernooij on 2011-09-27

Update watch file.

20. By Martin Pool on 2011-04-07

[ Jelmer Vernooij ]
* Update watch file to use 2.2 series.
* New upstream release.
 + Fixes closing of leaked sockets to SSH subprocesses, which causes
   dput sftp uploads to hang. LP: #659590
 + Fixes the use of 'lp:' urls behind a http proxy. LP: #558343
 + Correctly sets the Content-Type header when http POSTing to comply
   with stricter web frameworks. LP: #665100
 + Fixes propagating tags to the master branch in a bound branch or
   heavyweight checkout. LP: #603395
 + Fixes the use of 'bzr resolve --take-other' if the file is
   involved in an unresolved text conflict. LP: #646961
 + Fixes https access with newer versions of python2.7. LP: #693880
 + Fixes crash during pack caused by a concurrent repository pack
   operation. LP: #701940
 + Fixes communication with the Launchpad web service when using
   launchpadlib >= 1.5.5. LP: #707075
 + Switches away from deprecated 'edge.launchpad.net' LP: #583667
 + Fixes resolving of content (and path) conflicts for files in subdirs.
   LP: #660935
 + Fixes nasty recursion loop while displaying branch opening error.
   LP: #687653

[ Martin Pool ]
* Propose for maverick SRU.

19. By Max Bowsher on 2010-09-30

* New upstream release.
 + Fix regression with upgrading poor-root to rich-root formats. LP: #636930
 + Files in ~/.bazaar are now locked whilst being updated automatically.
   LP: #525571

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2010-08-07 00:54:52 +0000
3+++ .pc/applied-patches 2011-09-27 11:59:19 +0000
4@@ -1,1 +1,1 @@
5-debian-changes-2.2.0-1
6+debian-changes-2.2.1-0ubuntu1
7
8=== removed directory '.pc/debian-changes-2.2.0-1'
9=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib'
10=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/rules.py'
11--- .pc/debian-changes-2.2.0-1/bzrlib/rules.py 2010-08-07 00:54:52 +0000
12+++ .pc/debian-changes-2.2.0-1/bzrlib/rules.py 1970-01-01 00:00:00 +0000
13@@ -1,155 +0,0 @@
14-# Copyright (C) 2008 Canonical Ltd
15-#
16-# This program is free software; you can redistribute it and/or modify
17-# it under the terms of the GNU General Public License as published by
18-# the Free Software Foundation; either version 2 of the License, or
19-# (at your option) any later version.
20-#
21-# This program is distributed in the hope that it will be useful,
22-# but WITHOUT ANY WARRANTY; without even the implied warranty of
23-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24-# GNU General Public License for more details.
25-#
26-# You should have received a copy of the GNU General Public License
27-# along with this program; if not, write to the Free Software
28-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
29-
30-"""Rule-based definition of preferences for selected files in selected branches.
31-
32-See ``bzr help rules`` for details.
33-"""
34-
35-from bzrlib import (
36- config,
37- cmdline,
38- errors,
39- globbing,
40- osutils,
41- )
42-from bzrlib.util.configobj import configobj
43-
44-
45-# Name of the file holding rules in a tree
46-RULES_TREE_FILENAME = ".bzrrules"
47-
48-# Namespace prefix for per file preferences
49-FILE_PREFS_PREFIX = 'name '
50-FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
51-
52-# The object providing default rules
53-_per_user_searcher = None
54-
55-
56-class _RulesSearcher(object):
57- """An object that provides rule-based preferences."""
58-
59- def get_items(self, path):
60- """Return the preferences for a path as name,value tuples.
61-
62- :param path: tree relative path
63- :return: () if no rule matched, otherwise a sequence of name,value
64- tuples.
65- """
66- raise NotImplementedError(self.get_items)
67-
68- def get_selected_items(self, path, names):
69- """Return selected preferences for a path as name,value tuples.
70-
71- :param path: tree relative path
72- :param names: the list of preferences to lookup
73- :return: () if no rule matched, otherwise a sequence of name,value
74- tuples. The sequence is the same length as names,
75- tuple order matches the order in names, and
76- undefined preferences are given the value None.
77- """
78- raise NotImplementedError(self.get_selected_items)
79-
80-
81-class _IniBasedRulesSearcher(_RulesSearcher):
82-
83- def __init__(self, inifile):
84- """Construct a _RulesSearcher based on an ini file.
85-
86- The content will be decoded as utf-8.
87-
88- :param inifile: the name of the file or a sequence of lines.
89- """
90- options = {'encoding': 'utf-8'}
91- self._cfg = configobj.ConfigObj(inifile, options=options)
92- sections = self._cfg.keys()
93- patterns = []
94- self.pattern_to_section = {}
95- for s in sections:
96- if s.startswith(FILE_PREFS_PREFIX):
97- file_patterns = cmdline.split(s[FILE_PREFS_PREFIX_LEN:])
98- patterns.extend(file_patterns)
99- for fp in file_patterns:
100- self.pattern_to_section[fp] = s
101- if len(patterns) < len(sections):
102- unknowns = [s for s in sections
103- if not s.startswith(FILE_PREFS_PREFIX)]
104- raise errors.UnknownRules(unknowns)
105- elif patterns:
106- self._globster = globbing._OrderedGlobster(patterns)
107- else:
108- self._globster = None
109-
110- def get_items(self, path):
111- """See _RulesSearcher.get_items."""
112- if self._globster is None:
113- return ()
114- pat = self._globster.match(path)
115- if pat is None:
116- return ()
117- else:
118- all = self._cfg[self.pattern_to_section[pat]]
119- return tuple(all.items())
120-
121- def get_selected_items(self, path, names):
122- """See _RulesSearcher.get_selected_items."""
123- if self._globster is None:
124- return ()
125- pat = self._globster.match(path)
126- if pat is None:
127- return ()
128- else:
129- all = self._cfg[self.pattern_to_section[pat]]
130- return tuple((k, all.get(k)) for k in names)
131-
132-
133-class _StackedRulesSearcher(_RulesSearcher):
134-
135- def __init__(self, searchers):
136- """Construct a _RulesSearcher based on a stack of other ones.
137-
138- :param searchers: a sequence of searchers.
139- """
140- self.searchers = searchers
141-
142- def get_items(self, path):
143- """See _RulesSearcher.get_items."""
144- for searcher in self.searchers:
145- result = searcher.get_items(path)
146- if result:
147- return result
148- return ()
149-
150- def get_selected_items(self, path, names):
151- """See _RulesSearcher.get_selected_items."""
152- for searcher in self.searchers:
153- result = searcher.get_selected_items(path, names)
154- if result:
155- return result
156- return ()
157-
158-
159-def rules_filename():
160- """Return the default rules filename."""
161- return osutils.pathjoin(config.config_dir(), 'rules')
162-
163-
164-def reset_rules():
165- global _per_user_searcher
166- _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
167-
168-reset_rules()
169
170=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib/util'
171=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib/util/configobj'
172=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/util/configobj/__init__.py'
173=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py'
174--- .pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py 2010-08-07 00:54:52 +0000
175+++ .pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py 1970-01-01 00:00:00 +0000
176@@ -1,195 +0,0 @@
177-# Copyright (C) 2005-2010 Canonical Ltd
178-#
179-# This program is free software; you can redistribute it and/or modify
180-# it under the terms of the GNU General Public License as published by
181-# the Free Software Foundation; either version 2 of the License, or
182-# (at your option) any later version.
183-#
184-# This program is distributed in the hope that it will be useful,
185-# but WITHOUT ANY WARRANTY; without even the implied warranty of
186-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
187-# GNU General Public License for more details.
188-#
189-# You should have received a copy of the GNU General Public License
190-# along with this program; if not, write to the Free Software
191-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
192-
193-"""XML externalization support."""
194-
195-# "XML is like violence: if it doesn't solve your problem, you aren't
196-# using enough of it." -- various
197-
198-# importing this module is fairly slow because it has to load several
199-# ElementTree bits
200-
201-from bzrlib.serializer import Serializer
202-from bzrlib.trace import mutter
203-
204-try:
205- try:
206- # it's in this package in python2.5
207- from xml.etree.cElementTree import (ElementTree, SubElement, Element,
208- XMLTreeBuilder, fromstring, tostring)
209- import xml.etree as elementtree
210- except ImportError:
211- from cElementTree import (ElementTree, SubElement, Element,
212- XMLTreeBuilder, fromstring, tostring)
213- import elementtree.ElementTree
214- ParseError = SyntaxError
215-except ImportError:
216- mutter('WARNING: using slower ElementTree; consider installing cElementTree'
217- " and make sure it's on your PYTHONPATH")
218- # this copy is shipped with bzr
219- from util.elementtree.ElementTree import (ElementTree, SubElement,
220- Element, XMLTreeBuilder,
221- fromstring, tostring)
222- import util.elementtree as elementtree
223- from xml.parsers.expat import ExpatError as ParseError
224-
225-from bzrlib import errors
226-
227-
228-class XMLSerializer(Serializer):
229- """Abstract XML object serialize/deserialize"""
230-
231- squashes_xml_invalid_characters = True
232-
233- def read_inventory_from_string(self, xml_string, revision_id=None,
234- entry_cache=None, return_from_cache=False):
235- """Read xml_string into an inventory object.
236-
237- :param xml_string: The xml to read.
238- :param revision_id: If not-None, the expected revision id of the
239- inventory. Some serialisers use this to set the results' root
240- revision. This should be supplied for deserialising all
241- from-repository inventories so that xml5 inventories that were
242- serialised without a revision identifier can be given the right
243- revision id (but not for working tree inventories where users can
244- edit the data without triggering checksum errors or anything).
245- :param entry_cache: An optional cache of InventoryEntry objects. If
246- supplied we will look up entries via (file_id, revision_id) which
247- should map to a valid InventoryEntry (File/Directory/etc) object.
248- :param return_from_cache: Return entries directly from the cache,
249- rather than copying them first. This is only safe if the caller
250- promises not to mutate the returned inventory entries, but it can
251- make some operations significantly faster.
252- """
253- try:
254- return self._unpack_inventory(fromstring(xml_string), revision_id,
255- entry_cache=entry_cache,
256- return_from_cache=return_from_cache)
257- except ParseError, e:
258- raise errors.UnexpectedInventoryFormat(e)
259-
260- def read_inventory(self, f, revision_id=None):
261- try:
262- try:
263- return self._unpack_inventory(self._read_element(f),
264- revision_id=None)
265- finally:
266- f.close()
267- except ParseError, e:
268- raise errors.UnexpectedInventoryFormat(e)
269-
270- def write_revision(self, rev, f):
271- self._write_element(self._pack_revision(rev), f)
272-
273- def write_revision_to_string(self, rev):
274- return tostring(self._pack_revision(rev)) + '\n'
275-
276- def read_revision(self, f):
277- return self._unpack_revision(self._read_element(f))
278-
279- def read_revision_from_string(self, xml_string):
280- return self._unpack_revision(fromstring(xml_string))
281-
282- def _write_element(self, elt, f):
283- ElementTree(elt).write(f, 'utf-8')
284- f.write('\n')
285-
286- def _read_element(self, f):
287- return ElementTree().parse(f)
288-
289-
290-# performance tuning for elementree's serialiser. This should be
291-# sent upstream - RBC 20060523.
292-# the functions here are patched into elementtree at runtime.
293-import re
294-escape_re = re.compile("[&'\"<>]")
295-escape_map = {
296- "&":'&amp;',
297- "'":"&apos;", # FIXME: overkill
298- "\"":"&quot;",
299- "<":"&lt;",
300- ">":"&gt;",
301- }
302-def _escape_replace(match, map=escape_map):
303- return map[match.group()]
304-
305-def _escape_attrib(text, encoding=None, replace=None):
306- # escape attribute value
307- try:
308- if encoding:
309- try:
310- text = elementtree.ElementTree._encode(text, encoding)
311- except UnicodeError:
312- return elementtree.ElementTree._encode_entity(text)
313- if replace is None:
314- return escape_re.sub(_escape_replace, text)
315- else:
316- text = replace(text, "&", "&amp;")
317- text = replace(text, "'", "&apos;") # FIXME: overkill
318- text = replace(text, "\"", "&quot;")
319- text = replace(text, "<", "&lt;")
320- text = replace(text, ">", "&gt;")
321- return text
322- except (TypeError, AttributeError):
323- elementtree.ElementTree._raise_serialization_error(text)
324-
325-elementtree.ElementTree._escape_attrib = _escape_attrib
326-
327-escape_cdata_re = re.compile("[&<>]")
328-escape_cdata_map = {
329- "&":'&amp;',
330- "<":"&lt;",
331- ">":"&gt;",
332- }
333-def _escape_cdata_replace(match, map=escape_cdata_map):
334- return map[match.group()]
335-
336-def _escape_cdata(text, encoding=None, replace=None):
337- # escape character data
338- try:
339- if encoding:
340- try:
341- text = elementtree.ElementTree._encode(text, encoding)
342- except UnicodeError:
343- return elementtree.ElementTree._encode_entity(text)
344- if replace is None:
345- return escape_cdata_re.sub(_escape_cdata_replace, text)
346- else:
347- text = replace(text, "&", "&amp;")
348- text = replace(text, "<", "&lt;")
349- text = replace(text, ">", "&gt;")
350- return text
351- except (TypeError, AttributeError):
352- elementtree.ElementTree._raise_serialization_error(text)
353-
354-elementtree.ElementTree._escape_cdata = _escape_cdata
355-
356-
357-def escape_invalid_chars(message):
358- """Escape the XML-invalid characters in a commit message.
359-
360- :param message: Commit message to escape
361- :return: tuple with escaped message and number of characters escaped
362- """
363- if message is None:
364- return None, 0
365- # Python strings can include characters that can't be
366- # represented in well-formed XML; escape characters that
367- # aren't listed in the XML specification
368- # (http://www.w3.org/TR/REC-xml/#NT-Char).
369- return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
370- lambda match: match.group(0).encode('unicode_escape'),
371- message)
372
373=== added directory '.pc/debian-changes-2.2.1-0ubuntu1'
374=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib'
375=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py'
376--- .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py 1970-01-01 00:00:00 +0000
377+++ .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py 2011-09-27 11:59:19 +0000
378@@ -0,0 +1,155 @@
379+# Copyright (C) 2008 Canonical Ltd
380+#
381+# This program is free software; you can redistribute it and/or modify
382+# it under the terms of the GNU General Public License as published by
383+# the Free Software Foundation; either version 2 of the License, or
384+# (at your option) any later version.
385+#
386+# This program is distributed in the hope that it will be useful,
387+# but WITHOUT ANY WARRANTY; without even the implied warranty of
388+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
389+# GNU General Public License for more details.
390+#
391+# You should have received a copy of the GNU General Public License
392+# along with this program; if not, write to the Free Software
393+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
394+
395+"""Rule-based definition of preferences for selected files in selected branches.
396+
397+See ``bzr help rules`` for details.
398+"""
399+
400+from bzrlib import (
401+ config,
402+ cmdline,
403+ errors,
404+ globbing,
405+ osutils,
406+ )
407+from bzrlib.util.configobj import configobj
408+
409+
410+# Name of the file holding rules in a tree
411+RULES_TREE_FILENAME = ".bzrrules"
412+
413+# Namespace prefix for per file preferences
414+FILE_PREFS_PREFIX = 'name '
415+FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
416+
417+# The object providing default rules
418+_per_user_searcher = None
419+
420+
421+class _RulesSearcher(object):
422+ """An object that provides rule-based preferences."""
423+
424+ def get_items(self, path):
425+ """Return the preferences for a path as name,value tuples.
426+
427+ :param path: tree relative path
428+ :return: () if no rule matched, otherwise a sequence of name,value
429+ tuples.
430+ """
431+ raise NotImplementedError(self.get_items)
432+
433+ def get_selected_items(self, path, names):
434+ """Return selected preferences for a path as name,value tuples.
435+
436+ :param path: tree relative path
437+ :param names: the list of preferences to lookup
438+ :return: () if no rule matched, otherwise a sequence of name,value
439+ tuples. The sequence is the same length as names,
440+ tuple order matches the order in names, and
441+ undefined preferences are given the value None.
442+ """
443+ raise NotImplementedError(self.get_selected_items)
444+
445+
446+class _IniBasedRulesSearcher(_RulesSearcher):
447+
448+ def __init__(self, inifile):
449+ """Construct a _RulesSearcher based on an ini file.
450+
451+ The content will be decoded as utf-8.
452+
453+ :param inifile: the name of the file or a sequence of lines.
454+ """
455+ options = {'encoding': 'utf-8'}
456+ self._cfg = configobj.ConfigObj(inifile, options=options)
457+ sections = self._cfg.keys()
458+ patterns = []
459+ self.pattern_to_section = {}
460+ for s in sections:
461+ if s.startswith(FILE_PREFS_PREFIX):
462+ file_patterns = cmdline.split(s[FILE_PREFS_PREFIX_LEN:])
463+ patterns.extend(file_patterns)
464+ for fp in file_patterns:
465+ self.pattern_to_section[fp] = s
466+ if len(patterns) < len(sections):
467+ unknowns = [s for s in sections
468+ if not s.startswith(FILE_PREFS_PREFIX)]
469+ raise errors.UnknownRules(unknowns)
470+ elif patterns:
471+ self._globster = globbing._OrderedGlobster(patterns)
472+ else:
473+ self._globster = None
474+
475+ def get_items(self, path):
476+ """See _RulesSearcher.get_items."""
477+ if self._globster is None:
478+ return ()
479+ pat = self._globster.match(path)
480+ if pat is None:
481+ return ()
482+ else:
483+ all = self._cfg[self.pattern_to_section[pat]]
484+ return tuple(all.items())
485+
486+ def get_selected_items(self, path, names):
487+ """See _RulesSearcher.get_selected_items."""
488+ if self._globster is None:
489+ return ()
490+ pat = self._globster.match(path)
491+ if pat is None:
492+ return ()
493+ else:
494+ all = self._cfg[self.pattern_to_section[pat]]
495+ return tuple((k, all.get(k)) for k in names)
496+
497+
498+class _StackedRulesSearcher(_RulesSearcher):
499+
500+ def __init__(self, searchers):
501+ """Construct a _RulesSearcher based on a stack of other ones.
502+
503+ :param searchers: a sequence of searchers.
504+ """
505+ self.searchers = searchers
506+
507+ def get_items(self, path):
508+ """See _RulesSearcher.get_items."""
509+ for searcher in self.searchers:
510+ result = searcher.get_items(path)
511+ if result:
512+ return result
513+ return ()
514+
515+ def get_selected_items(self, path, names):
516+ """See _RulesSearcher.get_selected_items."""
517+ for searcher in self.searchers:
518+ result = searcher.get_selected_items(path, names)
519+ if result:
520+ return result
521+ return ()
522+
523+
524+def rules_filename():
525+ """Return the default rules filename."""
526+ return osutils.pathjoin(config.config_dir(), 'rules')
527+
528+
529+def reset_rules():
530+ global _per_user_searcher
531+ _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
532+
533+reset_rules()
534
535=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util'
536=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util/configobj'
537=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util/configobj/__init__.py'
538=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py'
539--- .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py 1970-01-01 00:00:00 +0000
540+++ .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py 2011-09-27 11:59:19 +0000
541@@ -0,0 +1,197 @@
542+# Copyright (C) 2005-2010 Canonical Ltd
543+#
544+# This program is free software; you can redistribute it and/or modify
545+# it under the terms of the GNU General Public License as published by
546+# the Free Software Foundation; either version 2 of the License, or
547+# (at your option) any later version.
548+#
549+# This program is distributed in the hope that it will be useful,
550+# but WITHOUT ANY WARRANTY; without even the implied warranty of
551+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
552+# GNU General Public License for more details.
553+#
554+# You should have received a copy of the GNU General Public License
555+# along with this program; if not, write to the Free Software
556+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
557+
558+"""XML externalization support."""
559+
560+# "XML is like violence: if it doesn't solve your problem, you aren't
561+# using enough of it." -- various
562+
563+# importing this module is fairly slow because it has to load several
564+# ElementTree bits
565+
566+from bzrlib.serializer import Serializer
567+from bzrlib.trace import mutter
568+
569+try:
570+ try:
571+ # it's in this package in python2.5
572+ from xml.etree.cElementTree import (ElementTree, SubElement, Element,
573+ XMLTreeBuilder, fromstring, tostring)
574+ import xml.etree as elementtree
575+ # Also import ElementTree module so monkey-patching below always works
576+ import xml.etree.ElementTree
577+ except ImportError:
578+ from cElementTree import (ElementTree, SubElement, Element,
579+ XMLTreeBuilder, fromstring, tostring)
580+ import elementtree.ElementTree
581+ ParseError = SyntaxError
582+except ImportError:
583+ mutter('WARNING: using slower ElementTree; consider installing cElementTree'
584+ " and make sure it's on your PYTHONPATH")
585+ # this copy is shipped with bzr
586+ from util.elementtree.ElementTree import (ElementTree, SubElement,
587+ Element, XMLTreeBuilder,
588+ fromstring, tostring)
589+ import util.elementtree as elementtree
590+ from xml.parsers.expat import ExpatError as ParseError
591+
592+from bzrlib import errors
593+
594+
595+class XMLSerializer(Serializer):
596+ """Abstract XML object serialize/deserialize"""
597+
598+ squashes_xml_invalid_characters = True
599+
600+ def read_inventory_from_string(self, xml_string, revision_id=None,
601+ entry_cache=None, return_from_cache=False):
602+ """Read xml_string into an inventory object.
603+
604+ :param xml_string: The xml to read.
605+ :param revision_id: If not-None, the expected revision id of the
606+ inventory. Some serialisers use this to set the results' root
607+ revision. This should be supplied for deserialising all
608+ from-repository inventories so that xml5 inventories that were
609+ serialised without a revision identifier can be given the right
610+ revision id (but not for working tree inventories where users can
611+ edit the data without triggering checksum errors or anything).
612+ :param entry_cache: An optional cache of InventoryEntry objects. If
613+ supplied we will look up entries via (file_id, revision_id) which
614+ should map to a valid InventoryEntry (File/Directory/etc) object.
615+ :param return_from_cache: Return entries directly from the cache,
616+ rather than copying them first. This is only safe if the caller
617+ promises not to mutate the returned inventory entries, but it can
618+ make some operations significantly faster.
619+ """
620+ try:
621+ return self._unpack_inventory(fromstring(xml_string), revision_id,
622+ entry_cache=entry_cache,
623+ return_from_cache=return_from_cache)
624+ except ParseError, e:
625+ raise errors.UnexpectedInventoryFormat(e)
626+
627+ def read_inventory(self, f, revision_id=None):
628+ try:
629+ try:
630+ return self._unpack_inventory(self._read_element(f),
631+ revision_id=None)
632+ finally:
633+ f.close()
634+ except ParseError, e:
635+ raise errors.UnexpectedInventoryFormat(e)
636+
637+ def write_revision(self, rev, f):
638+ self._write_element(self._pack_revision(rev), f)
639+
640+ def write_revision_to_string(self, rev):
641+ return tostring(self._pack_revision(rev)) + '\n'
642+
643+ def read_revision(self, f):
644+ return self._unpack_revision(self._read_element(f))
645+
646+ def read_revision_from_string(self, xml_string):
647+ return self._unpack_revision(fromstring(xml_string))
648+
649+ def _write_element(self, elt, f):
650+ ElementTree(elt).write(f, 'utf-8')
651+ f.write('\n')
652+
653+ def _read_element(self, f):
654+ return ElementTree().parse(f)
655+
656+
657+# performance tuning for elementree's serialiser. This should be
658+# sent upstream - RBC 20060523.
659+# the functions here are patched into elementtree at runtime.
660+import re
661+escape_re = re.compile("[&'\"<>]")
662+escape_map = {
663+ "&":'&amp;',
664+ "'":"&apos;", # FIXME: overkill
665+ "\"":"&quot;",
666+ "<":"&lt;",
667+ ">":"&gt;",
668+ }
669+def _escape_replace(match, map=escape_map):
670+ return map[match.group()]
671+
672+def _escape_attrib(text, encoding=None, replace=None):
673+ # escape attribute value
674+ try:
675+ if encoding:
676+ try:
677+ text = elementtree.ElementTree._encode(text, encoding)
678+ except UnicodeError:
679+ return elementtree.ElementTree._encode_entity(text)
680+ if replace is None:
681+ return escape_re.sub(_escape_replace, text)
682+ else:
683+ text = replace(text, "&", "&amp;")
684+ text = replace(text, "'", "&apos;") # FIXME: overkill
685+ text = replace(text, "\"", "&quot;")
686+ text = replace(text, "<", "&lt;")
687+ text = replace(text, ">", "&gt;")
688+ return text
689+ except (TypeError, AttributeError):
690+ elementtree.ElementTree._raise_serialization_error(text)
691+
692+elementtree.ElementTree._escape_attrib = _escape_attrib
693+
694+escape_cdata_re = re.compile("[&<>]")
695+escape_cdata_map = {
696+ "&":'&amp;',
697+ "<":"&lt;",
698+ ">":"&gt;",
699+ }
700+def _escape_cdata_replace(match, map=escape_cdata_map):
701+ return map[match.group()]
702+
703+def _escape_cdata(text, encoding=None, replace=None):
704+ # escape character data
705+ try:
706+ if encoding:
707+ try:
708+ text = elementtree.ElementTree._encode(text, encoding)
709+ except UnicodeError:
710+ return elementtree.ElementTree._encode_entity(text)
711+ if replace is None:
712+ return escape_cdata_re.sub(_escape_cdata_replace, text)
713+ else:
714+ text = replace(text, "&", "&amp;")
715+ text = replace(text, "<", "&lt;")
716+ text = replace(text, ">", "&gt;")
717+ return text
718+ except (TypeError, AttributeError):
719+ elementtree.ElementTree._raise_serialization_error(text)
720+
721+elementtree.ElementTree._escape_cdata = _escape_cdata
722+
723+
724+def escape_invalid_chars(message):
725+ """Escape the XML-invalid characters in a commit message.
726+
727+ :param message: Commit message to escape
728+ :return: tuple with escaped message and number of characters escaped
729+ """
730+ if message is None:
731+ return None, 0
732+ # Python strings can include characters that can't be
733+ # represented in well-formed XML; escape characters that
734+ # aren't listed in the XML specification
735+ # (http://www.w3.org/TR/REC-xml/#NT-Char).
736+ return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
737+ lambda match: match.group(0).encode('unicode_escape'),
738+ message)
739
740=== modified file 'Makefile'
741--- Makefile 2010-08-07 00:54:52 +0000
742+++ Makefile 2011-09-27 11:59:19 +0000
743@@ -40,7 +40,7 @@
744
745 check-nodocs: extensions
746 # Generate a stream for PQM to watch.
747- $(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
748+ $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
749 # Check that there were no errors reported.
750 subunit-stats < selftest.log
751
752
753=== modified file 'NEWS'
754--- NEWS 2010-08-07 00:54:52 +0000
755+++ NEWS 2011-09-27 11:59:19 +0000
756@@ -5,6 +5,605 @@
757 .. contents:: List of Releases
758 :depth: 1
759
760+This is a bugfix release. One regression introduced in 2.2b1 has been fixed
761+for some rare conflict resolutions. Also a warning is now emmitted when
762+branching an out-of-date ubuntu packaging branch. Upgrading is recommended
763+for all users on earlier 2.2 releases.
764+
765+bzr 2.2.5
766+#########
767+
768+:2.2.5: 2011-09-01
769+
770+Compatibility Breaks
771+********************
772+
773+None.
774+
775+New Features
776+************
777+
778+None.
779+
780+Bug Fixes
781+*********
782+
783+* Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a
784+ doubly-stacked branch.
785+ (James Westby, Martin Pool, #715000)
786+
787+* Don't crash while merging and encountering obscure path conflicts
788+ involving different root-ids. (Vincent Ladeuil, #805809)
789+
790+Internals
791+*********
792+
793+* Fixed bug in the bundled copy of ConfigObj with quoting of triple quotes
794+ in the value string. Fix suggested by ConfigObj's author Michael Foord.
795+ (Alexander Belchenko, #710410)
796+
797+bzr 2.1.5
798+#########
799+
800+:2.1.5: NOT RELEASED YET
801+
802+Compatibility Breaks
803+********************
804+
805+New Features
806+************
807+
808+Bug Fixes
809+*********
810+
811+* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
812+ checks to see if the most recent published source package version for
813+ that project is present in the branch tags. This should help developers
814+ trust whether the packaging branch is up-to-date and can be used for new
815+ changes. The level of verbosity is controlled by the config item
816+ ``launchpad.packaging_verbosity``. It can be set to one of
817+
818+ off
819+ disable all checks
820+
821+
822+ minimal
823+ only display if the branch is out-of-date
824+
825+ short
826+ also display single-line up-to-date and missing,
827+
828+
829+ all
830+ (default) display multi-line content for all states
831+
832+
833+ (John Arbash Meinel, #609187, #812928)
834+
835+
836+Improvements
837+************
838+
839+Documentation
840+*************
841+
842+API Changes
843+***********
844+
845+Internals
846+*********
847+
848+Testing
849+*******
850+
851+
852+bzr 2.2.4
853+#########
854+
855+:2.2.4: 2011-02-04
856+
857+This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
858+involving only certain operations with launchpad. Upgrading is recommended for
859+all users on earlier 2.2 releases.
860+
861+Bug Fixes
862+*********
863+
864+* Fix communications with the Launchpad web service when using
865+ launchpadlib >= 1.5.5. This was a latent bug in bzr's communication
866+ with Launchpad's production instance, which only became a problem when
867+ the default instance was switched from edge to production in bzr 2.2.3.
868+ (Max Bowsher, #707075)
869+
870+
871+bzr 2.2.3
872+#########
873+
874+:2.2.3: 2011-01-20
875+
876+This is a bugfix release. Upgrading is recommended for all users
877+on earlier 2.2 releases.
878+
879+Compatibility Breaks
880+********************
881+
882+* Launchpad has announced that the ``edge.launchpad.net`` instance is
883+ deprecated and may be shut down in the future
884+ <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
885+ been updated in this release to talk to the main (``launchpad.net``) servers,
886+ rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
887+
888+New Features
889+************
890+
891+(none)
892+
893+Bug Fixes
894+*********
895+
896+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
897+ path on windows from symlink support addition. (Martin [gz], #686611)
898+
899+* Correctly resolve content (and path) conflicts for files in subdirs.
900+ (Vincent Ladeuil, #660935)
901+
902+* Don't probe for a repository from within ``NotBranchError.__repr__``,
903+ because this can cause knock-on errors at awkward times.
904+ (Andrew Bennetts, #687653)
905+
906+* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
907+ concurrent repository pack operation. This was particularly affecting
908+ ``bzr-svn`` users. (Andrew Bennetts, #701940)
909+
910+* ``https`` access works again with recent versions of python2.7.
911+ (Vincent Ladeuil, #693880)
912+
913+* RevisionTree.is_executable no longer returns None for directories and
914+ symlinks. Instead, it returns False, like other Trees and methods.
915+ (Aaron Bentley, #681885)
916+
917+
918+bzr 2.2.2
919+#########
920+
921+:2.2.2: 2010-11-25
922+
923+This is a bugfix release. None of these bugfixes are critical, but upgrading
924+is recommended for all users on earlier 2.2 releases.
925+
926+Bug Fixes
927+*********
928+
929+* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
930+ is involved in a text conflict (but the conflict is still not
931+ resolved). (Vincent Ladeuil, #646961)
932+
933+* Commit in a bound branch or heavyweight checkout now propagates tags
934+ (e.g. from a merge) to the master branch (and informs the user if there
935+ is a conflict). (Andrew Bennetts, #603395)
936+
937+* Correctly set the Content-Type header when http POSTing to comply
938+ with stricter web frameworks. (Vincent Ladeuil, #665100)
939+
940+* ``NotBranchError`` no longer allows errors from calling
941+ ``bzrdir.open_repository()`` to propagate. This is unhelpful at best,
942+ and at worst can trigger infinite loops in callers. (Andrew Bennetts)
943+
944+* Skip tests that needs a bzr source tree when there isn't one. This is
945+ needed to succesfully run the test suite for installed versions.
946+ (Vincent Ladeuil, #644855).
947+
948+* Skip the tests that requires respecting the chmod bits when running as
949+ root. Including the one that wasn't present in 2.1.
950+ (Vincent Ladeuil, #646133)
951+
952+* Using bzr with `lp:` urls behind an http proxy should work.
953+ (Robert Collins, #558343)
954+
955+* Windows installers no longer requires the Microsoft vcredist to be
956+ installed.
957+ (Martin [gz], Gary van der Merwe, #632465)
958+
959+* Close leaked socket to SSH subprocesses, which caused dput sftp uploads
960+ to hang. (Max Bowsher, #659590)
961+
962+Testing
963+*******
964+
965+* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
966+ involving the pycurl https test server fail otherwise when running
967+ selftest from an installed version. (Vincent Ladeuil, #651706)
968+
969+* Fix tests that failed when run under ``LANG=C``.
970+ (Andrew Bennetts, #632387)
971+
972+
973+bzr 2.2.1
974+#########
975+
976+:2.2.1: 2010-09-17
977+
978+This is a bugfix release which also includes bugfixes from 2.0.6 and
979+2.1.3. None are critical, but upgrading is recommended for all users on
980+earlier 2.2 releases.
981+
982+Bug Fixes
983+*********
984+
985+* Additional merges after an unrelated branch has been merged with its
986+ history no longer crash when deleted files are involved.
987+ (Vincent Ladeuil, John Arbash Meinel, #375898)
988+
989+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
990+ previously-unversioned directory within the tree: the directory is
991+ marked versioned too.
992+ (Martin Pool, #192859)
993+
994+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
995+ target of the symlink.
996+ (Martin Pool, John Arbash Meinel, #128562)
997+
998+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
999+ permissions as ``.bzr`` directory on a POSIX OS.
1000+ (Parth Malwankar, #262450)
1001+
1002+* CommitBuilder now uses the committer instead of _config.username to generate
1003+ the revision-id. (Aaron Bentley, #614404)
1004+
1005+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
1006+ way which should help avoid problems with concurrent writers.
1007+ (Vincent Ladeuil, #525571)
1008+
1009+* Cope with Microsoft FTP server that returns reply '250 Directory
1010+ created' when mkdir succeeds. (Martin Pool, #224373)
1011+
1012+* Don't traceback trying to unversion children files of an already
1013+ unversioned directory. (Vincent Ladeuil, #494221)
1014+
1015+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
1016+ contains only NUL bytes). Instead warn the user, and allow ``bzr
1017+ break-lock`` to remove it. (Andrew Bennetts, #619872)
1018+
1019+* Fix ``AttributeError on parent.children`` when adding a file under a
1020+ directory that was a symlink in the previous commit.
1021+ (Martin Pool, #192859)
1022+
1023+* Fix ``AttributeError: 'NoneType' object has no attribute 'close'`` in
1024+ ``_close_ssh_proc`` when using ``bzr+ssh://``. This was causing
1025+ connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
1026+ stderr in some other circumstances. (Andrew Bennetts, #633745)
1027+
1028+* Only call ``setlocale`` in the bzr startup script on posix systems. This
1029+ avoids an issue with the newer windows C runtimes used by Python 2.6 and
1030+ later which can mangle bytestrings printed to the console.
1031+ (Martin [gz], #631350)
1032+
1033+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1034+ which can result in "missing referenced chk root keys" errors when
1035+ fetching from repositories with affected revisions.
1036+ (Andrew Bennetts, #522637)
1037+
1038+* Raise ValueError instead of a string exception.
1039+ (John Arbash Meinel, #586926)
1040+
1041+* Reduce peak memory by one copy of compressed text.
1042+ (John Arbash Meinel, #566940)
1043+
1044+* Repositories accessed via a smart server now reject being stacked on a
1045+ repository in an incompatible format, as is the case when accessing them
1046+ via other methods. This was causing fetches from those repositories via
1047+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
1048+ (Andrew Bennetts, #562380)
1049+
1050+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
1051+ error. This error was caused by 2.0 not being updated when upstream
1052+ python merged the end of run patch, which chose ``stopTestRun`` rather than
1053+ ``done``. (Robert Collins, #571437)
1054+
1055+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
1056+ being thrown from ``xml_serializer`` on certain cElementTree setups.
1057+ (Martin [gz], #254278)
1058+
1059+* Upgrading or fetching from a non-rich-root repository to a rich-root
1060+ repository (e.g. from pack-0.92 to 2a) no longer fails with
1061+ ``'Inter1and2Helper' object has no attribute 'source_repo'``. This was
1062+ a regression from Bazaar 2.1. (Andrew Bennetts, #636930)
1063+
1064+* When passing a file to ``UTF8DirReader`` make sure to close the current
1065+ directory file handle after the chdir fails. Otherwise when passing many
1066+ filenames into a command line ``bzr status`` we would leak descriptors.
1067+ (John Arbash Meinel, #583486)
1068+
1069+Documentation
1070+*************
1071+
1072+* Fix a lot of references in the docs to the old http://bazaar-vcs.org to
1073+ the new http://bazaar.canonical.com or http://wiki.bazaar.canonical.com
1074+ (John Arbash Meinel, #617503)
1075+
1076+Internals
1077+*********
1078+
1079+* Remove used and broken code path in ``BranchInitHookParams.__repr__``.
1080+ (Andrew Bennetts)
1081+
1082+Testing
1083+*******
1084+
1085+* ``build_tree_contents`` can create symlinks.
1086+ (Martin Pool, John Arbash Meinel)
1087+
1088+* Tracebacks from a parameterized test are no longer reported against every
1089+ parameterization of that test. This was done by adding a hack to
1090+ ``bzrlib.tests.clone_test`` so that it no longer causes
1091+ testtools.TestCase instances to share a details dict.
1092+ (Andrew Bennetts, #625574)
1093+
1094+
1095+bzr 2.1.4
1096+#########
1097+
1098+:2.1.4: 2011-05-16
1099+
1100+The fourth release in our 2.1 series addresses some user-inconvenience bugs.
1101+None are critical, but upgrading is recommended for all users on earlier 2.1
1102+releases.
1103+
1104+
1105+Compatibility Breaks
1106+********************
1107+
1108+* Launchpad has announced that the ``edge.launchpad.net`` instance is
1109+ deprecated and may be shut down in the future
1110+ <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
1111+ been updated in this release to talk to the main (``launchpad.net``) servers,
1112+ rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
1113+
1114+New Features
1115+************
1116+
1117+None.
1118+
1119+Bug Fixes
1120+*********
1121+
1122+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
1123+ path on windows from symlink support addition. (Martin [gz], #686611)
1124+
1125+* Skip tests that needs a bzr source tree when there isn't one. This is
1126+ needed to succesfully run the test suite for installed versions.
1127+ (Vincent Ladeuil, #644855).
1128+
1129+* Skip the tests that requires respecting the chmod bits when running as root.
1130+ (Vincent Ladeuil, #646133)
1131+
1132+* Using bzr with `lp:` urls behind an http proxy should work.
1133+ (Robert Collins, #558343)
1134+
1135+Improvements
1136+************
1137+
1138+Documentation
1139+*************
1140+
1141+API Changes
1142+***********
1143+
1144+Internals
1145+*********
1146+
1147+Testing
1148+*******
1149+
1150+
1151+bzr 2.1.3
1152+#########
1153+
1154+:Codename: Do run run
1155+:2.1.3: 2010-09-17
1156+
1157+The third release in our 2.1 series addresses several user-inconvenience bugs
1158+(and includes the fixes done in 2.0.6). None are critical, but upgrading is
1159+recommended for all users on earlier 2.1 releases.
1160+
1161+Bug Fixes
1162+*********
1163+
1164+* Additional merges after an unrelated branch has been merged with its
1165+ history no longer crash when deleted files are involved.
1166+ (Vincent Ladeuil, John Arbash Meinel, #375898)
1167+
1168+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
1169+ previously-unversioned directory within the tree: the directory is
1170+ marked versioned too.
1171+ (Martin Pool, #192859)
1172+
1173+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
1174+ target of the symlink.
1175+ (Martin Pool, John Arbash Meinel, #128562)
1176+
1177+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1178+ permissions as ``.bzr`` directory on a POSIX OS.
1179+ (Parth Malwankar, #262450)
1180+
1181+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
1182+ way which should help avoid problems with concurrent writers.
1183+ (Vincent Ladeuil, #525571)
1184+
1185+* Don't traceback trying to unversion children files of an already
1186+ unversioned directory. (Vincent Ladeuil, #494221)
1187+
1188+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
1189+ contains only NUL bytes). Instead warn the user, and allow ``bzr
1190+ break-lock`` to remove it. (Andrew Bennetts, #619872)
1191+
1192+* Fix ``AttributeError on parent.children`` when adding a file under a
1193+ directory that was a symlink in the previous commit.
1194+ (Martin Pool, #192859)
1195+
1196+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1197+ which can result in "missing referenced chk root keys" errors when
1198+ fetching from repositories with affected revisions.
1199+ (Andrew Bennetts, #522637)
1200+
1201+* Raise ValueError instead of a string exception.
1202+ (John Arbash Meinel, #586926)
1203+
1204+* Reduce peak memory by one copy of compressed text.
1205+ (John Arbash Meinel, #566940)
1206+
1207+* Repositories accessed via a smart server now reject being stacked on a
1208+ repository in an incompatible format, as is the case when accessing them
1209+ via other methods. This was causing fetches from those repositories via
1210+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
1211+ (Andrew Bennetts, #562380)
1212+
1213+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
1214+ error. This error was caused by 2.0 not being updated when upstream
1215+ python merged the end of run patch, which chose ``stopTestRun`` rather than
1216+ ``done``. (Robert Collins, #571437)
1217+
1218+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
1219+ being thrown from ``xml_serializer`` on certain cElementTree setups.
1220+ (Martin [gz], #254278)
1221+
1222+* When passing a file to ``UTF8DirReader`` make sure to close the current
1223+ directory file handle after the chdir fails. Otherwise when passing many
1224+ filenames into a command line ``bzr status`` we would leak descriptors.
1225+ (John Arbash Meinel, #583486)
1226+
1227+Testing
1228+*******
1229+
1230+* ``build_tree_contents`` can create symlinks.
1231+ (Martin Pool, John Arbash Meinel)
1232+
1233+
1234+bzr 2.0.7
1235+#########
1236+
1237+:2.0.7: NOT RELEASED YET
1238+
1239+Compatibility Breaks
1240+********************
1241+
1242+* Launchpad has announced that the ``edge.launchpad.net`` instance is
1243+ deprecated and may be shut down in the future
1244+ <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
1245+ been updated in this release to talk to the main (``launchpad.net``) servers,
1246+ rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
1247+
1248+New Features
1249+************
1250+
1251+Bug Fixes
1252+*********
1253+
1254+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
1255+ path on windows from symlink support addition. (Martin [gz], #686611)
1256+
1257+* Avoid spurious ValueErrors when autopacking a subset of the repository,
1258+ and seeing a revision without its related inventory
1259+ (John Arbash Meinel, #437003)
1260+
1261+* Fix activity reporting for pycurl when using https with some
1262+ implementations of curl. (Vincent Ladeuil, #614713)
1263+
1264+Improvements
1265+************
1266+
1267+Documentation
1268+*************
1269+
1270+API Changes
1271+***********
1272+
1273+Internals
1274+*********
1275+
1276+Testing
1277+*******
1278+
1279+
1280+bzr 2.0.6
1281+#########
1282+
1283+:2.0.6: 2010-09-17
1284+
1285+The sixth release in our 2.0 series addresses several user-inconvenience
1286+bugs. None are critical, but upgrading is recommended for all users on
1287+earlier 2.0 releases.
1288+
1289+Bug Fixes
1290+*********
1291+
1292+* Additional merges after an unrelated branch has been merged with its
1293+ history no longer crash when deleted files are involved.
1294+ (Vincent Ladeuil, John Arbash Meinel, #375898)
1295+
1296+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
1297+ previously-unversioned directory within the tree: the directory is
1298+ marked versioned too.
1299+ (Martin Pool, #192859)
1300+
1301+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
1302+ target of the symlink.
1303+ (Martin Pool, John Arbash Meinel, #128562)
1304+
1305+* ``bzr revert`` now only takes write lock on working tree, instead of on
1306+ both working tree and branch.
1307+ (Danny van Heumen, #498409)
1308+
1309+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1310+ permissions as ``.bzr`` directory on a POSIX OS.
1311+ (Parth Malwankar, #262450)
1312+
1313+* Don't traceback trying to unversion children files of an already
1314+ unversioned directory. (Vincent Ladeuil, #494221)
1315+
1316+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
1317+ contains only NUL bytes). Instead warn the user, and allow ``bzr
1318+ break-lock`` to remove it. (Andrew Bennetts, #619872)
1319+
1320+* Fix ``AttributeError on parent.children`` when adding a file under a
1321+ directory that was a symlink in the previous commit.
1322+ (Martin Pool, #192859)
1323+
1324+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1325+ which can result in "missing referenced chk root keys" errors when
1326+ fetching from repositories with affected revisions.
1327+ (Andrew Bennetts, #522637)
1328+
1329+* Raise ValueError instead of a string exception.
1330+ (John Arbash Meinel, #586926)
1331+
1332+* Reduce peak memory by one copy of compressed text.
1333+ (John Arbash Meinel, #566940)
1334+
1335+* Repositories accessed via a smart server now reject being stacked on a
1336+ repository in an incompatible format, as is the case when accessing them
1337+ via other methods. This was causing fetches from those repositories via
1338+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
1339+ (Andrew Bennetts, #562380)
1340+
1341+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
1342+ error. This error was caused by 2.0 not being updated when upstream
1343+ python merged the end of run patch, which chose ``stopTestRun`` rather than
1344+ ``done``. (Robert Collins, #571437)
1345+
1346+* When passing a file to ``UTF8DirReader`` make sure to close the current
1347+ directory file handle after the chdir fails. Otherwise when passing many
1348+ filenames into a command line ``bzr status`` we would leak descriptors.
1349+ (John Arbash Meinel, #583486)
1350+
1351+
1352+Testing
1353+*******
1354+
1355+* ``build_tree_contents`` can create symlinks.
1356+ (Martin Pool, John Arbash Meinel)
1357+
1358+
1359 bzr 2.2
1360 #######
1361
1362@@ -58,7 +657,7 @@
1363 * Don't traceback trying to unversion children files of an already
1364 unversioned directory. (Vincent Ladeuil, #494221)
1365
1366-* ``HTTP/1.1` test servers now set a ``Content-Length`` header to comply
1367+* ``HTTP/1.1`` test servers now set a ``Content-Length`` header to comply
1368 with pedantic ``HTTP/1.1`` clients. (Vincent Ladeuil, #568421)
1369
1370 * Progress bars prefer to truncate the text message rather than the
1371@@ -102,7 +701,7 @@
1372 #########
1373
1374 :Codename: Monkey Magic
1375-:2.2b4: 2004-07-09
1376+:2.2b4: 2010-07-10
1377
1378
1379 This fourth and final beta in the 2.2 series now stabilizes the internal
1380@@ -609,6 +1208,63 @@
1381 executables on the ``PATH``. Migrated from bash_completion plugin.
1382 (Martin von Gagern)
1383
1384+bzr 2.1.2
1385+#########
1386+
1387+:2.1.2: 2010-05-28
1388+
1389+This release fixes two critical networking issues with older servers and
1390+with interrupted system call errors when pushing or pulling. We recommend
1391+upgrading to anyone running a 2.1.x version of bzr.
1392+
1393+Bug Fixes
1394+*********
1395+
1396+* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
1397+ support of bzr-externals and scmproj plugins.
1398+ (Alexander Belchenko, bug #572098)
1399+
1400+* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
1401+ (Aaron Bentley, #559436)
1402+
1403+* Do not register a SIGWINCH signal handler, instead just poll for the
1404+ terminal width as needed. This avoids the "Interrupted System Call"
1405+ problems that occur on POSIX with all currently released versions of
1406+ Python.
1407+ (Andrew Bennetts, #583941)
1408+
1409+* Fixed ``AssertionError`` when accessing smart servers running Bazaar
1410+ versions before 1.6.
1411+ (Andrew Bennetts, #528041)
1412+
1413+* Reset ``siginterrupt`` flag to False every time we handle a signal
1414+ installed with ``set_signal_handler(..., restart_syscall=True)`` (from
1415+ ``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
1416+ errors compared to registering ``signal.signal`` directly.
1417+ (Andrew Bennetts)
1418+
1419+* Reduce peak memory by one copy of compressed text.
1420+ (John Arbash Meinel, #566940)
1421+
1422+* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
1423+ (John Arbash Meinel, #582656)
1424+
1425+* When passing a file to ``UTF8DirReader`` make sure to close the current
1426+ directory file handle after the chdir fails. Otherwise when passing many
1427+ filenames into a command line ``bzr status`` we would leak descriptors.
1428+ (John Arbash Meinel, #583486)
1429+
1430+Internals
1431+*********
1432+
1433+* ``_remember_remote_is_before`` no longer raises AssertionError when
1434+ suboptimal network behaviour is noticed; instead it just mutters to the
1435+ log file (and warns the user if they have set the ``hpss`` debug flag).
1436+ This was causing unnecessary aborts for performance bugs that are minor
1437+ at worst.
1438+ (Andrew Bennetts, #528041)
1439+
1440+
1441 bzr 2.2b2
1442 #########
1443
1444@@ -796,8 +1452,8 @@
1445 without specific permission from the user. (Martin Pool, #515052)
1446
1447 * Parsing of command lines, for example in ``diff --using``, no longer
1448- treats backslash as an escape character on Windows. (Gordon Tyler,
1449- #392248)
1450+ treats backslash as an escape character on Windows.
1451+ (Gordon Tyler, #392428)
1452
1453 * Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
1454 a list of plugin names separated by ':' (';' on windows).
1455@@ -1032,108 +1688,6 @@
1456 happens, and another warning will be written if the log file could not
1457 be closed after retrying 100 times. (Andrew Bennetts, #531746)
1458
1459-bzr 2.1.3
1460-#########
1461-
1462-:Codename: Do run run
1463-:2.1.3: NOT RELEASED YET
1464-
1465-Compatibility Breaks
1466-********************
1467-
1468-New Features
1469-************
1470-
1471-Bug Fixes
1472-*********
1473-
1474-* Configuration files in ``${BZR_HOME}`` are now written in an atomic
1475- way which should help avoid problems with concurrent writers.
1476- (Vincent Ladeuil, #525571)
1477-
1478-* Don't traceback trying to unversion children files of an already
1479- unversioned directory. (Vincent Ladeuil, #494221)
1480-
1481-* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1482- which can result in "missing referenced chk root keys" errors when
1483- fetching from repositories with affected revisions.
1484- (Andrew Bennetts, #522637)
1485-
1486-* Raise ValueError instead of a string exception.
1487- (John Arbash Meinel, #586926)
1488-
1489-Improvements
1490-************
1491-
1492-Documentation
1493-*************
1494-
1495-API Changes
1496-***********
1497-
1498-Internals
1499-*********
1500-
1501-Testing
1502-*******
1503-
1504-bzr 2.1.2
1505-#########
1506-
1507-:2.1.2: 2010-05-28
1508-
1509-This release fixes two critical networking issues with older servers and
1510-with interrupted system call errors when pushing or pulling. We recommend
1511-upgrading to anyone running a 2.1.x version of bzr.
1512-
1513-Bug Fixes
1514-*********
1515-
1516-* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
1517- support of bzr-externals and scmproj plugins.
1518- (Alexander Belchenko, bug #572098)
1519-
1520-* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
1521- (Aaron Bentley, #559436)
1522-
1523-* Do not register a SIGWINCH signal handler, instead just poll for the
1524- terminal width as needed. This avoids the "Interrupted System Call"
1525- problems that occur on POSIX with all currently released versions of
1526- Python.
1527- (Andrew Bennetts, #583941)
1528-
1529-* Fixed ``AssertionError`` when accessing smart servers running Bazaar
1530- versions before 1.6.
1531- (Andrew Bennetts, #528041)
1532-
1533-* Reset ``siginterrupt`` flag to False every time we handle a signal
1534- installed with ``set_signal_handler(..., restart_syscall=True)`` (from
1535- ``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
1536- errors compared to registering ``signal.signal`` directly.
1537- (Andrew Bennetts)
1538-
1539-* Reduce peak memory by one copy of compressed text.
1540- (John Arbash Meinel, #566940)
1541-
1542-* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
1543- (John Arbash Meinel, #582656)
1544-
1545-* When passing a file to ``UTF8DirReader`` make sure to close the current
1546- directory file handle after the chdir fails. Otherwise when passing many
1547- filenames into a command line ``bzr status`` we would leak descriptors.
1548- (John Arbash Meinel, #583486)
1549-
1550-Internals
1551-*********
1552-
1553-* ``_remember_remote_is_before`` no longer raises AssertionError when
1554- suboptimal network behaviour is noticed; instead it just mutters to the
1555- log file (and warns the user if they have set the ``hpss`` debug flag).
1556- This was causing unnecessary aborts for performance bugs that are minor
1557- at worst.
1558- (Andrew Bennetts, #528041)
1559-
1560-
1561 bzr 2.1.1
1562 #########
1563
1564@@ -1199,6 +1753,65 @@
1565 (Andrew Bennetts, #496813)
1566
1567
1568+bzr 2.0.5
1569+#########
1570+
1571+:2.0.5: 2010-03-23
1572+
1573+This fifth release in our 2.0 series addresses several user-inconvenience
1574+bugs. None are critical, but upgrading is recommended for all users on
1575+earlier 2.0 releases.
1576+
1577+Bug Fixes
1578+*********
1579+
1580+* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1581+ (Martin Pool, #331095)
1582+
1583+* Concurrent autopacking is more resilient to already-renamed pack files.
1584+ If we find that a file we are about to obsolete is already obsoleted, we
1585+ do not try to rename it, and we leave the file in ``obsolete_packs``.
1586+ The code is also fault tolerant if a file goes missing, assuming that
1587+ another process already removed the file.
1588+ (John Arbash Meinel, Gareth White, #507557)
1589+
1590+* Cope with the lockdir ``held/info`` file being empty, which seems to
1591+ happen fairly often if the process is suddenly interrupted while taking
1592+ a lock.
1593+ (Martin Pool, #185103)
1594+
1595+* Give the warning about potentially slow cross-format fetches much
1596+ earlier on in the fetch operation. Don't show this message during
1597+ upgrades, and show the correct format indication for remote
1598+ repositories.
1599+ (Martin Pool, #456077, #515356, #513157)
1600+
1601+* Handle renames correctly when there are files or directories that
1602+ differ only in case. (Chris Jones, Martin Pool, #368931)
1603+
1604+* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
1605+ error, report that error rather than failing with an unhelpful
1606+ ``UnboundLocalError``.
1607+ (Andrew Bennetts, #423563)
1608+
1609+* Running ``bzr`` command without any arguments now shows bzr
1610+ version number along with rest of the help text.
1611+ (Parth Malwankar, #369501)
1612+
1613+* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
1614+ errors.
1615+ (Inada Naoki, #524560)
1616+
1617+Documentation
1618+*************
1619+
1620+* Added ``location-alias`` help topic.
1621+ (Andrew Bennetts, #337834)
1622+
1623+* Fixed CHM generation by moving the NEWS section template into
1624+ a separate file. (Ian Clatworthy, #524184)
1625+
1626+
1627 bzr 2.1.0
1628 #########
1629
1630@@ -1552,127 +2165,6 @@
1631 tests that 'failed' - they're all just failures.
1632 (Martin Pool)
1633
1634-bzr 2.0.6
1635-#########
1636-
1637-:2.0.6: NOT RELEASED YET
1638-
1639-Bug Fixes
1640-*********
1641-
1642-* Additional merges after an unrelated branch has been merged with its
1643- history no longer crash when deleted files are involved.
1644- (Vincent Ladeuil, John Arbash Meinel, #375898)
1645-
1646-* ``bzr commit SYMLINK`` now works, rather than trying to commit the
1647- target of the symlink.
1648- (Martin Pool, John Arbash Meinel, #128562)
1649-
1650-* ``bzr revert`` now only takes write lock on working tree, instead of on
1651- both working tree and branch.
1652- (Danny van Heumen, #498409)
1653-
1654-* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
1655- permissions as ``.bzr`` directory on a POSIX OS.
1656- (Parth Malwankar, #262450)
1657-
1658-* Don't traceback trying to unversion children files of an already
1659- unversioned directory. (Vincent Ladeuil, #494221)
1660-
1661-* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
1662- which can result in "missing referenced chk root keys" errors when
1663- fetching from repositories with affected revisions.
1664- (Andrew Bennetts, #522637)
1665-
1666-* Raise ValueError instead of a string exception.
1667- (John Arbash Meinel, #586926)
1668-
1669-* Reduce peak memory by one copy of compressed text.
1670- (John Arbash Meinel, #566940)
1671-
1672-* Repositories accessed via a smart server now reject being stacked on a
1673- repository in an incompatible format, as is the case when accessing them
1674- via other methods. This was causing fetches from those repositories via
1675- a smart server (e.g. using ``bzr branch``) to receive invalid data.
1676- (Andrew Bennetts, #562380)
1677-
1678-* Selftest with versions of subunit that support ``stopTestRun`` will no longer
1679- error. This error was caused by 2.0 not being updated when upstream
1680- python merged the end of run patch, which chose ``stopTestRun`` rather than
1681- ``done``. (Robert Collins, #571437)
1682-
1683-* When passing a file to ``UTF8DirReader`` make sure to close the current
1684- directory file handle after the chdir fails. Otherwise when passing many
1685- filenames into a command line ``bzr status`` we would leak descriptors.
1686- (John Arbash Meinel, #583486)
1687-
1688-
1689-Testing
1690-*******
1691-
1692-* ``build_tree_contents`` can create symlinks.
1693- (Martin Pool, John Arbash Meinel)
1694-
1695-
1696-bzr 2.0.5
1697-#########
1698-
1699-:2.0.5: 2010-03-23
1700-
1701-This fifth release in our 2.0 series addresses several user-inconvenience
1702-bugs. None are critical, but upgrading is recommended for all users on
1703-earlier 2.0 releases.
1704-
1705-Bug Fixes
1706-*********
1707-
1708-* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
1709- (Martin Pool, #331095)
1710-
1711-* Concurrent autopacking is more resilient to already-renamed pack files.
1712- If we find that a file we are about to obsolete is already obsoleted, we
1713- do not try to rename it, and we leave the file in ``obsolete_packs``.
1714- The code is also fault tolerant if a file goes missing, assuming that
1715- another process already removed the file.
1716- (John Arbash Meinel, Gareth White, #507557)
1717-
1718-* Cope with the lockdir ``held/info`` file being empty, which seems to
1719- happen fairly often if the process is suddenly interrupted while taking
1720- a lock.
1721- (Martin Pool, #185103)
1722-
1723-* Give the warning about potentially slow cross-format fetches much
1724- earlier on in the fetch operation. Don't show this message during
1725- upgrades, and show the correct format indication for remote
1726- repositories.
1727- (Martin Pool, #456077, #515356, #513157)
1728-
1729-* Handle renames correctly when there are files or directories that
1730- differ only in case. (Chris Jones, Martin Pool, #368931)
1731-
1732-* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
1733- error, report that error rather than failing with an unhelpful
1734- ``UnboundLocalError``.
1735- (Andrew Bennetts, #423563)
1736-
1737-* Running ``bzr`` command without any arguments now shows bzr
1738- version number along with rest of the help text.
1739- (Parth Malwankar, #369501)
1740-
1741-* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
1742- errors.
1743- (Inada Naoki, #524560)
1744-
1745-Documentation
1746-*************
1747-
1748-* Added ``location-alias`` help topic.
1749- (Andrew Bennetts, #337834)
1750-
1751-* Fixed CHM generation by moving the NEWS section template into
1752- a separate file. (Ian Clatworthy, #524184)
1753-
1754-
1755 bzr 2.0.4
1756 #########
1757
1758@@ -3048,7 +3540,7 @@
1759
1760 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
1761 supported at the moment on workingtree formats that can do content
1762- filtering. (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
1763+ filtering. (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
1764 bzr now says so, rather than just ignoring the option. (Martin Pool)
1765
1766 * There was a bug in ``osutils.relpath`` that was only triggered on
1767@@ -5910,7 +6402,7 @@
1768 when the path to the root of the tree has been given. Users of
1769 the internal ``show_tree_status`` function should be aware that
1770 the show_pending flag is now authoritative for showing pending
1771- merges, as it was originally. (Robert Collins, #225204)
1772+ merges, as it was originally. (Robert Collins, #255204)
1773
1774 * Set valid default _param_name for Option so that ListOption can embed
1775 '-' in names. (Vincent Ladeuil, #263249)
1776@@ -9826,7 +10318,7 @@
1777 hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
1778 iterator was using direct comparison and ``'abc/a'`` sorts after
1779 ``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
1780- (John Arbash Meinel, #111227)
1781+ (John Arbash Meinel, #111127)
1782
1783 * Handle when someone renames a file on disk without telling bzr.
1784 Previously we would report the first file as missing, but not show
1785@@ -11110,11 +11602,11 @@
1786 * ``Branch.bind(other_branch)`` no longer takes a write lock on the
1787 other branch, and will not push or pull between the two branches.
1788 API users will need to perform a push or pull or update operation if they
1789- require branch synchronisation to take place. (Robert Collins, #47344)
1790+ require branch synchronisation to take place. (Robert Collins, #43744)
1791
1792 * When creating a tarball or zipfile export, export unicode names as utf-8
1793 paths. This may not work perfectly on all platforms, but has the best
1794- chance of working in the common case. (John Arbash Meinel, #56816)
1795+ chance of working in the common case. (John Arbash Meinel, #56815)
1796
1797 * When committing, only files that exist in working tree or basis tree
1798 may be specified (Aaron Bentley, #50793)
1799
1800=== modified file 'bzr'
1801--- bzr 2010-08-07 00:54:52 +0000
1802+++ bzr 2011-09-27 11:59:19 +0000
1803@@ -1,6 +1,6 @@
1804 #! /usr/bin/env python
1805
1806-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
1807+# Copyright (C) 2005-2011 Canonical Ltd
1808 #
1809 # This program is free software; you can redistribute it and/or modify
1810 # it under the terms of the GNU General Public License as published by
1811@@ -23,7 +23,7 @@
1812 import warnings
1813
1814 # update this on each release
1815-_script_version = (2, 2, 0)
1816+_script_version = (2, 2, 5)
1817
1818 try:
1819 version_info = sys.version_info
1820@@ -75,6 +75,16 @@
1821 else:
1822 import locale
1823
1824+if os.name == "posix":
1825+ try:
1826+ locale.setlocale(locale.LC_ALL, '')
1827+ except locale.Error, e:
1828+ sys.stderr.write('bzr: warning: %s\n'
1829+ ' bzr could not set the application locale.\n'
1830+ ' Although this should be no problem for bzr itself, it might\n'
1831+ ' cause problems with some plugins. To investigate the issue,\n'
1832+ ' look at the output of the locale(1p) tool.\n' % e)
1833+
1834
1835 # The python2.6 release includes some libraries that have deprecation warnings
1836 # against the interpreter - see https://bugs.launchpad.net/bzr/+bug/387139
1837@@ -86,17 +96,6 @@
1838 )
1839
1840
1841-try:
1842- locale.setlocale(locale.LC_ALL, '')
1843-except locale.Error, e:
1844- sys.stderr.write('bzr: warning: %s\n'
1845- ' bzr could not set the application locale.\n'
1846- ' Although this should be no problem for bzr itself,\n'
1847- ' it might cause problems with some plugins.\n'
1848- ' To investigate the issue, look at the output\n'
1849- ' of the locale(1p) tool available on POSIX systems.\n'
1850- % e)
1851-
1852 # instruct bzrlib/__init__.py to install lazy_regex
1853 sys._bzr_lazy_regex = True
1854 try:
1855
1856=== modified file 'bzrlib/__init__.py'
1857--- bzrlib/__init__.py 2010-08-07 00:54:52 +0000
1858+++ bzrlib/__init__.py 2011-09-27 11:59:19 +0000
1859@@ -1,4 +1,4 @@
1860-# Copyright (C) 2005-2010 Canonical Ltd
1861+# Copyright (C) 2005-2011 Canonical Ltd
1862 #
1863 # This program is free software; you can redistribute it and/or modify
1864 # it under the terms of the GNU General Public License as published by
1865@@ -43,7 +43,7 @@
1866 IGNORE_FILENAME = ".bzrignore"
1867
1868
1869-__copyright__ = "Copyright 2005-2010 Canonical Ltd."
1870+__copyright__ = "Copyright 2005-2011 Canonical Ltd."
1871
1872 # same format as sys.version_info: "A tuple containing the five components of
1873 # the version number: major, minor, micro, releaselevel, and serial. All
1874@@ -52,7 +52,7 @@
1875 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
1876 # releaselevel of 'dev' for unreleased under-development code.
1877
1878-version_info = (2, 2, 0, 'final', 0)
1879+version_info = (2, 2, 5, 'final', 0)
1880
1881 # API compatibility version
1882 api_minimum_version = (2, 2, 0)
1883
1884=== modified file 'bzrlib/_annotator_pyx.c'
1885--- bzrlib/_annotator_pyx.c 2010-08-07 00:54:52 +0000
1886+++ bzrlib/_annotator_pyx.c 2011-09-27 11:59:19 +0000
1887@@ -1,4 +1,4 @@
1888-/* Generated by Pyrex 0.9.8.5 on Fri Aug 6 14:29:04 2010 */
1889+/* Generated by Pyrex 0.9.8.5 on Wed Oct 6 23:21:00 2010 */
1890
1891 #define PY_SSIZE_T_CLEAN
1892 #include "Python.h"
1893@@ -145,7 +145,7 @@
1894 Py_INCREF(__pyx_v_annotations);
1895 Py_INCREF(__pyx_v_parent_annotations);
1896
1897- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":63 */
1898+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":63 */
1899 __pyx_1 = (!PyList_CheckExact(__pyx_v_annotations));
1900 if (__pyx_1) {
1901 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; goto __pyx_L1;}
1902@@ -160,7 +160,7 @@
1903 }
1904 __pyx_L2:;
1905
1906- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":65 */
1907+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":65 */
1908 __pyx_1 = (!PyList_CheckExact(__pyx_v_parent_annotations));
1909 if (__pyx_1) {
1910 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
1911@@ -175,7 +175,7 @@
1912 }
1913 __pyx_L3:;
1914
1915- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":67 */
1916+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":67 */
1917 __pyx_r = 0;
1918 goto __pyx_L0;
1919
1920@@ -201,7 +201,7 @@
1921 Py_INCREF(__pyx_v_parent_annotations);
1922 Py_INCREF(__pyx_v_annotations);
1923
1924- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":73 */
1925+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":73 */
1926 __pyx_1 = ((__pyx_v_parent_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_parent_annotations));
1927 if (__pyx_1) {
1928 __pyx_2 = PyInt_FromSsize_t((__pyx_v_parent_idx + __pyx_v_match_len)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; goto __pyx_L1;}
1929@@ -225,7 +225,7 @@
1930 }
1931 __pyx_L2:;
1932
1933- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":78 */
1934+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":78 */
1935 __pyx_1 = ((__pyx_v_lines_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_annotations));
1936 if (__pyx_1) {
1937 __pyx_2 = PyInt_FromSsize_t((__pyx_v_lines_idx + __pyx_v_match_len)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; goto __pyx_L1;}
1938@@ -249,7 +249,7 @@
1939 }
1940 __pyx_L3:;
1941
1942- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":83 */
1943+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":83 */
1944 __pyx_r = 0;
1945 goto __pyx_L0;
1946
1947@@ -272,10 +272,10 @@
1948 int __pyx_1;
1949 Py_INCREF(__pyx_v_tpl);
1950
1951- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":94 */
1952+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":94 */
1953 (__pyx_v_pos[0]) = ((__pyx_v_pos[0]) + 1);
1954
1955- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":95 */
1956+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":95 */
1957 __pyx_1 = ((__pyx_v_pos[0]) >= PyTuple_GET_SIZE(__pyx_v_tpl));
1958 if (__pyx_1) {
1959 __pyx_r = NULL;
1960@@ -284,7 +284,7 @@
1961 }
1962 __pyx_L2:;
1963
1964- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":97 */
1965+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":97 */
1966 __pyx_r = PyTuple_GET_ITEM(__pyx_v_tpl,(__pyx_v_pos[0]));
1967 goto __pyx_L0;
1968
1969@@ -313,7 +313,7 @@
1970 __pyx_v_cache_key = Py_None; Py_INCREF(Py_None);
1971 __pyx_v_new_ann = Py_None; Py_INCREF(Py_None);
1972
1973- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":106 */
1974+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":106 */
1975 __pyx_1 = PyObject_RichCompareBool(__pyx_v_ann_one,__pyx_v_ann_two,Py_LT); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
1976 if (__pyx_1) {
1977 __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
1978@@ -338,10 +338,10 @@
1979 }
1980 __pyx_L2:;
1981
1982- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":110 */
1983+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":110 */
1984 __pyx_v_temp = PyDict_GetItem(__pyx_v_cache,__pyx_v_cache_key);
1985
1986- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":111 */
1987+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":111 */
1988 __pyx_1 = (__pyx_v_temp != NULL);
1989 if (__pyx_1) {
1990 Py_INCREF(((PyObject *)__pyx_v_temp));
1991@@ -351,7 +351,7 @@
1992 }
1993 __pyx_L3:;
1994
1995- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":114 */
1996+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":114 */
1997 __pyx_1 = (!PyTuple_CheckExact(__pyx_v_ann_one));
1998 if (!__pyx_1) {
1999 __pyx_1 = (!PyTuple_CheckExact(__pyx_v_ann_two));
2000@@ -369,28 +369,28 @@
2001 }
2002 __pyx_L4:;
2003
2004- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":118 */
2005+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":118 */
2006 __pyx_v_pos_one = (-1);
2007
2008- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":119 */
2009+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":119 */
2010 __pyx_v_pos_two = (-1);
2011
2012- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":120 */
2013+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":120 */
2014 __pyx_v_out_pos = 0;
2015
2016- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":121 */
2017+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":121 */
2018 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
2019
2020- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":122 */
2021+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":122 */
2022 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
2023
2024- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":123 */
2025+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":123 */
2026 __pyx_2 = PyTuple_New((PyTuple_GET_SIZE(__pyx_v_ann_one) + PyTuple_GET_SIZE(__pyx_v_ann_two))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
2027 Py_DECREF(__pyx_v_new_ann);
2028 __pyx_v_new_ann = __pyx_2;
2029 __pyx_2 = 0;
2030
2031- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":125 */
2032+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":125 */
2033 while (1) {
2034 __pyx_1 = (__pyx_v_left != NULL);
2035 if (__pyx_1) {
2036@@ -398,93 +398,93 @@
2037 }
2038 if (!__pyx_1) break;
2039
2040- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":129 */
2041+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":129 */
2042 __pyx_1 = (__pyx_v_left == __pyx_v_right);
2043 if (!__pyx_1) {
2044 __pyx_1 = PyObject_RichCompareBool(__pyx_v_left,__pyx_v_right,Py_EQ);
2045 }
2046 if (__pyx_1) {
2047
2048- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":132 */
2049+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":132 */
2050 Py_INCREF(__pyx_v_left);
2051
2052- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":133 */
2053+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":133 */
2054 PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
2055
2056- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":134 */
2057+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":134 */
2058 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
2059
2060- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":135 */
2061+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":135 */
2062 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
2063 goto __pyx_L7;
2064 }
2065 __pyx_1 = PyObject_RichCompareBool(__pyx_v_left,__pyx_v_right,Py_LT);
2066 if (__pyx_1) {
2067
2068- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":138 */
2069+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":138 */
2070 Py_INCREF(__pyx_v_left);
2071
2072- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":139 */
2073+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":139 */
2074 PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
2075
2076- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":140 */
2077+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":140 */
2078 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
2079 goto __pyx_L7;
2080 }
2081 /*else*/ {
2082
2083- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":142 */
2084+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":142 */
2085 Py_INCREF(__pyx_v_right);
2086
2087- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":143 */
2088+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":143 */
2089 PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_right);
2090
2091- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":144 */
2092+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":144 */
2093 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
2094 }
2095 __pyx_L7:;
2096
2097- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":145 */
2098+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":145 */
2099 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
2100 }
2101
2102- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":146 */
2103+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":146 */
2104 while (1) {
2105 __pyx_1 = (__pyx_v_left != NULL);
2106 if (!__pyx_1) break;
2107
2108- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":147 */
2109+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":147 */
2110 Py_INCREF(__pyx_v_left);
2111
2112- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":148 */
2113+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":148 */
2114 PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
2115
2116- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":149 */
2117+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":149 */
2118 __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
2119
2120- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":150 */
2121+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":150 */
2122 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
2123 }
2124
2125- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":151 */
2126+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":151 */
2127 while (1) {
2128 __pyx_1 = (__pyx_v_right != NULL);
2129 if (!__pyx_1) break;
2130
2131- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":152 */
2132+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":152 */
2133 Py_INCREF(__pyx_v_right);
2134
2135- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":153 */
2136+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":153 */
2137 PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_right);
2138
2139- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":154 */
2140+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":154 */
2141 __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
2142
2143- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":155 */
2144+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":155 */
2145 __pyx_v_out_pos = (__pyx_v_out_pos + 1);
2146 }
2147
2148- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":156 */
2149+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":156 */
2150 __pyx_1 = (__pyx_v_out_pos != PyTuple_GET_SIZE(__pyx_v_new_ann));
2151 if (__pyx_1) {
2152 __pyx_3 = PySequence_GetSlice(__pyx_v_new_ann, 0, __pyx_v_out_pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 159; goto __pyx_L1;}
2153@@ -495,10 +495,10 @@
2154 }
2155 __pyx_L12:;
2156
2157- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":160 */
2158+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":160 */
2159 __pyx_1 = PyDict_SetItem(__pyx_v_cache,__pyx_v_cache_key,__pyx_v_new_ann); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; goto __pyx_L1;}
2160
2161- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":161 */
2162+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":161 */
2163 Py_INCREF(__pyx_v_new_ann);
2164 __pyx_r = __pyx_v_new_ann;
2165 goto __pyx_L0;
2166@@ -538,16 +538,16 @@
2167 Py_INCREF(__pyx_v_parent_annotations);
2168 Py_INCREF(__pyx_v_matching_blocks);
2169
2170- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":174 */
2171+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":174 */
2172 __pyx_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(__pyx_v_annotations,__pyx_v_parent_annotations); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
2173
2174- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":175 */
2175+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":175 */
2176 __pyx_v_par_list = ((PyListObject *)__pyx_v_parent_annotations);
2177
2178- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":176 */
2179+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":176 */
2180 __pyx_v_ann_list = ((PyListObject *)__pyx_v_annotations);
2181
2182- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":181 */
2183+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":181 */
2184 __pyx_2 = PyObject_GetIter(__pyx_v_matching_blocks); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
2185 for (;;) {
2186 __pyx_3 = PyIter_Next(__pyx_2);
2187@@ -572,31 +572,31 @@
2188 if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
2189 Py_DECREF(__pyx_4); __pyx_4 = 0;
2190
2191- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":182 */
2192+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":182 */
2193 __pyx_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(__pyx_v_parent_annotations,__pyx_v_annotations,__pyx_v_parent_idx,__pyx_v_lines_idx,__pyx_v_match_len); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
2194
2195- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":184 */
2196+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":184 */
2197 __pyx_v_par_temp = (__pyx_v_par_list->ob_item + __pyx_v_parent_idx);
2198
2199- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":185 */
2200+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":185 */
2201 __pyx_v_ann_temp = (__pyx_v_ann_list->ob_item + __pyx_v_lines_idx);
2202
2203- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":186 */
2204+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":186 */
2205 for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_v_match_len; ++__pyx_v_idx) {
2206
2207- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":187 */
2208+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":187 */
2209 Py_INCREF((__pyx_v_par_temp[__pyx_v_idx]));
2210
2211- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":188 */
2212+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":188 */
2213 Py_DECREF((__pyx_v_ann_temp[__pyx_v_idx]));
2214
2215- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":189 */
2216+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":189 */
2217 (__pyx_v_ann_temp[__pyx_v_idx]) = (__pyx_v_par_temp[__pyx_v_idx]);
2218 }
2219 }
2220 Py_DECREF(__pyx_2); __pyx_2 = 0;
2221
2222- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":190 */
2223+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":190 */
2224 __pyx_r = 0;
2225 goto __pyx_L0;
2226
2227@@ -647,25 +647,25 @@
2228 __pyx_v_ann = Py_None; Py_INCREF(Py_None);
2229 __pyx_v_new_ann = Py_None; Py_INCREF(Py_None);
2230
2231- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":199 */
2232+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":199 */
2233 __pyx_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_annotations_are_lists(__pyx_v_annotations,__pyx_v_parent_annotations); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; goto __pyx_L1;}
2234
2235- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":200 */
2236+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":200 */
2237 Py_INCREF(Py_None);
2238 Py_DECREF(__pyx_v_last_ann);
2239 __pyx_v_last_ann = Py_None;
2240
2241- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":201 */
2242+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":201 */
2243 Py_INCREF(Py_None);
2244 Py_DECREF(__pyx_v_last_parent);
2245 __pyx_v_last_parent = Py_None;
2246
2247- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":202 */
2248+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":202 */
2249 Py_INCREF(Py_None);
2250 Py_DECREF(__pyx_v_last_res);
2251 __pyx_v_last_res = Py_None;
2252
2253- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":203 */
2254+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":203 */
2255 __pyx_2 = PyObject_GetIter(__pyx_v_matching_blocks); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
2256 for (;;) {
2257 __pyx_3 = PyIter_Next(__pyx_2);
2258@@ -690,22 +690,22 @@
2259 if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
2260 Py_DECREF(__pyx_4); __pyx_4 = 0;
2261
2262- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":204 */
2263+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":204 */
2264 __pyx_1 = __pyx_f_6bzrlib_14_annotator_pyx__check_match_ranges(__pyx_v_parent_annotations,__pyx_v_annotations,__pyx_v_parent_idx,__pyx_v_lines_idx,__pyx_v_match_len); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
2265
2266- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":208 */
2267+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":208 */
2268 for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_v_match_len; ++__pyx_v_idx) {
2269
2270- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":209 */
2271+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":209 */
2272 __pyx_v_ann_idx = (__pyx_v_lines_idx + __pyx_v_idx);
2273
2274- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":210 */
2275+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":210 */
2276 __pyx_v_ann_temp = PyList_GET_ITEM(__pyx_v_annotations,__pyx_v_ann_idx);
2277
2278- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":211 */
2279+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":211 */
2280 __pyx_v_par_temp = PyList_GET_ITEM(__pyx_v_parent_annotations,(__pyx_v_parent_idx + __pyx_v_idx));
2281
2282- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":212 */
2283+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":212 */
2284 __pyx_1 = (__pyx_v_ann_temp == __pyx_v_par_temp);
2285 if (__pyx_1) {
2286 goto __pyx_L4;
2287@@ -713,71 +713,71 @@
2288 }
2289 __pyx_L6:;
2290
2291- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":221 */
2292+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":221 */
2293 Py_INCREF(((PyObject *)__pyx_v_par_temp));
2294 Py_DECREF(__pyx_v_par_ann);
2295 __pyx_v_par_ann = ((PyObject *)__pyx_v_par_temp);
2296
2297- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":222 */
2298+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":222 */
2299 Py_INCREF(((PyObject *)__pyx_v_ann_temp));
2300 Py_DECREF(__pyx_v_ann);
2301 __pyx_v_ann = ((PyObject *)__pyx_v_ann_temp);
2302
2303- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":223 */
2304+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":223 */
2305 __pyx_1 = __pyx_v_ann == __pyx_v_this_annotation;
2306 if (__pyx_1) {
2307
2308- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":226 */
2309+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":226 */
2310 Py_INCREF(__pyx_v_par_ann);
2311
2312- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":227 */
2313+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":227 */
2314 __pyx_1 = PyList_SetItem(__pyx_v_annotations,__pyx_v_ann_idx,__pyx_v_par_ann); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; goto __pyx_L1;}
2315
2316- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":228 */
2317+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":228 */
2318 goto __pyx_L4;
2319 goto __pyx_L7;
2320 }
2321 __pyx_L7:;
2322
2323- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":231 */
2324+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":231 */
2325 __pyx_1 = __pyx_v_ann == __pyx_v_last_ann;
2326 if (__pyx_1) {
2327 __pyx_1 = __pyx_v_par_ann == __pyx_v_last_parent;
2328 }
2329 if (__pyx_1) {
2330
2331- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":232 */
2332+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":232 */
2333 Py_INCREF(__pyx_v_last_res);
2334
2335- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":233 */
2336+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":233 */
2337 __pyx_1 = PyList_SetItem(__pyx_v_annotations,__pyx_v_ann_idx,__pyx_v_last_res); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
2338 goto __pyx_L8;
2339 }
2340 /*else*/ {
2341
2342- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":235 */
2343+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":235 */
2344 __pyx_3 = __pyx_f_6bzrlib_14_annotator_pyx__combine_annotations(__pyx_v_ann,__pyx_v_par_ann,__pyx_v_ann_cache); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; goto __pyx_L1;}
2345 Py_DECREF(__pyx_v_new_ann);
2346 __pyx_v_new_ann = __pyx_3;
2347 __pyx_3 = 0;
2348
2349- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":236 */
2350+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":236 */
2351 Py_INCREF(__pyx_v_new_ann);
2352
2353- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":237 */
2354+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":237 */
2355 __pyx_1 = PyList_SetItem(__pyx_v_annotations,__pyx_v_ann_idx,__pyx_v_new_ann); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; goto __pyx_L1;}
2356
2357- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":238 */
2358+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":238 */
2359 Py_INCREF(__pyx_v_ann);
2360 Py_DECREF(__pyx_v_last_ann);
2361 __pyx_v_last_ann = __pyx_v_ann;
2362
2363- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":239 */
2364+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":239 */
2365 Py_INCREF(__pyx_v_par_ann);
2366 Py_DECREF(__pyx_v_last_parent);
2367 __pyx_v_last_parent = __pyx_v_par_ann;
2368
2369- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":240 */
2370+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":240 */
2371 Py_INCREF(__pyx_v_new_ann);
2372 Py_DECREF(__pyx_v_last_res);
2373 __pyx_v_last_res = __pyx_v_new_ann;
2374@@ -788,7 +788,7 @@
2375 }
2376 Py_DECREF(__pyx_2); __pyx_2 = 0;
2377
2378- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":241 */
2379+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":241 */
2380 __pyx_r = 0;
2381 goto __pyx_L0;
2382
2383@@ -841,7 +841,7 @@
2384 __pyx_v_parent_annotations = Py_None; Py_INCREF(Py_None);
2385 __pyx_v_matching_blocks = Py_None; Py_INCREF(Py_None);
2386
2387- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":250 */
2388+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":250 */
2389 __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_k6p); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
2390 __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
2391 Py_INCREF(__pyx_v_key);
2392@@ -866,7 +866,7 @@
2393 if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
2394 Py_DECREF(__pyx_1); __pyx_1 = 0;
2395
2396- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":253 */
2397+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":253 */
2398 __pyx_4 = __pyx_f_6bzrlib_14_annotator_pyx__apply_parent_annotations(__pyx_v_annotations,__pyx_v_parent_annotations,__pyx_v_matching_blocks); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; goto __pyx_L1;}
2399
2400 __pyx_r = Py_None; Py_INCREF(Py_None);
2401@@ -916,7 +916,7 @@
2402 __pyx_v_parent_annotations = Py_None; Py_INCREF(Py_None);
2403 __pyx_v_matching_blocks = Py_None; Py_INCREF(Py_None);
2404
2405- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":260 */
2406+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":260 */
2407 __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_k6p); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
2408 __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
2409 Py_INCREF(__pyx_v_key);
2410@@ -941,7 +941,7 @@
2411 if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; goto __pyx_L1;}
2412 Py_DECREF(__pyx_1); __pyx_1 = 0;
2413
2414- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":262 */
2415+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":262 */
2416 __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n__ann_tuple_cache); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; goto __pyx_L1;}
2417 __pyx_4 = __pyx_f_6bzrlib_14_annotator_pyx__merge_annotations(__pyx_v_this_annotation,__pyx_v_annotations,__pyx_v_parent_annotations,__pyx_v_matching_blocks,__pyx_2); if (__pyx_4 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;}
2418 Py_DECREF(__pyx_2); __pyx_2 = 0;
2419@@ -1005,7 +1005,7 @@
2420 __pyx_v_head = Py_None; Py_INCREF(Py_None);
2421 __pyx_v_the_heads = Py_None; Py_INCREF(Py_None);
2422
2423- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":272 */
2424+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":272 */
2425 __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; goto __pyx_L1;}
2426 Py_INCREF(__pyx_n_annotate);
2427 PyList_SET_ITEM(__pyx_1, 0, __pyx_n_annotate);
2428@@ -1017,13 +1017,13 @@
2429 __pyx_1 = 0;
2430 Py_DECREF(__pyx_2); __pyx_2 = 0;
2431
2432- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":274 */
2433+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":274 */
2434 __pyx_2 = PyObject_GetAttr(__pyx_v_annotate, __pyx_n__break_annotation_tie); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; goto __pyx_L1;}
2435 Py_DECREF(__pyx_v_custom_tiebreaker);
2436 __pyx_v_custom_tiebreaker = __pyx_2;
2437 __pyx_2 = 0;
2438
2439- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":275 */
2440+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":275 */
2441 __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_annotate); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
2442 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
2443 Py_INCREF(__pyx_v_key);
2444@@ -1044,17 +1044,17 @@
2445 if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
2446 Py_DECREF(__pyx_1); __pyx_1 = 0;
2447
2448- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":276 */
2449+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":276 */
2450 __pyx_4 = PyObject_Length(__pyx_v_lines); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; goto __pyx_L1;}
2451 __pyx_v_num_lines = __pyx_4;
2452
2453- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":277 */
2454+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":277 */
2455 __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; goto __pyx_L1;}
2456 Py_DECREF(__pyx_v_out);
2457 __pyx_v_out = __pyx_2;
2458 __pyx_2 = 0;
2459
2460- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":278 */
2461+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":278 */
2462 __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n__get_heads_provider); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
2463 __pyx_1 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
2464 Py_DECREF(__pyx_3); __pyx_3 = 0;
2465@@ -1064,22 +1064,22 @@
2466 __pyx_v_heads = __pyx_2;
2467 __pyx_2 = 0;
2468
2469- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":279 */
2470+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":279 */
2471 for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_v_num_lines; ++__pyx_v_pos) {
2472
2473- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":280 */
2474+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":280 */
2475 __pyx_3 = __Pyx_GetItemInt(__pyx_v_annotations, __pyx_v_pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;}
2476 Py_DECREF(__pyx_v_annotation);
2477 __pyx_v_annotation = __pyx_3;
2478 __pyx_3 = 0;
2479
2480- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":281 */
2481+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":281 */
2482 __pyx_1 = __Pyx_GetItemInt(__pyx_v_lines, __pyx_v_pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; goto __pyx_L1;}
2483 Py_DECREF(__pyx_v_line);
2484 __pyx_v_line = __pyx_1;
2485 __pyx_1 = 0;
2486
2487- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":282 */
2488+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":282 */
2489 __pyx_4 = PyObject_Length(__pyx_v_annotation); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; goto __pyx_L1;}
2490 __pyx_5 = (__pyx_4 == 1);
2491 if (__pyx_5) {
2492@@ -1091,7 +1091,7 @@
2493 }
2494 /*else*/ {
2495
2496- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":285 */
2497+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":285 */
2498 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
2499 Py_INCREF(__pyx_v_annotation);
2500 PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_annotation);
2501@@ -1101,7 +1101,7 @@
2502 __pyx_v_the_heads = __pyx_1;
2503 __pyx_1 = 0;
2504
2505- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":286 */
2506+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":286 */
2507 __pyx_4 = PyObject_Length(__pyx_v_the_heads); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
2508 __pyx_5 = (__pyx_4 == 1);
2509 if (__pyx_5) {
2510@@ -1141,7 +1141,7 @@
2511 }
2512 __pyx_L4:;
2513
2514- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":293 */
2515+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":293 */
2516 __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
2517 Py_INCREF(__pyx_v_head);
2518 PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_head);
2519@@ -1151,7 +1151,7 @@
2520 Py_DECREF(__pyx_1); __pyx_1 = 0;
2521 }
2522
2523- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":294 */
2524+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":294 */
2525 Py_INCREF(__pyx_v_out);
2526 __pyx_r = __pyx_v_out;
2527 goto __pyx_L0;
2528@@ -1201,7 +1201,7 @@
2529 if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
2530 if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
2531
2532- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":58 */
2533+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":58 */
2534 __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;}
2535 Py_INCREF(__pyx_n__annotator_py);
2536 PyList_SET_ITEM(__pyx_1, 0, __pyx_n__annotator_py);
2537@@ -1212,7 +1212,7 @@
2538 Py_DECREF(__pyx_1); __pyx_1 = 0;
2539 Py_DECREF(__pyx_2); __pyx_2 = 0;
2540
2541- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":244 */
2542+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":244 */
2543 __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
2544 __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__annotator_py); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
2545 __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_Annotator); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
2546@@ -1224,21 +1224,21 @@
2547 __pyx_3 = __Pyx_CreateClass(__pyx_1, __pyx_2, __pyx_n_Annotator, "bzrlib._annotator_pyx"); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
2548 Py_DECREF(__pyx_1); __pyx_1 = 0;
2549
2550- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":247 */
2551+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":247 */
2552 __pyx_1 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_first_parent, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
2553 __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
2554 Py_DECREF(__pyx_1); __pyx_1 = 0;
2555 if (PyObject_SetAttr(__pyx_3, __pyx_n__update_from_first_parent, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
2556 Py_DECREF(__pyx_4); __pyx_4 = 0;
2557
2558- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":256 */
2559+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":256 */
2560 __pyx_1 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator__update_from_other_parents, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;}
2561 __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;}
2562 Py_DECREF(__pyx_1); __pyx_1 = 0;
2563 if (PyObject_SetAttr(__pyx_3, __pyx_n__update_from_other_parents, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;}
2564 Py_DECREF(__pyx_4); __pyx_4 = 0;
2565
2566- /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":265 */
2567+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":265 */
2568 __pyx_1 = PyCFunction_New(&__pyx_mdef_6bzrlib_14_annotator_pyx_9Annotator_annotate_flat, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
2569 __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
2570 Py_DECREF(__pyx_1); __pyx_1 = 0;
2571
2572=== modified file 'bzrlib/_bencode_pyx.c'
2573--- bzrlib/_bencode_pyx.c 2010-08-07 00:54:52 +0000
2574+++ bzrlib/_bencode_pyx.c 2011-09-27 11:59:19 +0000
2575@@ -1,4 +1,4 @@
2576-/* Generated by Pyrex 0.9.8.5 on Fri Aug 6 14:29:12 2010 */
2577+/* Generated by Pyrex 0.9.8.5 on Wed Oct 6 23:21:00 2010 */
2578
2579 #define PY_SSIZE_T_CLEAN
2580 #include "Python.h"
2581@@ -249,7 +249,7 @@
2582 Py_INCREF(__pyx_v_s);
2583 Py_INCREF(__pyx_v_yield_tuples);
2584
2585- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":81 */
2586+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":81 */
2587 __pyx_1 = (!PyString_CheckExact(__pyx_v_s));
2588 if (__pyx_1) {
2589 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
2590@@ -264,20 +264,20 @@
2591 }
2592 __pyx_L2:;
2593
2594- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":84 */
2595+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":84 */
2596 Py_INCREF(__pyx_v_s);
2597 Py_DECREF(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text);
2598 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text = __pyx_v_s;
2599
2600- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":85 */
2601+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":85 */
2602 __pyx_4 = PyString_AS_STRING(__pyx_v_s); if (__pyx_4 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; goto __pyx_L1;}
2603 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->tail = __pyx_4;
2604
2605- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":86 */
2606+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":86 */
2607 __pyx_5 = PyString_GET_SIZE(__pyx_v_s); if (__pyx_5 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
2608 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size = __pyx_5;
2609
2610- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":87 */
2611+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":87 */
2612 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
2613 Py_INCREF(__pyx_v_yield_tuples);
2614 PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_yield_tuples);
2615@@ -313,13 +313,13 @@
2616 Py_INCREF(__pyx_v_self);
2617 __pyx_v_result = Py_None; Py_INCREF(Py_None);
2618
2619- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":90 */
2620+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":90 */
2621 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->__pyx_vtab)->_decode_object(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;}
2622 Py_DECREF(__pyx_v_result);
2623 __pyx_v_result = __pyx_1;
2624 __pyx_1 = 0;
2625
2626- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":91 */
2627+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":91 */
2628 __pyx_2 = (((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size != 0);
2629 if (__pyx_2) {
2630 __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; goto __pyx_L1;}
2631@@ -334,7 +334,7 @@
2632 }
2633 __pyx_L2:;
2634
2635- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":93 */
2636+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":93 */
2637 Py_INCREF(__pyx_v_result);
2638 __pyx_r = __pyx_v_result;
2639 goto __pyx_L0;
2640@@ -383,7 +383,7 @@
2641 PyObject *__pyx_3 = 0;
2642 Py_INCREF(__pyx_v_self);
2643
2644- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":101 */
2645+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":101 */
2646 __pyx_1 = (0 == __pyx_v_self->size);
2647 if (__pyx_1) {
2648 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
2649@@ -398,7 +398,7 @@
2650 }
2651 __pyx_L2:;
2652
2653- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":104 */
2654+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":104 */
2655 __pyx_1 = Py_EnterRecursiveCall(__pyx_k4);
2656 if (__pyx_1) {
2657 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; goto __pyx_L1;}
2658@@ -413,13 +413,13 @@
2659 }
2660 __pyx_L3:;
2661
2662- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":106 */
2663+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":106 */
2664 /*try:*/ {
2665
2666- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":107 */
2667+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":107 */
2668 __pyx_v_ch = (__pyx_v_self->tail[0]);
2669
2670- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":108 */
2671+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":108 */
2672 __pyx_1 = '0' <= __pyx_v_ch;
2673 if (__pyx_1) {
2674 __pyx_1 = __pyx_v_ch <= '9';
2675@@ -434,10 +434,10 @@
2676 __pyx_1 = (__pyx_v_ch == 'l');
2677 if (__pyx_1) {
2678
2679- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":111 */
2680+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":111 */
2681 D_UPDATE_TAIL(__pyx_v_self,1);
2682
2683- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":112 */
2684+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":112 */
2685 __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_decode_list(__pyx_v_self); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; goto __pyx_L5;}
2686 __pyx_r = __pyx_3;
2687 __pyx_3 = 0;
2688@@ -447,10 +447,10 @@
2689 __pyx_1 = (__pyx_v_ch == 'i');
2690 if (__pyx_1) {
2691
2692- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":114 */
2693+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":114 */
2694 D_UPDATE_TAIL(__pyx_v_self,1);
2695
2696- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":115 */
2697+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":115 */
2698 __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_decode_int(__pyx_v_self); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L5;}
2699 __pyx_r = __pyx_2;
2700 __pyx_2 = 0;
2701@@ -460,10 +460,10 @@
2702 __pyx_1 = (__pyx_v_ch == 'd');
2703 if (__pyx_1) {
2704
2705- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":117 */
2706+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":117 */
2707 D_UPDATE_TAIL(__pyx_v_self,1);
2708
2709- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":118 */
2710+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":118 */
2711 __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_decode_dict(__pyx_v_self); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L5;}
2712 __pyx_r = __pyx_3;
2713 __pyx_3 = 0;
2714@@ -535,10 +535,10 @@
2715 PyObject *__pyx_4 = 0;
2716 Py_INCREF(__pyx_v_self);
2717
2718- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":126 */
2719+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":126 */
2720 __pyx_v_i = 0;
2721
2722- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":127 */
2723+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":127 */
2724 while (1) {
2725 __pyx_1 = ((__pyx_v_self->tail[__pyx_v_i]) >= '0');
2726 if (__pyx_1) {
2727@@ -554,7 +554,7 @@
2728 __pyx_v_i = (__pyx_v_i + 1);
2729 }
2730
2731- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":131 */
2732+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":131 */
2733 __pyx_1 = ((__pyx_v_self->tail[__pyx_v_i]) != __pyx_v_stop_char);
2734 if (__pyx_1) {
2735 __pyx_2 = PyInt_FromLong(__pyx_v_stop_char); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
2736@@ -578,7 +578,7 @@
2737 }
2738 __pyx_L4:;
2739
2740- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":134 */
2741+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":134 */
2742 __pyx_1 = ((__pyx_v_self->tail[0]) == '0');
2743 if (!__pyx_1) {
2744 __pyx_1 = ((__pyx_v_self->tail[0]) == '-');
2745@@ -602,7 +602,7 @@
2746 }
2747 __pyx_L5:;
2748
2749- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":140 */
2750+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":140 */
2751 __pyx_r = __pyx_v_i;
2752 goto __pyx_L0;
2753
2754@@ -628,14 +628,14 @@
2755 Py_INCREF(__pyx_v_self);
2756 __pyx_v_ret = Py_None; Py_INCREF(Py_None);
2757
2758- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":144 */
2759+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":144 */
2760 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_read_digits(__pyx_v_self,'e'); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; goto __pyx_L1;}
2761 __pyx_v_i = __pyx_1;
2762
2763- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":145 */
2764+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":145 */
2765 (__pyx_v_self->tail[__pyx_v_i]) = 0;
2766
2767- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":146 */
2768+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":146 */
2769 /*try:*/ {
2770 __pyx_2 = PyInt_FromString(__pyx_v_self->tail,NULL,10); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L3;}
2771 Py_DECREF(__pyx_v_ret);
2772@@ -668,10 +668,10 @@
2773 }
2774 }
2775
2776- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":150 */
2777+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":150 */
2778 D_UPDATE_TAIL(__pyx_v_self,(__pyx_v_i + 1));
2779
2780- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":151 */
2781+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":151 */
2782 Py_INCREF(__pyx_v_ret);
2783 __pyx_r = __pyx_v_ret;
2784 goto __pyx_L0;
2785@@ -699,10 +699,10 @@
2786 Py_INCREF(__pyx_v_self);
2787 __pyx_v_result = Py_None; Py_INCREF(Py_None);
2788
2789- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":160 */
2790+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":160 */
2791 __pyx_v_n = strtol(__pyx_v_self->tail,(&__pyx_v_next_tail),10);
2792
2793- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":161 */
2794+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":161 */
2795 __pyx_1 = (__pyx_v_next_tail == NULL);
2796 if (!__pyx_1) {
2797 __pyx_1 = ((__pyx_v_next_tail[0]) != ':');
2798@@ -720,7 +720,7 @@
2799 }
2800 __pyx_L2:;
2801
2802- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":164 */
2803+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":164 */
2804 __pyx_1 = ((__pyx_v_self->tail[0]) == '0');
2805 if (__pyx_1) {
2806 __pyx_1 = (__pyx_v_n != 0);
2807@@ -741,10 +741,10 @@
2808 }
2809 __pyx_L3:;
2810
2811- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":167 */
2812+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":167 */
2813 D_UPDATE_TAIL(__pyx_v_self,((__pyx_v_next_tail - __pyx_v_self->tail) + 1));
2814
2815- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":168 */
2816+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":168 */
2817 __pyx_1 = (__pyx_v_n == 0);
2818 if (__pyx_1) {
2819 Py_INCREF(__pyx_k10p);
2820@@ -754,7 +754,7 @@
2821 }
2822 __pyx_L4:;
2823
2824- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":170 */
2825+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":170 */
2826 __pyx_1 = (__pyx_v_n > __pyx_v_self->size);
2827 if (__pyx_1) {
2828 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; goto __pyx_L1;}
2829@@ -769,7 +769,7 @@
2830 }
2831 __pyx_L5:;
2832
2833- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":172 */
2834+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":172 */
2835 __pyx_1 = (__pyx_v_n < 0);
2836 if (__pyx_1) {
2837 __pyx_2 = PyInt_FromLong(__pyx_v_n); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
2838@@ -787,16 +787,16 @@
2839 }
2840 __pyx_L6:;
2841
2842- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":175 */
2843+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":175 */
2844 __pyx_2 = PyString_FromStringAndSize(__pyx_v_self->tail,__pyx_v_n); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
2845 Py_DECREF(__pyx_v_result);
2846 __pyx_v_result = __pyx_2;
2847 __pyx_2 = 0;
2848
2849- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":176 */
2850+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":176 */
2851 D_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
2852
2853- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":177 */
2854+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":177 */
2855 Py_INCREF(__pyx_v_result);
2856 __pyx_r = __pyx_v_result;
2857 goto __pyx_L0;
2858@@ -823,23 +823,23 @@
2859 Py_INCREF(__pyx_v_self);
2860 __pyx_v_result = Py_None; Py_INCREF(Py_None);
2861
2862- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":180 */
2863+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":180 */
2864 __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
2865 Py_DECREF(__pyx_v_result);
2866 __pyx_v_result = __pyx_1;
2867 __pyx_1 = 0;
2868
2869- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":182 */
2870+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":182 */
2871 while (1) {
2872 __pyx_2 = (__pyx_v_self->size > 0);
2873 if (!__pyx_2) break;
2874 __pyx_2 = ((__pyx_v_self->tail[0]) == 'e');
2875 if (__pyx_2) {
2876
2877- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":184 */
2878+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":184 */
2879 D_UPDATE_TAIL(__pyx_v_self,1);
2880
2881- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":185 */
2882+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":185 */
2883 __pyx_2 = __pyx_v_self->_yield_tuples;
2884 if (__pyx_2) {
2885 __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;}
2886@@ -868,7 +868,7 @@
2887 __pyx_L4:;
2888 }
2889
2890- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":195 */
2891+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":195 */
2892 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
2893 Py_INCREF(__pyx_k12p);
2894 PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k12p);
2895@@ -907,33 +907,33 @@
2896 __pyx_v_key = Py_None; Py_INCREF(Py_None);
2897 __pyx_v_value = Py_None; Py_INCREF(Py_None);
2898
2899- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":200 */
2900+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":200 */
2901 __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;}
2902 Py_DECREF(__pyx_v_result);
2903 __pyx_v_result = __pyx_1;
2904 __pyx_1 = 0;
2905
2906- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":201 */
2907+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":201 */
2908 Py_INCREF(Py_None);
2909 Py_DECREF(__pyx_v_lastkey);
2910 __pyx_v_lastkey = Py_None;
2911
2912- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":203 */
2913+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":203 */
2914 while (1) {
2915 __pyx_2 = (__pyx_v_self->size > 0);
2916 if (!__pyx_2) break;
2917
2918- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":204 */
2919+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":204 */
2920 __pyx_v_ch = (__pyx_v_self->tail[0]);
2921
2922- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":205 */
2923+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":205 */
2924 __pyx_2 = (__pyx_v_ch == 'e');
2925 if (__pyx_2) {
2926
2927- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":206 */
2928+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":206 */
2929 D_UPDATE_TAIL(__pyx_v_self,1);
2930
2931- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":207 */
2932+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":207 */
2933 Py_INCREF(__pyx_v_result);
2934 __pyx_r = __pyx_v_result;
2935 goto __pyx_L0;
2936@@ -941,7 +941,7 @@
2937 }
2938 /*else*/ {
2939
2940- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":210 */
2941+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":210 */
2942 __pyx_2 = ((__pyx_v_self->tail[0]) < '0');
2943 if (!__pyx_2) {
2944 __pyx_2 = ((__pyx_v_self->tail[0]) > '9');
2945@@ -959,13 +959,13 @@
2946 }
2947 __pyx_L5:;
2948
2949- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":212 */
2950+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":212 */
2951 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_decode_string(__pyx_v_self); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
2952 Py_DECREF(__pyx_v_key);
2953 __pyx_v_key = __pyx_1;
2954 __pyx_1 = 0;
2955
2956- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":213 */
2957+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":213 */
2958 if (PyObject_Cmp(__pyx_v_lastkey, __pyx_v_key, &__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
2959 __pyx_2 = __pyx_2 >= 0;
2960 if (__pyx_2) {
2961@@ -986,19 +986,19 @@
2962 }
2963 __pyx_L6:;
2964
2965- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":217 */
2966+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":217 */
2967 __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self->__pyx_vtab)->_decode_object(__pyx_v_self); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; goto __pyx_L1;}
2968 Py_DECREF(__pyx_v_value);
2969 __pyx_v_value = __pyx_3;
2970 __pyx_3 = 0;
2971
2972- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":218 */
2973+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":218 */
2974 if (PyObject_SetItem(__pyx_v_result, __pyx_v_key, __pyx_v_value) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; goto __pyx_L1;}
2975 }
2976 __pyx_L4:;
2977 }
2978
2979- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":220 */
2980+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":220 */
2981 __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
2982 Py_INCREF(__pyx_k15p);
2983 PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k15p);
2984@@ -1132,19 +1132,19 @@
2985 if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|i", __pyx_argnames, &__pyx_v_maxsize)) return -1;
2986 Py_INCREF(__pyx_v_self);
2987
2988- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":259 */
2989+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":259 */
2990 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
2991
2992- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":260 */
2993+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":260 */
2994 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->size = 0;
2995
2996- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":261 */
2997+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":261 */
2998 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = NULL;
2999
3000- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":263 */
3001+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":263 */
3002 __pyx_v_p = ((char *)malloc(__pyx_v_maxsize));
3003
3004- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":264 */
3005+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":264 */
3006 __pyx_1 = (__pyx_v_p == NULL);
3007 if (__pyx_1) {
3008 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
3009@@ -1159,13 +1159,13 @@
3010 }
3011 __pyx_L2:;
3012
3013- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":267 */
3014+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":267 */
3015 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = __pyx_v_p;
3016
3017- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":268 */
3018+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":268 */
3019 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = __pyx_v_maxsize;
3020
3021- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":269 */
3022+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":269 */
3023 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = __pyx_v_p;
3024
3025 __pyx_r = 0;
3026@@ -1184,13 +1184,13 @@
3027 static void __pyx_f_6bzrlib_12_bencode_pyx_7Encoder___dealloc__(PyObject *__pyx_v_self) {
3028 Py_INCREF(__pyx_v_self);
3029
3030- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":272 */
3031+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":272 */
3032 free(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer);
3033
3034- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":273 */
3035+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":273 */
3036 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = NULL;
3037
3038- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":274 */
3039+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":274 */
3040 ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
3041
3042 Py_DECREF(__pyx_v_self);
3043@@ -1240,7 +1240,7 @@
3044 PyObject *__pyx_3 = 0;
3045 Py_INCREF(__pyx_v_self);
3046
3047- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":290 */
3048+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":290 */
3049 __pyx_1 = ((__pyx_v_self->size + __pyx_v_required) < __pyx_v_self->maxsize);
3050 if (__pyx_1) {
3051 __pyx_r = 1;
3052@@ -1249,20 +1249,20 @@
3053 }
3054 __pyx_L2:;
3055
3056- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":293 */
3057+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":293 */
3058 __pyx_v_new_size = __pyx_v_self->maxsize;
3059
3060- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":294 */
3061+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":294 */
3062 while (1) {
3063 __pyx_1 = (__pyx_v_new_size < (__pyx_v_self->size + __pyx_v_required));
3064 if (!__pyx_1) break;
3065 __pyx_v_new_size = (__pyx_v_new_size * 2);
3066 }
3067
3068- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":296 */
3069+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":296 */
3070 __pyx_v_new_buffer = ((char *)realloc(__pyx_v_self->buffer,__pyx_v_new_size));
3071
3072- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":297 */
3073+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":297 */
3074 __pyx_1 = (__pyx_v_new_buffer == NULL);
3075 if (__pyx_1) {
3076 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; goto __pyx_L1;}
3077@@ -1277,16 +1277,16 @@
3078 }
3079 __pyx_L5:;
3080
3081- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":300 */
3082+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":300 */
3083 __pyx_v_self->buffer = __pyx_v_new_buffer;
3084
3085- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":301 */
3086+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":301 */
3087 __pyx_v_self->maxsize = __pyx_v_new_size;
3088
3089- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":302 */
3090+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":302 */
3091 __pyx_v_self->tail = (&(__pyx_v_new_buffer[__pyx_v_self->size]));
3092
3093- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":303 */
3094+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":303 */
3095 __pyx_r = 1;
3096 goto __pyx_L0;
3097
3098@@ -1310,13 +1310,13 @@
3099 PyObject *__pyx_3 = 0;
3100 Py_INCREF(__pyx_v_self);
3101
3102- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":310 */
3103+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":310 */
3104 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,__pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; goto __pyx_L1;}
3105
3106- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":311 */
3107+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":311 */
3108 __pyx_v_n = snprintf(__pyx_v_self->tail,__pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE,__pyx_k20,__pyx_v_x);
3109
3110- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":312 */
3111+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":312 */
3112 __pyx_1 = (__pyx_v_n < 0);
3113 if (__pyx_1) {
3114 __pyx_2 = PyInt_FromLong(__pyx_v_x); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 313; goto __pyx_L1;}
3115@@ -1334,10 +1334,10 @@
3116 }
3117 __pyx_L2:;
3118
3119- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":314 */
3120+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":314 */
3121 E_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
3122
3123- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":315 */
3124+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":315 */
3125 __pyx_r = 1;
3126 goto __pyx_L0;
3127
3128@@ -1408,21 +1408,21 @@
3129 Py_INCREF(__pyx_v_self);
3130 Py_INCREF(__pyx_v_s);
3131
3132- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":322 */
3133+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":322 */
3134 __pyx_1 = PyString_GET_SIZE(__pyx_v_s); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;}
3135 __pyx_v_n = __pyx_1;
3136
3137- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":323 */
3138+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":323 */
3139 __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,__pyx_v_n); if (__pyx_2 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
3140
3141- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":324 */
3142+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":324 */
3143 __pyx_3 = PyString_AS_STRING(__pyx_v_s); if (__pyx_3 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;}
3144 memcpy(__pyx_v_self->tail,__pyx_3,__pyx_v_n);
3145
3146- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":325 */
3147+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":325 */
3148 E_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
3149
3150- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":326 */
3151+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":326 */
3152 __pyx_r = 1;
3153 goto __pyx_L0;
3154
3155@@ -1449,17 +1449,17 @@
3156 Py_INCREF(__pyx_v_self);
3157 Py_INCREF(__pyx_v_x);
3158
3159- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":331 */
3160+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":331 */
3161 __pyx_1 = PyString_GET_SIZE(__pyx_v_x); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; goto __pyx_L1;}
3162 __pyx_v_x_len = __pyx_1;
3163
3164- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":332 */
3165+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":332 */
3166 __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,(__pyx_v_x_len + __pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE)); if (__pyx_2 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; goto __pyx_L1;}
3167
3168- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":333 */
3169+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":333 */
3170 __pyx_v_n = snprintf(__pyx_v_self->tail,__pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE,__pyx_k25,__pyx_v_x_len);
3171
3172- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":334 */
3173+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":334 */
3174 __pyx_2 = (__pyx_v_n < 0);
3175 if (__pyx_2) {
3176 __pyx_3 = PyNumber_Remainder(__pyx_k26p, __pyx_v_x); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
3177@@ -1475,14 +1475,14 @@
3178 }
3179 __pyx_L2:;
3180
3181- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":336 */
3182+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":336 */
3183 __pyx_5 = PyString_AS_STRING(__pyx_v_x); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;}
3184 memcpy((__pyx_v_self->tail + __pyx_v_n),__pyx_5,__pyx_v_x_len);
3185
3186- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":337 */
3187+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":337 */
3188 E_UPDATE_TAIL(__pyx_v_self,(__pyx_v_n + __pyx_v_x_len));
3189
3190- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":338 */
3191+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":338 */
3192 __pyx_r = 1;
3193 goto __pyx_L0;
3194
3195@@ -1511,16 +1511,16 @@
3196 Py_INCREF(__pyx_v_x);
3197 __pyx_v_i = Py_None; Py_INCREF(Py_None);
3198
3199- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":341 */
3200+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":341 */
3201 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,1); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; goto __pyx_L1;}
3202
3203- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":342 */
3204+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":342 */
3205 (__pyx_v_self->tail[0]) = 'l';
3206
3207- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":343 */
3208+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":343 */
3209 E_UPDATE_TAIL(__pyx_v_self,1);
3210
3211- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":345 */
3212+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":345 */
3213 __pyx_2 = PyObject_GetIter(__pyx_v_x); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
3214 for (;;) {
3215 __pyx_3 = PyIter_Next(__pyx_2);
3216@@ -1542,16 +1542,16 @@
3217 }
3218 Py_DECREF(__pyx_2); __pyx_2 = 0;
3219
3220- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":348 */
3221+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":348 */
3222 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,1); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 348; goto __pyx_L1;}
3223
3224- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":349 */
3225+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":349 */
3226 (__pyx_v_self->tail[0]) = 'e';
3227
3228- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":350 */
3229+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":350 */
3230 E_UPDATE_TAIL(__pyx_v_self,1);
3231
3232- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":351 */
3233+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":351 */
3234 __pyx_r = 1;
3235 goto __pyx_L0;
3236
3237@@ -1585,16 +1585,16 @@
3238 __pyx_v_keys = Py_None; Py_INCREF(Py_None);
3239 __pyx_v_k = Py_None; Py_INCREF(Py_None);
3240
3241- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":354 */
3242+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":354 */
3243 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,1); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; goto __pyx_L1;}
3244
3245- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":355 */
3246+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":355 */
3247 (__pyx_v_self->tail[0]) = 'd';
3248
3249- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":356 */
3250+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":356 */
3251 E_UPDATE_TAIL(__pyx_v_self,1);
3252
3253- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":358 */
3254+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":358 */
3255 __pyx_2 = PyObject_GetAttr(__pyx_v_x, __pyx_n_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; goto __pyx_L1;}
3256 __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; goto __pyx_L1;}
3257 Py_DECREF(__pyx_2); __pyx_2 = 0;
3258@@ -1602,13 +1602,13 @@
3259 __pyx_v_keys = __pyx_3;
3260 __pyx_3 = 0;
3261
3262- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":359 */
3263+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":359 */
3264 __pyx_2 = PyObject_GetAttr(__pyx_v_keys, __pyx_n_sort); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; goto __pyx_L1;}
3265 __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; goto __pyx_L1;}
3266 Py_DECREF(__pyx_2); __pyx_2 = 0;
3267 Py_DECREF(__pyx_3); __pyx_3 = 0;
3268
3269- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":360 */
3270+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":360 */
3271 __pyx_2 = PyObject_GetIter(__pyx_v_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; goto __pyx_L1;}
3272 for (;;) {
3273 __pyx_3 = PyIter_Next(__pyx_2);
3274@@ -1620,7 +1620,7 @@
3275 __pyx_v_k = __pyx_3;
3276 __pyx_3 = 0;
3277
3278- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":361 */
3279+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":361 */
3280 __pyx_1 = (!PyString_CheckExact(__pyx_v_k));
3281 if (__pyx_1) {
3282 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; goto __pyx_L1;}
3283@@ -1635,10 +1635,10 @@
3284 }
3285 __pyx_L4:;
3286
3287- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":363 */
3288+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":363 */
3289 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_encode_string(__pyx_v_self,__pyx_v_k); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 363; goto __pyx_L1;}
3290
3291- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":364 */
3292+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":364 */
3293 __pyx_3 = PyObject_GetAttr(((PyObject *)__pyx_v_self), __pyx_n_process); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
3294 __pyx_4 = PyObject_GetItem(__pyx_v_x, __pyx_v_k); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
3295 __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
3296@@ -1651,16 +1651,16 @@
3297 }
3298 Py_DECREF(__pyx_2); __pyx_2 = 0;
3299
3300- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":366 */
3301+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":366 */
3302 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self->__pyx_vtab)->_ensure_buffer(__pyx_v_self,1); if (__pyx_1 == 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 366; goto __pyx_L1;}
3303
3304- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":367 */
3305+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":367 */
3306 (__pyx_v_self->tail[0]) = 'e';
3307
3308- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":368 */
3309+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":368 */
3310 E_UPDATE_TAIL(__pyx_v_self,1);
3311
3312- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":369 */
3313+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":369 */
3314 __pyx_r = 1;
3315 goto __pyx_L0;
3316
3317@@ -1694,7 +1694,7 @@
3318 Py_INCREF(__pyx_v_self);
3319 Py_INCREF(__pyx_v_x);
3320
3321- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":372 */
3322+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":372 */
3323 __pyx_1 = Py_EnterRecursiveCall(__pyx_k31);
3324 if (__pyx_1) {
3325 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 373; goto __pyx_L1;}
3326@@ -1709,7 +1709,7 @@
3327 }
3328 __pyx_L2:;
3329
3330- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":374 */
3331+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":374 */
3332 /*try:*/ {
3333 __pyx_1 = PyString_CheckExact(__pyx_v_x);
3334 if (__pyx_1) {
3335@@ -1831,13 +1831,13 @@
3336 Py_INCREF(__pyx_v_x);
3337 __pyx_v_encoder = Py_None; Py_INCREF(Py_None);
3338
3339- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":398 */
3340+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":398 */
3341 __pyx_1 = PyObject_CallObject(((PyObject *)__pyx_ptype_6bzrlib_12_bencode_pyx_Encoder), 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;}
3342 Py_DECREF(__pyx_v_encoder);
3343 __pyx_v_encoder = __pyx_1;
3344 __pyx_1 = 0;
3345
3346- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":399 */
3347+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":399 */
3348 __pyx_1 = PyObject_GetAttr(__pyx_v_encoder, __pyx_n_process); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; goto __pyx_L1;}
3349 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; goto __pyx_L1;}
3350 Py_INCREF(__pyx_v_x);
3351@@ -1847,7 +1847,7 @@
3352 Py_DECREF(__pyx_2); __pyx_2 = 0;
3353 Py_DECREF(__pyx_3); __pyx_3 = 0;
3354
3355- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":400 */
3356+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":400 */
3357 __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;}
3358 Py_INCREF(__pyx_v_encoder);
3359 PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_encoder);
3360@@ -2244,15 +2244,15 @@
3361 __pyx_ptype_6bzrlib_12_bencode_pyx_Encoder = &__pyx_type_6bzrlib_12_bencode_pyx_Encoder;
3362 __pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple = __Pyx_ImportType("bzrlib._static_tuple_c", "StaticTuple", sizeof(StaticTuple)); if (!__pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; goto __pyx_L1;}
3363
3364- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":66 */
3365+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":66 */
3366 __pyx_1 = import_static_tuple_c(); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
3367
3368- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":77 */
3369+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":77 */
3370 __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; goto __pyx_L1;}
3371 __pyx_d1 = __pyx_2;
3372 __pyx_2 = 0;
3373
3374- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":233 */
3375+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":233 */
3376 __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
3377 __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_object); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
3378 __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
3379@@ -2261,14 +2261,14 @@
3380 __pyx_4 = __Pyx_CreateClass(__pyx_5, __pyx_3, __pyx_n_Bencached, "bzrlib._bencode_pyx"); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
3381 Py_DECREF(__pyx_5); __pyx_5 = 0;
3382
3383- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":234 */
3384+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":234 */
3385 __pyx_5 = PyList_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
3386 Py_INCREF(__pyx_n_bencoded);
3387 PyList_SET_ITEM(__pyx_5, 0, __pyx_n_bencoded);
3388 if (PyObject_SetAttr(__pyx_4, __pyx_n___slots__, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
3389 Py_DECREF(__pyx_5); __pyx_5 = 0;
3390
3391- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":236 */
3392+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":236 */
3393 __pyx_5 = PyCFunction_New(&__pyx_mdef_6bzrlib_12_bencode_pyx_9Bencached___init__, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 236; goto __pyx_L1;}
3394 __pyx_6 = PyMethod_New(__pyx_5, 0, __pyx_4); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 236; goto __pyx_L1;}
3395 Py_DECREF(__pyx_5); __pyx_5 = 0;
3396@@ -2278,10 +2278,10 @@
3397 Py_DECREF(__pyx_4); __pyx_4 = 0;
3398 Py_DECREF(__pyx_3); __pyx_3 = 0;
3399
3400- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":253 */
3401+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":253 */
3402 __pyx_d2 = __pyx_e_6bzrlib_12_bencode_pyx_INITSIZE;
3403
3404- /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":396 */
3405+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":396 */
3406 return;
3407 __pyx_L1:;
3408 Py_XDECREF(__pyx_2);
3409
3410=== modified file 'bzrlib/_btree_serializer_pyx.c'
3411--- bzrlib/_btree_serializer_pyx.c 2010-08-07 00:54:52 +0000
3412+++ bzrlib/_btree_serializer_pyx.c 2011-09-27 11:59:19 +0000
3413@@ -1,4 +1,4 @@
3414-/* Generated by Pyrex 0.9.8.5 on Fri Aug 6 14:30:57 2010 */
3415+/* Generated by Pyrex 0.9.8.5 on Wed Oct 6 23:21:12 2010 */
3416
3417 #define PY_SSIZE_T_CLEAN
3418 #include "Python.h"
3419@@ -172,18 +172,18 @@
3420 void *__pyx_r;
3421 int __pyx_1;
3422
3423- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":74 */
3424+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":74 */
3425 __pyx_v_start = ((char *)__pyx_v_s);
3426
3427- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":75 */
3428+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":75 */
3429 __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
3430
3431- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":76 */
3432+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":76 */
3433 while (1) {
3434 __pyx_1 = (__pyx_v_pos >= __pyx_v_start);
3435 if (!__pyx_1) break;
3436
3437- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":77 */
3438+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":77 */
3439 __pyx_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
3440 if (__pyx_1) {
3441 __pyx_r = __pyx_v_pos;
3442@@ -192,11 +192,11 @@
3443 }
3444 __pyx_L4:;
3445
3446- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":79 */
3447+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":79 */
3448 __pyx_v_pos = (__pyx_v_pos - 1);
3449 }
3450
3451- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":80 */
3452+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":80 */
3453 __pyx_r = NULL;
3454 goto __pyx_L0;
3455
3456@@ -212,7 +212,7 @@
3457 PyObject *__pyx_3 = 0;
3458 PyObject *__pyx_4 = 0;
3459
3460- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":85 */
3461+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":85 */
3462 __pyx_1 = (__pyx_v_size < 0);
3463 if (__pyx_1) {
3464 __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
3465@@ -236,7 +236,7 @@
3466 }
3467 __pyx_L2:;
3468
3469- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":89 */
3470+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":89 */
3471 __pyx_2 = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; goto __pyx_L1;}
3472 __pyx_r = __pyx_2;
3473 __pyx_2 = 0;
3474@@ -264,7 +264,7 @@
3475 PyObject *__pyx_4 = 0;
3476 __pyx_v_result = Py_None; Py_INCREF(Py_None);
3477
3478- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":94 */
3479+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":94 */
3480 __pyx_1 = (__pyx_v_size < 0);
3481 if (__pyx_1) {
3482 __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; goto __pyx_L1;}
3483@@ -288,21 +288,21 @@
3484 }
3485 __pyx_L2:;
3486
3487- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":98 */
3488+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":98 */
3489 __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size);
3490
3491- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":99 */
3492+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":99 */
3493 PyString_InternInPlace((&__pyx_v_py_str));
3494
3495- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":100 */
3496+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":100 */
3497 Py_INCREF(((PyObject *)__pyx_v_py_str));
3498 Py_DECREF(__pyx_v_result);
3499 __pyx_v_result = ((PyObject *)__pyx_v_py_str);
3500
3501- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":103 */
3502+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":103 */
3503 Py_DECREF(__pyx_v_py_str);
3504
3505- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":104 */
3506+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":104 */
3507 Py_INCREF(__pyx_v_result);
3508 __pyx_r = __pyx_v_result;
3509 goto __pyx_L0;
3510@@ -335,32 +335,32 @@
3511 Py_INCREF(__pyx_v_key_length);
3512 Py_INCREF(__pyx_v_ref_list_length);
3513
3514- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":142 */
3515+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":142 */
3516 Py_INCREF(__pyx_v_bytes);
3517 Py_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
3518 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes = __pyx_v_bytes;
3519
3520- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":143 */
3521+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":143 */
3522 __pyx_1 = PyInt_AsLong(__pyx_v_key_length); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
3523 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->key_length = __pyx_1;
3524
3525- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":144 */
3526+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":144 */
3527 __pyx_1 = PyInt_AsLong(__pyx_v_ref_list_length); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; goto __pyx_L1;}
3528 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->ref_list_length = __pyx_1;
3529
3530- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":145 */
3531+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":145 */
3532 __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; goto __pyx_L1;}
3533 Py_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys);
3534 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys = __pyx_2;
3535 __pyx_2 = 0;
3536
3537- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":146 */
3538+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":146 */
3539 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = NULL;
3540
3541- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":147 */
3542+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":147 */
3543 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = NULL;
3544
3545- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":148 */
3546+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":148 */
3547 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_header_found = 0;
3548
3549 __pyx_r = 0;
3550@@ -393,20 +393,20 @@
3551 __pyx_v_failure_string = Py_None; Py_INCREF(Py_None);
3552 __pyx_v_key_element = Py_None; Py_INCREF(Py_None);
3553
3554- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":161 */
3555+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":161 */
3556 __pyx_1 = ((PyObject *)StaticTuple_New(__pyx_v_self->key_length)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; goto __pyx_L1;}
3557 Py_DECREF(((PyObject *)__pyx_v_key));
3558 __pyx_v_key = ((StaticTuple *)__pyx_1);
3559 __pyx_1 = 0;
3560
3561- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":162 */
3562+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":162 */
3563 __pyx_2 = __pyx_v_self->key_length;
3564 for (__pyx_v_loop_counter = 0; __pyx_v_loop_counter < __pyx_2; ++__pyx_v_loop_counter) {
3565
3566- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":164 */
3567+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":164 */
3568 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\0',(__pyx_v_last - __pyx_v_self->_start)));
3569
3570- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":165 */
3571+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":165 */
3572 __pyx_3 = (__pyx_v_temp_ptr == NULL);
3573 if (__pyx_3) {
3574 __pyx_3 = ((__pyx_v_loop_counter + 1) == __pyx_v_self->key_length);
3575@@ -416,7 +416,7 @@
3576 }
3577 /*else*/ {
3578
3579- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":171 */
3580+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":171 */
3581 __pyx_1 = __pyx_f_6bzrlib_21_btree_serializer_pyx_safe_string_from_size(__pyx_v_self->_start,(__pyx_v_last - __pyx_v_self->_start)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
3582 __pyx_4 = PyObject_Repr(__pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
3583 Py_DECREF(__pyx_1); __pyx_1 = 0;
3584@@ -426,7 +426,7 @@
3585 __pyx_v_failure_string = __pyx_1;
3586 __pyx_1 = 0;
3587
3588- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":174 */
3589+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":174 */
3590 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
3591 Py_INCREF(__pyx_v_failure_string);
3592 PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_failure_string);
3593@@ -441,7 +441,7 @@
3594 }
3595 __pyx_L4:;
3596
3597- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":176 */
3598+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":176 */
3599 __pyx_3 = (__pyx_v_self->key_length == 1);
3600 if (__pyx_3) {
3601 __pyx_3 = ((__pyx_v_temp_ptr - __pyx_v_self->_start) == 45);
3602@@ -464,23 +464,23 @@
3603 }
3604 __pyx_L6:;
3605
3606- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":185 */
3607+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":185 */
3608 __pyx_v_self->_start = (__pyx_v_temp_ptr + 1);
3609
3610- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":186 */
3611+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":186 */
3612 Py_INCREF(__pyx_v_key_element);
3613
3614- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":187 */
3615+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":187 */
3616 StaticTuple_SET_ITEM(__pyx_v_key,__pyx_v_loop_counter,__pyx_v_key_element);
3617 }
3618
3619- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":188 */
3620+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":188 */
3621 __pyx_4 = ((PyObject *)StaticTuple_Intern(__pyx_v_key)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; goto __pyx_L1;}
3622 Py_DECREF(((PyObject *)__pyx_v_key));
3623 __pyx_v_key = ((StaticTuple *)__pyx_4);
3624 __pyx_4 = 0;
3625
3626- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":189 */
3627+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":189 */
3628 Py_INCREF(((PyObject *)__pyx_v_key));
3629 __pyx_r = ((PyObject *)__pyx_v_key);
3630 goto __pyx_L0;
3631@@ -523,20 +523,20 @@
3632 __pyx_v_ref_list = Py_None; Py_INCREF(Py_None);
3633 __pyx_v_node_value = Py_None; Py_INCREF(Py_None);
3634
3635- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":200 */
3636+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":200 */
3637 __pyx_v_self->_start = __pyx_v_self->_cur_str;
3638
3639- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":202 */
3640+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":202 */
3641 __pyx_v_last = ((char *)memchr(__pyx_v_self->_start,'\n',(__pyx_v_self->_end_str - __pyx_v_self->_start)));
3642
3643- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":203 */
3644+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":203 */
3645 __pyx_1 = (__pyx_v_last == NULL);
3646 if (__pyx_1) {
3647
3648- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":205 */
3649+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":205 */
3650 __pyx_v_last = __pyx_v_self->_end_str;
3651
3652- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":206 */
3653+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":206 */
3654 __pyx_v_self->_cur_str = __pyx_v_self->_end_str;
3655 goto __pyx_L2;
3656 }
3657@@ -545,7 +545,7 @@
3658 }
3659 __pyx_L2:;
3660
3661- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":212 */
3662+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":212 */
3663 __pyx_1 = (__pyx_v_last == __pyx_v_self->_start);
3664 if (__pyx_1) {
3665 __pyx_r = 0;
3666@@ -554,7 +554,7 @@
3667 }
3668 __pyx_L3:;
3669
3670- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":215 */
3671+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":215 */
3672 __pyx_1 = (__pyx_v_last < __pyx_v_self->_start);
3673 if (__pyx_1) {
3674 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; goto __pyx_L1;}
3675@@ -569,16 +569,16 @@
3676 }
3677 __pyx_L4:;
3678
3679- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":218 */
3680+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":218 */
3681 __pyx_1 = (0 == __pyx_v_self->_header_found);
3682 if (__pyx_1) {
3683 __pyx_1 = (strncmp(__pyx_k5,__pyx_v_self->_start,(__pyx_v_last - __pyx_v_self->_start)) == 0);
3684 if (__pyx_1) {
3685
3686- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":221 */
3687+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":221 */
3688 __pyx_v_self->_header_found = 1;
3689
3690- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":222 */
3691+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":222 */
3692 __pyx_r = 0;
3693 goto __pyx_L0;
3694 goto __pyx_L6;
3695@@ -601,16 +601,16 @@
3696 }
3697 __pyx_L5:;
3698
3699- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":227 */
3700+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":227 */
3701 __pyx_2 = ((struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self->__pyx_vtab)->extract_key(__pyx_v_self,__pyx_v_last); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 227; goto __pyx_L1;}
3702 Py_DECREF(__pyx_v_key);
3703 __pyx_v_key = __pyx_2;
3704 __pyx_2 = 0;
3705
3706- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":229 */
3707+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":229 */
3708 __pyx_v_temp_ptr = ((char *)__pyx_f_6bzrlib_21_btree_serializer_pyx__my_memrchr(__pyx_v_self->_start,'\0',(__pyx_v_last - __pyx_v_self->_start)));
3709
3710- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":230 */
3711+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":230 */
3712 __pyx_1 = (__pyx_v_temp_ptr == NULL);
3713 if (__pyx_1) {
3714 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; goto __pyx_L1;}
3715@@ -625,10 +625,10 @@
3716 }
3717 /*else*/ {
3718
3719- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":240 */
3720+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":240 */
3721 __pyx_v_str_len = ((__pyx_v_last - __pyx_v_temp_ptr) - 1);
3722
3723- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":241 */
3724+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":241 */
3725 __pyx_1 = (__pyx_v_str_len > 4);
3726 if (__pyx_1) {
3727 __pyx_1 = (strncmp(__pyx_k8,(__pyx_v_last - 4),4) == 0);
3728@@ -648,39 +648,39 @@
3729 }
3730 __pyx_L8:;
3731
3732- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":249 */
3733+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":249 */
3734 __pyx_v_last = __pyx_v_temp_ptr;
3735 }
3736 __pyx_L7:;
3737
3738- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":251 */
3739+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":251 */
3740 __pyx_1 = __pyx_v_self->ref_list_length;
3741 if (__pyx_1) {
3742
3743- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":252 */
3744+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":252 */
3745 __pyx_3 = ((PyObject *)StaticTuple_New(__pyx_v_self->ref_list_length)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; goto __pyx_L1;}
3746 Py_DECREF(__pyx_v_ref_lists);
3747 __pyx_v_ref_lists = __pyx_3;
3748 __pyx_3 = 0;
3749
3750- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":253 */
3751+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":253 */
3752 __pyx_v_loop_counter = 0;
3753
3754- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":254 */
3755+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":254 */
3756 while (1) {
3757 __pyx_1 = (__pyx_v_loop_counter < __pyx_v_self->ref_list_length);
3758 if (!__pyx_1) break;
3759
3760- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":255 */
3761+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":255 */
3762 __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
3763 Py_DECREF(__pyx_v_ref_list);
3764 __pyx_v_ref_list = __pyx_2;
3765 __pyx_2 = 0;
3766
3767- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":257 */
3768+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":257 */
3769 __pyx_v_loop_counter = (__pyx_v_loop_counter + 1);
3770
3771- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":258 */
3772+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":258 */
3773 __pyx_1 = (__pyx_v_last < __pyx_v_self->_start);
3774 if (__pyx_1) {
3775 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; goto __pyx_L1;}
3776@@ -695,10 +695,10 @@
3777 }
3778 __pyx_L12:;
3779
3780- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":261 */
3781+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":261 */
3782 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\t',(__pyx_v_last - __pyx_v_self->_start)));
3783
3784- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":262 */
3785+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":262 */
3786 __pyx_1 = (__pyx_v_temp_ptr == NULL);
3787 if (__pyx_1) {
3788 __pyx_1 = (__pyx_v_loop_counter != __pyx_v_self->ref_list_length);
3789@@ -715,10 +715,10 @@
3790 }
3791 /*else*/ {
3792
3793- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":270 */
3794+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":270 */
3795 __pyx_v_ref_ptr = __pyx_v_last;
3796
3797- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":271 */
3798+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":271 */
3799 __pyx_v_next_start = __pyx_v_last;
3800 }
3801 __pyx_L14:;
3802@@ -726,23 +726,23 @@
3803 }
3804 /*else*/ {
3805
3806- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":274 */
3807+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":274 */
3808 __pyx_v_ref_ptr = __pyx_v_temp_ptr;
3809
3810- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":275 */
3811+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":275 */
3812 __pyx_v_next_start = (__pyx_v_temp_ptr + 1);
3813 }
3814 __pyx_L13:;
3815
3816- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":277 */
3817+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":277 */
3818 while (1) {
3819 __pyx_1 = (__pyx_v_self->_start < __pyx_v_ref_ptr);
3820 if (!__pyx_1) break;
3821
3822- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":279 */
3823+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":279 */
3824 __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\r',(__pyx_v_ref_ptr - __pyx_v_self->_start)));
3825
3826- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":281 */
3827+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":281 */
3828 __pyx_1 = (__pyx_v_temp_ptr == NULL);
3829 if (__pyx_1) {
3830 __pyx_v_temp_ptr = __pyx_v_ref_ptr;
3831@@ -750,13 +750,13 @@
3832 }
3833 __pyx_L17:;
3834
3835- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":285 */
3836+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":285 */
3837 __pyx_3 = ((struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self->__pyx_vtab)->extract_key(__pyx_v_self,__pyx_v_temp_ptr); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
3838 __pyx_1 = PyList_Append(__pyx_v_ref_list,__pyx_3); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
3839 Py_DECREF(__pyx_3); __pyx_3 = 0;
3840 }
3841
3842- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":286 */
3843+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":286 */
3844 __pyx_2 = PySequence_Tuple(__pyx_v_ref_list); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
3845 __pyx_3 = PyObject_CallObject(((PyObject *)__pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple), __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
3846 Py_DECREF(__pyx_2); __pyx_2 = 0;
3847@@ -766,18 +766,18 @@
3848 __pyx_v_ref_list = __pyx_2;
3849 __pyx_2 = 0;
3850
3851- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":287 */
3852+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":287 */
3853 Py_INCREF(__pyx_v_ref_list);
3854
3855- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":288 */
3856+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":288 */
3857 if (!__Pyx_TypeTest(__pyx_v_ref_lists, __pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; goto __pyx_L1;}
3858 StaticTuple_SET_ITEM(((StaticTuple *)__pyx_v_ref_lists),(__pyx_v_loop_counter - 1),__pyx_v_ref_list);
3859
3860- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":290 */
3861+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":290 */
3862 __pyx_v_self->_start = __pyx_v_next_start;
3863 }
3864
3865- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":291 */
3866+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":291 */
3867 __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; goto __pyx_L1;}
3868 Py_INCREF(__pyx_v_value);
3869 PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_value);
3870@@ -792,7 +792,7 @@
3871 }
3872 /*else*/ {
3873
3874- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":293 */
3875+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":293 */
3876 __pyx_1 = (__pyx_v_last != __pyx_v_self->_start);
3877 if (__pyx_1) {
3878 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
3879@@ -807,7 +807,7 @@
3880 }
3881 __pyx_L18:;
3882
3883- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":296 */
3884+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":296 */
3885 __pyx_3 = PyObject_CallObject(((PyObject *)__pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple), 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; goto __pyx_L1;}
3886 __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; goto __pyx_L1;}
3887 Py_INCREF(__pyx_v_value);
3888@@ -822,7 +822,7 @@
3889 }
3890 __pyx_L9:;
3891
3892- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":297 */
3893+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":297 */
3894 __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; goto __pyx_L1;}
3895 Py_INCREF(__pyx_v_key);
3896 PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_key);
3897@@ -833,7 +833,7 @@
3898 __pyx_1 = PyList_Append(__pyx_v_self->keys,__pyx_3); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; goto __pyx_L1;}
3899 Py_DECREF(__pyx_3); __pyx_3 = 0;
3900
3901- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":298 */
3902+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":298 */
3903 __pyx_r = 0;
3904 goto __pyx_L0;
3905
3906@@ -866,7 +866,7 @@
3907 if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
3908 Py_INCREF(__pyx_v_self);
3909
3910- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":302 */
3911+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":302 */
3912 __pyx_1 = (!PyString_CheckExact(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes));
3913 if (__pyx_1) {
3914 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; goto __pyx_L1;}
3915@@ -881,24 +881,24 @@
3916 }
3917 __pyx_L2:;
3918
3919- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":304 */
3920+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":304 */
3921 __pyx_v_byte_count = PyString_Size(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
3922
3923- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":305 */
3924+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":305 */
3925 __pyx_4 = PyString_AsString(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes); if (__pyx_4 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 305; goto __pyx_L1;}
3926 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = __pyx_4;
3927
3928- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":307 */
3929+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":307 */
3930 ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = (((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str + __pyx_v_byte_count);
3931
3932- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":308 */
3933+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":308 */
3934 while (1) {
3935 __pyx_1 = (((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str < ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str);
3936 if (!__pyx_1) break;
3937 __pyx_1 = ((struct __pyx_vtabstruct_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->__pyx_vtab)->process_line(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 309; goto __pyx_L1;}
3938 }
3939
3940- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":310 */
3941+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":310 */
3942 Py_INCREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys);
3943 __pyx_r = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys;
3944 goto __pyx_L0;
3945@@ -931,7 +931,7 @@
3946 Py_INCREF(__pyx_v_ref_list_length);
3947 __pyx_v_parser = Py_None; Py_INCREF(Py_None);
3948
3949- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":314 */
3950+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":314 */
3951 __pyx_1 = PyTuple_New(3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; goto __pyx_L1;}
3952 Py_INCREF(__pyx_v_bytes);
3953 PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_bytes);
3954@@ -945,7 +945,7 @@
3955 __pyx_v_parser = __pyx_2;
3956 __pyx_2 = 0;
3957
3958- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":315 */
3959+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":315 */
3960 __pyx_1 = PyObject_GetAttr(__pyx_v_parser, __pyx_n_parse); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;}
3961 __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;}
3962 Py_DECREF(__pyx_1); __pyx_1 = 0;
3963@@ -1014,7 +1014,7 @@
3964 __pyx_v_val = Py_None; Py_INCREF(Py_None);
3965 __pyx_v_line = Py_None; Py_INCREF(Py_None);
3966
3967- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":342 */
3968+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":342 */
3969 __pyx_1 = (!PyTuple_CheckExact(__pyx_v_node));
3970 if (__pyx_1) {
3971 __pyx_1 = (!StaticTuple_CheckExact(__pyx_v_node));
3972@@ -1039,15 +1039,15 @@
3973 }
3974 __pyx_L2:;
3975
3976- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":345 */
3977+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":345 */
3978 __pyx_4 = PyObject_Length(__pyx_v_node); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
3979 __pyx_v_node_len = __pyx_4;
3980
3981- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":346 */
3982+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":346 */
3983 __pyx_1 = PyInt_AsLong(__pyx_v_reference_lists); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; goto __pyx_L1;}
3984 __pyx_v_have_reference_lists = __pyx_1;
3985
3986- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":347 */
3987+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":347 */
3988 __pyx_1 = __pyx_v_have_reference_lists;
3989 if (__pyx_1) {
3990 __pyx_1 = (__pyx_v_node_len != 4);
3991@@ -1087,7 +1087,7 @@
3992 }
3993 __pyx_L3:;
3994
3995- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":364 */
3996+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":364 */
3997 __pyx_3 = PyObject_GetAttr(__pyx_k16p, __pyx_n_join); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
3998 __pyx_2 = __Pyx_GetItemInt(__pyx_v_node, 1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
3999 __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
4000@@ -1100,31 +1100,31 @@
4001 __pyx_v_string_key = __pyx_2;
4002 __pyx_2 = 0;
4003
4004- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":378 */
4005+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":378 */
4006 __pyx_v_refs_len = 0;
4007
4008- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":379 */
4009+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":379 */
4010 __pyx_1 = __pyx_v_have_reference_lists;
4011 if (__pyx_1) {
4012
4013- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":381 */
4014+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":381 */
4015 __pyx_3 = __Pyx_GetItemInt(__pyx_v_node, 3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
4016 Py_DECREF(__pyx_v_ref_lists);
4017 __pyx_v_ref_lists = __pyx_3;
4018 __pyx_3 = 0;
4019
4020- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":382 */
4021+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":382 */
4022 __pyx_4 = PyObject_Length(__pyx_v_ref_lists); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; goto __pyx_L1;}
4023 __pyx_v_next_len = __pyx_4;
4024
4025- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":383 */
4026+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":383 */
4027 __pyx_1 = (__pyx_v_next_len > 0);
4028 if (__pyx_1) {
4029
4030- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":387 */
4031+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":387 */
4032 __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
4033
4034- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":388 */
4035+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":388 */
4036 __pyx_5 = PyObject_GetIter(__pyx_v_ref_lists); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;}
4037 for (;;) {
4038 __pyx_2 = PyIter_Next(__pyx_5);
4039@@ -1136,18 +1136,18 @@
4040 __pyx_v_ref_list = __pyx_2;
4041 __pyx_2 = 0;
4042
4043- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":389 */
4044+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":389 */
4045 __pyx_4 = PyObject_Length(__pyx_v_ref_list); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 389; goto __pyx_L1;}
4046 __pyx_v_next_len = __pyx_4;
4047
4048- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":390 */
4049+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":390 */
4050 __pyx_1 = (__pyx_v_next_len > 0);
4051 if (__pyx_1) {
4052
4053- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":393 */
4054+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":393 */
4055 __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
4056
4057- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":394 */
4058+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":394 */
4059 __pyx_3 = PyObject_GetIter(__pyx_v_ref_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; goto __pyx_L1;}
4060 for (;;) {
4061 __pyx_2 = PyIter_Next(__pyx_3);
4062@@ -1159,7 +1159,7 @@
4063 __pyx_v_reference = __pyx_2;
4064 __pyx_2 = 0;
4065
4066- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":395 */
4067+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":395 */
4068 __pyx_1 = (!PyTuple_CheckExact(__pyx_v_reference));
4069 if (__pyx_1) {
4070 __pyx_1 = (!StaticTuple_CheckExact(__pyx_v_reference));
4071@@ -1184,18 +1184,18 @@
4072 }
4073 __pyx_L12:;
4074
4075- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":400 */
4076+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":400 */
4077 __pyx_4 = PyObject_Length(__pyx_v_reference); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;}
4078 __pyx_v_next_len = __pyx_4;
4079
4080- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":401 */
4081+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":401 */
4082 __pyx_1 = (__pyx_v_next_len > 0);
4083 if (__pyx_1) {
4084
4085- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":404 */
4086+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":404 */
4087 __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
4088
4089- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":405 */
4090+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":405 */
4091 __pyx_6 = PyObject_GetIter(__pyx_v_reference); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; goto __pyx_L1;}
4092 for (;;) {
4093 __pyx_2 = PyIter_Next(__pyx_6);
4094@@ -1207,7 +1207,7 @@
4095 __pyx_v_ref_bit = __pyx_2;
4096 __pyx_2 = 0;
4097
4098- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":406 */
4099+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":406 */
4100 __pyx_1 = (!PyString_CheckExact(__pyx_v_ref_bit));
4101 if (__pyx_1) {
4102 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 409; goto __pyx_L1;}
4103@@ -1229,7 +1229,7 @@
4104 }
4105 __pyx_L16:;
4106
4107- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":410 */
4108+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":410 */
4109 __pyx_v_refs_len = (__pyx_v_refs_len + PyString_GET_SIZE(__pyx_v_ref_bit));
4110 }
4111 Py_DECREF(__pyx_6); __pyx_6 = 0;
4112@@ -1250,16 +1250,16 @@
4113 }
4114 __pyx_L5:;
4115
4116- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":413 */
4117+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":413 */
4118 __pyx_v_key_len = PyString_Size(__pyx_v_string_key);
4119
4120- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":414 */
4121+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":414 */
4122 __pyx_7 = __Pyx_GetItemInt(__pyx_v_node, 2); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; goto __pyx_L1;}
4123 Py_DECREF(__pyx_v_val);
4124 __pyx_v_val = __pyx_7;
4125 __pyx_7 = 0;
4126
4127- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":415 */
4128+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":415 */
4129 __pyx_1 = (!PyString_CheckExact(__pyx_v_val));
4130 if (__pyx_1) {
4131 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; goto __pyx_L1;}
4132@@ -1281,46 +1281,46 @@
4133 }
4134 __pyx_L17:;
4135
4136- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":418 */
4137+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":418 */
4138 __pyx_v_value = PyString_AS_STRING(__pyx_v_val);
4139
4140- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":419 */
4141+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":419 */
4142 __pyx_v_value_len = PyString_GET_SIZE(__pyx_v_val);
4143
4144- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":420 */
4145+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":420 */
4146 __pyx_v_flat_len = (((((__pyx_v_key_len + 1) + __pyx_v_refs_len) + 1) + __pyx_v_value_len) + 1);
4147
4148- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":421 */
4149+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":421 */
4150 __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_flat_len); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
4151 Py_DECREF(__pyx_v_line);
4152 __pyx_v_line = __pyx_2;
4153 __pyx_2 = 0;
4154
4155- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":423 */
4156+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":423 */
4157 __pyx_8 = PyString_AsString(__pyx_v_line); if (__pyx_8 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;}
4158 __pyx_v_out = __pyx_8;
4159
4160- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":424 */
4161+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":424 */
4162 __pyx_8 = PyString_AsString(__pyx_v_string_key); if (__pyx_8 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; goto __pyx_L1;}
4163 memcpy(__pyx_v_out,__pyx_8,__pyx_v_key_len);
4164
4165- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":425 */
4166+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":425 */
4167 __pyx_v_out = (__pyx_v_out + __pyx_v_key_len);
4168
4169- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":426 */
4170+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":426 */
4171 (__pyx_v_out[0]) = '\0';
4172
4173- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":427 */
4174+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":427 */
4175 __pyx_v_out = (__pyx_v_out + 1);
4176
4177- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":428 */
4178+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":428 */
4179 __pyx_1 = (__pyx_v_refs_len > 0);
4180 if (__pyx_1) {
4181
4182- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":429 */
4183+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":429 */
4184 __pyx_v_first_ref_list = 1;
4185
4186- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":430 */
4187+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":430 */
4188 __pyx_6 = PyObject_GetIter(__pyx_v_ref_lists); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;}
4189 for (;;) {
4190 __pyx_3 = PyIter_Next(__pyx_6);
4191@@ -1332,26 +1332,26 @@
4192 __pyx_v_ref_list = __pyx_3;
4193 __pyx_3 = 0;
4194
4195- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":431 */
4196+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":431 */
4197 __pyx_1 = (__pyx_v_first_ref_list == 0);
4198 if (__pyx_1) {
4199
4200- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":432 */
4201+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":432 */
4202 (__pyx_v_out[0]) = '\t';
4203
4204- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":433 */
4205+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":433 */
4206 __pyx_v_out = (__pyx_v_out + 1);
4207 goto __pyx_L21;
4208 }
4209 __pyx_L21:;
4210
4211- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":434 */
4212+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":434 */
4213 __pyx_v_first_ref_list = 0;
4214
4215- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":435 */
4216+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":435 */
4217 __pyx_v_first_reference = 1;
4218
4219- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":436 */
4220+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":436 */
4221 __pyx_5 = PyObject_GetIter(__pyx_v_ref_list); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; goto __pyx_L1;}
4222 for (;;) {
4223 __pyx_7 = PyIter_Next(__pyx_5);
4224@@ -1363,55 +1363,55 @@
4225 __pyx_v_reference = __pyx_7;
4226 __pyx_7 = 0;
4227
4228- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":437 */
4229+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":437 */
4230 __pyx_1 = (__pyx_v_first_reference == 0);
4231 if (__pyx_1) {
4232
4233- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":438 */
4234+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":438 */
4235 (__pyx_v_out[0]) = '\r';
4236
4237- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":439 */
4238+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":439 */
4239 __pyx_v_out = (__pyx_v_out + 1);
4240 goto __pyx_L24;
4241 }
4242 __pyx_L24:;
4243
4244- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":440 */
4245+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":440 */
4246 __pyx_v_first_reference = 0;
4247
4248- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":441 */
4249+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":441 */
4250 __pyx_4 = PyObject_Length(__pyx_v_reference); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
4251 __pyx_v_next_len = __pyx_4;
4252
4253- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":442 */
4254+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":442 */
4255 for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_next_len; ++__pyx_v_i) {
4256
4257- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":443 */
4258+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":443 */
4259 __pyx_1 = (__pyx_v_i != 0);
4260 if (__pyx_1) {
4261
4262- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":444 */
4263+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":444 */
4264 (__pyx_v_out[0]) = '\x000';
4265
4266- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":445 */
4267+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":445 */
4268 __pyx_v_out = (__pyx_v_out + 1);
4269 goto __pyx_L27;
4270 }
4271 __pyx_L27:;
4272
4273- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":446 */
4274+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":446 */
4275 __pyx_2 = __Pyx_GetItemInt(__pyx_v_reference, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
4276 Py_DECREF(__pyx_v_ref_bit);
4277 __pyx_v_ref_bit = __pyx_2;
4278 __pyx_2 = 0;
4279
4280- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":447 */
4281+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":447 */
4282 __pyx_v_ref_bit_len = PyString_GET_SIZE(__pyx_v_ref_bit);
4283
4284- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":448 */
4285+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":448 */
4286 memcpy(__pyx_v_out,PyString_AS_STRING(__pyx_v_ref_bit),__pyx_v_ref_bit_len);
4287
4288- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":449 */
4289+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":449 */
4290 __pyx_v_out = (__pyx_v_out + __pyx_v_ref_bit_len);
4291 }
4292 }
4293@@ -1422,22 +1422,22 @@
4294 }
4295 __pyx_L18:;
4296
4297- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":450 */
4298+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":450 */
4299 (__pyx_v_out[0]) = '\0';
4300
4301- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":451 */
4302+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":451 */
4303 __pyx_v_out = (__pyx_v_out + 1);
4304
4305- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":452 */
4306+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":452 */
4307 memcpy(__pyx_v_out,__pyx_v_value,__pyx_v_value_len);
4308
4309- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":453 */
4310+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":453 */
4311 __pyx_v_out = (__pyx_v_out + __pyx_v_value_len);
4312
4313- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":454 */
4314+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":454 */
4315 (__pyx_v_out[0]) = '\n';
4316
4317- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":455 */
4318+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":455 */
4319 __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; goto __pyx_L1;}
4320 Py_INCREF(__pyx_v_string_key);
4321 PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_string_key);
4322@@ -1668,7 +1668,7 @@
4323 __pyx_ptype_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser = &__pyx_type_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser;
4324 __pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple = __Pyx_ImportType("bzrlib._static_tuple_c", "StaticTuple", sizeof(StaticTuple)); if (!__pyx_ptype_6bzrlib_15_static_tuple_c_StaticTuple) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; goto __pyx_L1;}
4325
4326- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":106 */
4327+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":106 */
4328 __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
4329 Py_INCREF(__pyx_n__static_tuple_c);
4330 PyList_SET_ITEM(__pyx_1, 0, __pyx_n__static_tuple_c);
4331@@ -1679,10 +1679,10 @@
4332 Py_DECREF(__pyx_1); __pyx_1 = 0;
4333 Py_DECREF(__pyx_2); __pyx_2 = 0;
4334
4335- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":108 */
4336+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":108 */
4337 __pyx_3 = import_static_tuple_c(); if (__pyx_3 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
4338
4339- /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":318 */
4340+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":318 */
4341 return;
4342 __pyx_L1:;
4343 Py_XDECREF(__pyx_1);
4344
4345=== modified file 'bzrlib/_chk_map_pyx.c'
4346--- bzrlib/_chk_map_pyx.c 2010-08-07 00:54:52 +0000
4347+++ bzrlib/_chk_map_pyx.c 2011-09-27 11:59:19 +0000
4348@@ -1,4 +1,4 @@
4349-/* Generated by Pyrex 0.9.8.5 on Fri Aug 6 14:30:42 2010 */
4350+/* Generated by Pyrex 0.9.8.5 on Wed Oct 6 23:21:10 2010 */
4351
4352 #define PY_SSIZE_T_CLEAN
4353 #include "Python.h"
4354@@ -232,18 +232,18 @@
4355 void *__pyx_r;
4356 int __pyx_1;
4357
4358- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":76 */
4359+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":76 */
4360 __pyx_v_start = ((char *)__pyx_v_s);
4361
4362- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":77 */
4363+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":77 */
4364 __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
4365
4366- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":78 */
4367+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":78 */
4368 while (1) {
4369 __pyx_1 = (__pyx_v_pos >= __pyx_v_start);
4370 if (!__pyx_1) break;
4371
4372- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":79 */
4373+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":79 */
4374 __pyx_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
4375 if (__pyx_1) {
4376 __pyx_r = __pyx_v_pos;
4377@@ -252,11 +252,11 @@
4378 }
4379 __pyx_L4:;
4380
4381- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":81 */
4382+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":81 */
4383 __pyx_v_pos = (__pyx_v_pos - 1);
4384 }
4385
4386- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":82 */
4387+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":82 */
4388 __pyx_r = NULL;
4389 goto __pyx_L0;
4390
4391@@ -275,7 +275,7 @@
4392 PyObject *__pyx_4 = 0;
4393 __pyx_v_result = Py_None; Py_INCREF(Py_None);
4394
4395- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":87 */
4396+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":87 */
4397 __pyx_1 = (__pyx_v_size < 0);
4398 if (__pyx_1) {
4399 __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;}
4400@@ -299,21 +299,21 @@
4401 }
4402 __pyx_L2:;
4403
4404- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":91 */
4405+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":91 */
4406 __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size);
4407
4408- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":92 */
4409+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":92 */
4410 PyString_InternInPlace((&__pyx_v_py_str));
4411
4412- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":93 */
4413+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":93 */
4414 Py_INCREF(((PyObject *)__pyx_v_py_str));
4415 Py_DECREF(__pyx_v_result);
4416 __pyx_v_result = ((PyObject *)__pyx_v_py_str);
4417
4418- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":96 */
4419+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":96 */
4420 Py_DECREF(__pyx_v_py_str);
4421
4422- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":97 */
4423+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":97 */
4424 Py_INCREF(__pyx_v_result);
4425 __pyx_r = __pyx_v_result;
4426 goto __pyx_L0;
4427@@ -351,39 +351,39 @@
4428 Py_INCREF(__pyx_v_key);
4429 __pyx_v_out = Py_None; Py_INCREF(Py_None);
4430
4431- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":109 */
4432+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":109 */
4433 __pyx_1 = PyObject_Length(__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
4434 __pyx_v_num_bits = __pyx_1;
4435
4436- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":111 */
4437+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":111 */
4438 __pyx_v_num_out_bytes = ((9 * __pyx_v_num_bits) - 1);
4439
4440- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":112 */
4441+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":112 */
4442 __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_num_out_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; goto __pyx_L1;}
4443 Py_DECREF(__pyx_v_out);
4444 __pyx_v_out = __pyx_2;
4445 __pyx_2 = 0;
4446
4447- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":113 */
4448+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":113 */
4449 __pyx_v_c_out = PyString_AS_STRING(__pyx_v_out);
4450
4451- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":114 */
4452+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":114 */
4453 for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_bits; ++__pyx_v_i) {
4454
4455- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":115 */
4456+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":115 */
4457 __pyx_3 = (__pyx_v_i > 0);
4458 if (__pyx_3) {
4459
4460- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":116 */
4461+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":116 */
4462 (__pyx_v_c_out[0]) = '\x000';
4463
4464- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":117 */
4465+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":117 */
4466 __pyx_v_c_out = (__pyx_v_c_out + 1);
4467 goto __pyx_L4;
4468 }
4469 __pyx_L4:;
4470
4471- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":118 */
4472+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":118 */
4473 __pyx_2 = __Pyx_GetItemInt(__pyx_v_key, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
4474 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
4475 PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
4476@@ -393,14 +393,14 @@
4477 __pyx_v_crc_val = PyInt_AS_LONG(__pyx_2);
4478 Py_DECREF(__pyx_2); __pyx_2 = 0;
4479
4480- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":120 */
4481+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":120 */
4482 sprintf(__pyx_v_c_out,__pyx_k2,__pyx_v_crc_val);
4483
4484- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":121 */
4485+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":121 */
4486 __pyx_v_c_out = (__pyx_v_c_out + 8);
4487 }
4488
4489- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":122 */
4490+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":122 */
4491 Py_INCREF(__pyx_v_out);
4492 __pyx_r = __pyx_v_out;
4493 goto __pyx_L0;
4494@@ -439,39 +439,39 @@
4495 Py_INCREF(__pyx_v_key);
4496 __pyx_v_out = Py_None; Py_INCREF(Py_None);
4497
4498- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":134 */
4499+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":134 */
4500 __pyx_1 = PyObject_Length(__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; goto __pyx_L1;}
4501 __pyx_v_num_bits = __pyx_1;
4502
4503- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":136 */
4504+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":136 */
4505 __pyx_v_num_out_bytes = ((5 * __pyx_v_num_bits) - 1);
4506
4507- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":137 */
4508+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":137 */
4509 __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_num_out_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;}
4510 Py_DECREF(__pyx_v_out);
4511 __pyx_v_out = __pyx_2;
4512 __pyx_2 = 0;
4513
4514- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":138 */
4515+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":138 */
4516 __pyx_v_c_out = PyString_AS_STRING(__pyx_v_out);
4517
4518- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":139 */
4519+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":139 */
4520 for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_bits; ++__pyx_v_i) {
4521
4522- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":140 */
4523+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":140 */
4524 __pyx_3 = (__pyx_v_i > 0);
4525 if (__pyx_3) {
4526
4527- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":141 */
4528+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":141 */
4529 (__pyx_v_c_out[0]) = '\x000';
4530
4531- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":142 */
4532+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":142 */
4533 __pyx_v_c_out = (__pyx_v_c_out + 1);
4534 goto __pyx_L4;
4535 }
4536 __pyx_L4:;
4537
4538- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":143 */
4539+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":143 */
4540 __pyx_2 = __Pyx_GetItemInt(__pyx_v_key, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
4541 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
4542 PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
4543@@ -481,19 +481,19 @@
4544 __pyx_v_crc_val = PyInt_AS_LONG(__pyx_2);
4545 Py_DECREF(__pyx_2); __pyx_2 = 0;
4546
4547- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":145 */
4548+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":145 */
4549 (__pyx_v_c_out[0]) = ((__pyx_v_crc_val >> 24) & 0xFF);
4550
4551- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":146 */
4552+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":146 */
4553 (__pyx_v_c_out[1]) = ((__pyx_v_crc_val >> 16) & 0xFF);
4554
4555- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":147 */
4556+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":147 */
4557 (__pyx_v_c_out[2]) = ((__pyx_v_crc_val >> 8) & 0xFF);
4558
4559- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":148 */
4560+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":148 */
4561 (__pyx_v_c_out[3]) = ((__pyx_v_crc_val >> 0) & 0xFF);
4562
4563- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":149 */
4564+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":149 */
4565 for (__pyx_v_j = 0; __pyx_v_j < 4; ++__pyx_v_j) {
4566 __pyx_3 = ((__pyx_v_c_out[__pyx_v_j]) == '\n');
4567 if (__pyx_3) {
4568@@ -503,11 +503,11 @@
4569 __pyx_L7:;
4570 }
4571
4572- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":152 */
4573+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":152 */
4574 __pyx_v_c_out = (__pyx_v_c_out + 4);
4575 }
4576
4577- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":153 */
4578+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":153 */
4579 Py_INCREF(__pyx_v_out);
4580 __pyx_r = __pyx_v_out;
4581 goto __pyx_L0;
4582@@ -534,10 +534,10 @@
4583 PyObject *__pyx_2 = 0;
4584 PyObject *__pyx_3 = 0;
4585
4586- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":167 */
4587+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":167 */
4588 __pyx_v_next_line = ((char *)memchr((__pyx_v_cur[0]),'\n',(__pyx_v_end - (__pyx_v_cur[0]))));
4589
4590- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":168 */
4591+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":168 */
4592 __pyx_1 = (__pyx_v_next_line == NULL);
4593 if (__pyx_1) {
4594 __pyx_2 = PyString_FromString(__pyx_v_message); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; goto __pyx_L1;}
4595@@ -555,10 +555,10 @@
4596 }
4597 __pyx_L2:;
4598
4599- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":171 */
4600+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":171 */
4601 __pyx_v_value = strtol((__pyx_v_cur[0]),(&__pyx_v_next),10);
4602
4603- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":172 */
4604+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":172 */
4605 __pyx_1 = (__pyx_v_next != __pyx_v_next_line);
4606 if (__pyx_1) {
4607 __pyx_2 = PyString_FromString(__pyx_v_message); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
4608@@ -576,10 +576,10 @@
4609 }
4610 __pyx_L3:;
4611
4612- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":174 */
4613+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":174 */
4614 (__pyx_v_cur[0]) = (__pyx_v_next_line + 1);
4615
4616- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":175 */
4617+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":175 */
4618 __pyx_r = __pyx_v_value;
4619 goto __pyx_L0;
4620
4621@@ -601,7 +601,7 @@
4622 PyObject *__pyx_2 = 0;
4623 __pyx_v_chk_map = Py_None; Py_INCREF(Py_None);
4624
4625- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":182 */
4626+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":182 */
4627 __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
4628 Py_INCREF(__pyx_n_chk_map);
4629 PyList_SET_ITEM(__pyx_1, 0, __pyx_n_chk_map);
4630@@ -613,19 +613,19 @@
4631 __pyx_1 = 0;
4632 Py_DECREF(__pyx_2); __pyx_2 = 0;
4633
4634- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":183 */
4635+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":183 */
4636 __pyx_2 = PyObject_GetAttr(__pyx_v_chk_map, __pyx_n_LeafNode); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; goto __pyx_L1;}
4637 Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__LeafNode);
4638 __pyx_v_6bzrlib_12_chk_map_pyx__LeafNode = __pyx_2;
4639 __pyx_2 = 0;
4640
4641- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":184 */
4642+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":184 */
4643 __pyx_1 = PyObject_GetAttr(__pyx_v_chk_map, __pyx_n_InternalNode); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;}
4644 Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__InternalNode);
4645 __pyx_v_6bzrlib_12_chk_map_pyx__InternalNode = __pyx_1;
4646 __pyx_1 = 0;
4647
4648- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":185 */
4649+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":185 */
4650 __pyx_2 = PyObject_GetAttr(__pyx_v_chk_map, __pyx_n__unknown); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; goto __pyx_L1;}
4651 Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__unknown);
4652 __pyx_v_6bzrlib_12_chk_map_pyx__unknown = __pyx_2;
4653@@ -696,7 +696,7 @@
4654 __pyx_v_entry = Py_None; Py_INCREF(Py_None);
4655 __pyx_v_value = Py_None; Py_INCREF(Py_None);
4656
4657- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":204 */
4658+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":204 */
4659 __pyx_1 = __pyx_v_6bzrlib_12_chk_map_pyx__LeafNode == Py_None;
4660 if (__pyx_1) {
4661 __pyx_2 = __pyx_f_6bzrlib_12_chk_map_pyx__import_globals(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; goto __pyx_L1;}
4662@@ -705,7 +705,7 @@
4663 }
4664 __pyx_L2:;
4665
4666- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":207 */
4667+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":207 */
4668 __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
4669 __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
4670 if (PyDict_SetItem(__pyx_3, __pyx_n_search_key_func, __pyx_v_search_key_func) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
4671@@ -716,7 +716,7 @@
4672 __pyx_v_result = __pyx_4;
4673 __pyx_4 = 0;
4674
4675- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":210 */
4676+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":210 */
4677 __pyx_1 = (!PyString_CheckExact(__pyx_v_bytes));
4678 if (__pyx_1) {
4679 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;}
4680@@ -741,13 +741,13 @@
4681 }
4682 __pyx_L3:;
4683
4684- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":213 */
4685+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":213 */
4686 __pyx_v_c_bytes = PyString_AS_STRING(__pyx_v_bytes);
4687
4688- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":214 */
4689+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":214 */
4690 __pyx_v_c_bytes_len = PyString_GET_SIZE(__pyx_v_bytes);
4691
4692- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":216 */
4693+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":216 */
4694 __pyx_1 = (__pyx_v_c_bytes_len < 9);
4695 if (!__pyx_1) {
4696 __pyx_1 = (memcmp(__pyx_v_c_bytes,__pyx_k12,9) != 0);
4697@@ -766,7 +766,7 @@
4698 }
4699 __pyx_L4:;
4700
4701- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":218 */
4702+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":218 */
4703 __pyx_1 = ((__pyx_v_c_bytes[(__pyx_v_c_bytes_len - 1)]) != '\n');
4704 if (__pyx_1) {
4705 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
4706@@ -781,28 +781,28 @@
4707 }
4708 __pyx_L5:;
4709
4710- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":221 */
4711+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":221 */
4712 __pyx_v_end = (__pyx_v_c_bytes + __pyx_v_c_bytes_len);
4713
4714- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":222 */
4715+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":222 */
4716 __pyx_v_cur = (__pyx_v_c_bytes + 9);
4717
4718- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":223 */
4719+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":223 */
4720 __pyx_1 = __pyx_f_6bzrlib_12_chk_map_pyx__get_int_from_line((&__pyx_v_cur),__pyx_v_end,__pyx_k15); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
4721 __pyx_v_maximum_size = __pyx_1;
4722
4723- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":224 */
4724+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":224 */
4725 __pyx_1 = __pyx_f_6bzrlib_12_chk_map_pyx__get_int_from_line((&__pyx_v_cur),__pyx_v_end,__pyx_k16); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
4726 __pyx_v_width = __pyx_1;
4727
4728- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":225 */
4729+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":225 */
4730 __pyx_1 = __pyx_f_6bzrlib_12_chk_map_pyx__get_int_from_line((&__pyx_v_cur),__pyx_v_end,__pyx_k17); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; goto __pyx_L1;}
4731 __pyx_v_length = __pyx_1;
4732
4733- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":227 */
4734+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":227 */
4735 __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
4736
4737- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":228 */
4738+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":228 */
4739 __pyx_1 = (__pyx_v_next_line == NULL);
4740 if (__pyx_1) {
4741 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
4742@@ -817,39 +817,39 @@
4743 }
4744 __pyx_L6:;
4745
4746- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":230 */
4747+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":230 */
4748 __pyx_v_prefix = __pyx_v_cur;
4749
4750- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":231 */
4751+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":231 */
4752 __pyx_v_prefix_length = (__pyx_v_next_line - __pyx_v_cur);
4753
4754- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":232 */
4755+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":232 */
4756 __pyx_v_cur = (__pyx_v_next_line + 1);
4757
4758- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":234 */
4759+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":234 */
4760 __pyx_3 = PyList_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
4761 Py_DECREF(__pyx_v_prefix_bits);
4762 __pyx_v_prefix_bits = __pyx_3;
4763 __pyx_3 = 0;
4764
4765- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":235 */
4766+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":235 */
4767 __pyx_v_prefix_tail = __pyx_v_prefix;
4768
4769- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":236 */
4770+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":236 */
4771 __pyx_v_num_prefix_bits = 0;
4772
4773- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":237 */
4774+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":237 */
4775 __pyx_v_next_null = ((char *)memchr(__pyx_v_prefix,'\0',__pyx_v_prefix_length));
4776
4777- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":238 */
4778+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":238 */
4779 while (1) {
4780 __pyx_1 = (__pyx_v_next_null != NULL);
4781 if (!__pyx_1) break;
4782
4783- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":239 */
4784+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":239 */
4785 __pyx_v_num_prefix_bits = (__pyx_v_num_prefix_bits + 1);
4786
4787- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":240 */
4788+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":240 */
4789 __pyx_4 = PyObject_GetAttr(__pyx_v_prefix_bits, __pyx_n_append); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;}
4790 __pyx_2 = PyString_FromStringAndSize(__pyx_v_prefix_tail,(__pyx_v_next_null - __pyx_v_prefix_tail)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; goto __pyx_L1;}
4791 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;}
4792@@ -860,17 +860,17 @@
4793 Py_DECREF(__pyx_3); __pyx_3 = 0;
4794 Py_DECREF(__pyx_2); __pyx_2 = 0;
4795
4796- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":242 */
4797+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":242 */
4798 __pyx_v_prefix_tail = (__pyx_v_next_null + 1);
4799
4800- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":243 */
4801+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":243 */
4802 __pyx_v_next_null = ((char *)memchr(__pyx_v_prefix_tail,'\0',(__pyx_v_next_line - __pyx_v_prefix_tail)));
4803 }
4804
4805- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":244 */
4806+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":244 */
4807 __pyx_v_prefix_tail_len = (__pyx_v_next_line - __pyx_v_prefix_tail);
4808
4809- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":246 */
4810+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":246 */
4811 __pyx_1 = (__pyx_v_num_prefix_bits >= __pyx_v_width);
4812 if (__pyx_1) {
4813 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
4814@@ -885,27 +885,27 @@
4815 }
4816 __pyx_L9:;
4817
4818- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":249 */
4819+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":249 */
4820 __pyx_v_items_length = (__pyx_v_end - __pyx_v_cur);
4821
4822- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":250 */
4823+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":250 */
4824 __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
4825 Py_DECREF(__pyx_v_items);
4826 __pyx_v_items = __pyx_2;
4827 __pyx_2 = 0;
4828
4829- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":251 */
4830+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":251 */
4831 while (1) {
4832 __pyx_1 = (__pyx_v_cur < __pyx_v_end);
4833 if (!__pyx_1) break;
4834
4835- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":252 */
4836+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":252 */
4837 __pyx_v_line_start = __pyx_v_cur;
4838
4839- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":253 */
4840+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":253 */
4841 __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
4842
4843- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":254 */
4844+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":254 */
4845 __pyx_1 = (__pyx_v_next_line == NULL);
4846 if (__pyx_1) {
4847 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
4848@@ -920,10 +920,10 @@
4849 }
4850 __pyx_L12:;
4851
4852- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":256 */
4853+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":256 */
4854 __pyx_v_last_null = ((char *)__pyx_f_6bzrlib_12_chk_map_pyx__my_memrchr(__pyx_v_cur,'\0',(__pyx_v_next_line - __pyx_v_cur)));
4855
4856- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":257 */
4857+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":257 */
4858 __pyx_1 = (__pyx_v_last_null == NULL);
4859 if (__pyx_1) {
4860 __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 258; goto __pyx_L1;}
4861@@ -938,26 +938,26 @@
4862 }
4863 __pyx_L13:;
4864
4865- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":259 */
4866+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":259 */
4867 __pyx_v_next_null = (__pyx_v_last_null + 1);
4868
4869- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":260 */
4870+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":260 */
4871 __pyx_1 = __pyx_f_6bzrlib_12_chk_map_pyx__get_int_from_line((&__pyx_v_next_null),(__pyx_v_next_line + 1),__pyx_k23); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
4872 __pyx_v_num_value_lines = __pyx_1;
4873
4874- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":262 */
4875+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":262 */
4876 __pyx_v_cur = (__pyx_v_next_line + 1);
4877
4878- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":263 */
4879+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":263 */
4880 __pyx_v_value_start = __pyx_v_cur;
4881
4882- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":265 */
4883+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":265 */
4884 for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_value_lines; ++__pyx_v_i) {
4885
4886- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":266 */
4887+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":266 */
4888 __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
4889
4890- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":267 */
4891+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":267 */
4892 __pyx_1 = (__pyx_v_next_line == NULL);
4893 if (__pyx_1) {
4894 __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; goto __pyx_L1;}
4895@@ -972,45 +972,45 @@
4896 }
4897 __pyx_L16:;
4898
4899- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":269 */
4900+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":269 */
4901 __pyx_v_cur = (__pyx_v_next_line + 1);
4902 }
4903
4904- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":270 */
4905+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":270 */
4906 __pyx_4 = ((PyObject *)StaticTuple_New(__pyx_v_width)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; goto __pyx_L1;}
4907 Py_DECREF(((PyObject *)__pyx_v_entry_bits));
4908 __pyx_v_entry_bits = ((StaticTuple *)__pyx_4);
4909 __pyx_4 = 0;
4910
4911- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":271 */
4912+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":271 */
4913 for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_prefix_bits; ++__pyx_v_i) {
4914
4915- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":274 */
4916+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":274 */
4917 __pyx_3 = __Pyx_GetItemInt(__pyx_v_prefix_bits, __pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; goto __pyx_L1;}
4918 Py_DECREF(__pyx_v_entry);
4919 __pyx_v_entry = __pyx_3;
4920 __pyx_3 = 0;
4921
4922- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":276 */
4923+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":276 */
4924 Py_INCREF(__pyx_v_entry);
4925
4926- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":277 */
4927+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":277 */
4928 StaticTuple_SET_ITEM(__pyx_v_entry_bits,__pyx_v_i,__pyx_v_entry);
4929 }
4930
4931- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":278 */
4932+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":278 */
4933 __pyx_2 = PyString_FromStringAndSize(__pyx_v_value_start,(__pyx_v_next_line - __pyx_v_value_start)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
4934 Py_DECREF(__pyx_v_value);
4935 __pyx_v_value = __pyx_2;
4936 __pyx_2 = 0;
4937
4938- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":281 */
4939+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":281 */
4940 __pyx_v_entry_start = __pyx_v_line_start;
4941
4942- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":282 */
4943+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":282 */
4944 __pyx_v_next_null = ((char *)memchr(__pyx_v_entry_start,'\0',((__pyx_v_last_null - __pyx_v_entry_start) + 1)));
4945
4946- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":284 */
4947+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":284 */
4948 __pyx_1 = (__pyx_v_next_null == NULL);
4949 if (__pyx_1) {
4950 __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
4951@@ -1025,16 +1025,16 @@
4952 }
4953 __pyx_L19:;
4954
4955- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":286 */
4956+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":286 */
4957 __pyx_2 = PyString_FromStringAndSize(NULL,((__pyx_v_prefix_tail_len + __pyx_v_next_null) - __pyx_v_line_start)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
4958 Py_DECREF(__pyx_v_entry);
4959 __pyx_v_entry = __pyx_2;
4960 __pyx_2 = 0;
4961
4962- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":288 */
4963+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":288 */
4964 __pyx_v_c_entry = PyString_AS_STRING(__pyx_v_entry);
4965
4966- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":289 */
4967+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":289 */
4968 __pyx_1 = (__pyx_v_prefix_tail_len > 0);
4969 if (__pyx_1) {
4970 memcpy(__pyx_v_c_entry,__pyx_v_prefix_tail,__pyx_v_prefix_tail_len);
4971@@ -1042,7 +1042,7 @@
4972 }
4973 __pyx_L20:;
4974
4975- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":291 */
4976+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":291 */
4977 __pyx_1 = ((__pyx_v_next_null - __pyx_v_line_start) > 0);
4978 if (__pyx_1) {
4979 memcpy((__pyx_v_c_entry + __pyx_v_prefix_tail_len),__pyx_v_line_start,(__pyx_v_next_null - __pyx_v_line_start));
4980@@ -1050,24 +1050,24 @@
4981 }
4982 __pyx_L21:;
4983
4984- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":293 */
4985+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":293 */
4986 Py_INCREF(__pyx_v_entry);
4987
4988- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":294 */
4989+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":294 */
4990 __pyx_v_i = __pyx_v_num_prefix_bits;
4991
4992- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":295 */
4993+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":295 */
4994 StaticTuple_SET_ITEM(__pyx_v_entry_bits,__pyx_v_i,__pyx_v_entry);
4995
4996- /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":296 */
4997+ /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":296 */
4998 while (1) {
4999 __pyx_1 = (__pyx_v_next_null != __pyx_v_last_null);
5000 if (!__pyx_1) break;
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: