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

[Jelmer Vernooij]

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)

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

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-08-07 00:54:52 +0000
+++ .pc/applied-patches	2011-09-27 11:59:19 +0000
@@ -1,1 +1,1 @@
-debian-changes-2.2.0-1
+debian-changes-2.2.1-0ubuntu1

=== removed directory '.pc/debian-changes-2.2.0-1'
=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib'
=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/rules.py'
--- .pc/debian-changes-2.2.0-1/bzrlib/rules.py	2010-08-07 00:54:52 +0000
+++ .pc/debian-changes-2.2.0-1/bzrlib/rules.py	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-# Copyright (C) 2008 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-"""Rule-based definition of preferences for selected files in selected branches.
-
-See ``bzr help rules`` for details.
-"""
-
-from bzrlib import (
-    config,
-    cmdline,
-    errors,
-    globbing,
-    osutils,
-    )
-from bzrlib.util.configobj import configobj
-
-
-# Name of the file holding rules in a tree
-RULES_TREE_FILENAME = ".bzrrules"
-
-# Namespace prefix for per file preferences
-FILE_PREFS_PREFIX = 'name '
-FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
-
-# The object providing default rules
-_per_user_searcher = None
-
-
-class _RulesSearcher(object):
-    """An object that provides rule-based preferences."""
-
-    def get_items(self, path):
-        """Return the preferences for a path as name,value tuples.
-
-        :param path: tree relative path
-        :return: () if no rule matched, otherwise a sequence of name,value
-          tuples.
-        """
-        raise NotImplementedError(self.get_items)
-
-    def get_selected_items(self, path, names):
-        """Return selected preferences for a path as name,value tuples.
-
-        :param path: tree relative path
-        :param names: the list of preferences to lookup
-        :return: () if no rule matched, otherwise a sequence of name,value
-          tuples. The sequence is the same length as names,
-          tuple order matches the order in names, and
-          undefined preferences are given the value None.
-        """
-        raise NotImplementedError(self.get_selected_items)
-
-
-class _IniBasedRulesSearcher(_RulesSearcher):
-
-    def __init__(self, inifile):
-        """Construct a _RulesSearcher based on an ini file.
-
-        The content will be decoded as utf-8.
-
-        :param inifile: the name of the file or a sequence of lines.
-        """
-        options = {'encoding': 'utf-8'}
-        self._cfg = configobj.ConfigObj(inifile, options=options)
-        sections = self._cfg.keys()
-        patterns = []
-        self.pattern_to_section = {}
-        for s in sections:
-            if s.startswith(FILE_PREFS_PREFIX):
-                file_patterns = cmdline.split(s[FILE_PREFS_PREFIX_LEN:])
-                patterns.extend(file_patterns)
-                for fp in file_patterns:
-                    self.pattern_to_section[fp] = s
-        if len(patterns) < len(sections):
-            unknowns = [s for s in sections
-                if not s.startswith(FILE_PREFS_PREFIX)]
-            raise errors.UnknownRules(unknowns)
-        elif patterns:
-            self._globster = globbing._OrderedGlobster(patterns)
-        else:
-            self._globster = None
-
-    def get_items(self, path):
-        """See _RulesSearcher.get_items."""
-        if self._globster is None:
-            return ()
-        pat = self._globster.match(path)
-        if pat is None:
-            return ()
-        else:
-            all = self._cfg[self.pattern_to_section[pat]]
-            return tuple(all.items())
-
-    def get_selected_items(self, path, names):
-        """See _RulesSearcher.get_selected_items."""
-        if self._globster is None:
-            return ()
-        pat = self._globster.match(path)
-        if pat is None:
-            return ()
-        else:
-            all = self._cfg[self.pattern_to_section[pat]]
-            return tuple((k, all.get(k)) for k in names)
-
-
-class _StackedRulesSearcher(_RulesSearcher):
-
-    def __init__(self, searchers):
-        """Construct a _RulesSearcher based on a stack of other ones.
-
-        :param searchers: a sequence of searchers.
-        """
-        self.searchers = searchers
-
-    def get_items(self, path):
-        """See _RulesSearcher.get_items."""
-        for searcher in self.searchers:
-            result = searcher.get_items(path)
-            if result:
-                return result
-        return ()
-
-    def get_selected_items(self, path, names):
-        """See _RulesSearcher.get_selected_items."""
-        for searcher in self.searchers:
-            result = searcher.get_selected_items(path, names)
-            if result:
-                return result
-        return ()
-
-
-def rules_filename():
-    """Return the default rules filename."""
-    return osutils.pathjoin(config.config_dir(), 'rules')
-
-
-def reset_rules():
-    global _per_user_searcher
-    _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
-
-reset_rules()

=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib/util'
=== removed directory '.pc/debian-changes-2.2.0-1/bzrlib/util/configobj'
=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/util/configobj/__init__.py'
=== removed file '.pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py'
--- .pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py	2010-08-07 00:54:52 +0000
+++ .pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-# Copyright (C) 2005-2010 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-"""XML externalization support."""
-
-# "XML is like violence: if it doesn't solve your problem, you aren't
-# using enough of it." -- various
-
-# importing this module is fairly slow because it has to load several
-# ElementTree bits
-
-from bzrlib.serializer import Serializer
-from bzrlib.trace import mutter
-
-try:
-    try:
-        # it's in this package in python2.5
-        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
-            XMLTreeBuilder, fromstring, tostring)
-        import xml.etree as elementtree
-    except ImportError:
-        from cElementTree import (ElementTree, SubElement, Element,
-                                  XMLTreeBuilder, fromstring, tostring)
-        import elementtree.ElementTree
-    ParseError = SyntaxError
-except ImportError:
-    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
-           " and make sure it's on your PYTHONPATH")
-    # this copy is shipped with bzr
-    from util.elementtree.ElementTree import (ElementTree, SubElement,
-                                              Element, XMLTreeBuilder,
-                                              fromstring, tostring)
-    import util.elementtree as elementtree
-    from xml.parsers.expat import ExpatError as ParseError
-
-from bzrlib import errors
-
-
-class XMLSerializer(Serializer):
-    """Abstract XML object serialize/deserialize"""
-
-    squashes_xml_invalid_characters = True
-
-    def read_inventory_from_string(self, xml_string, revision_id=None,
-                                   entry_cache=None, return_from_cache=False):
-        """Read xml_string into an inventory object.
-
-        :param xml_string: The xml to read.
-        :param revision_id: If not-None, the expected revision id of the
-            inventory. Some serialisers use this to set the results' root
-            revision. This should be supplied for deserialising all
-            from-repository inventories so that xml5 inventories that were
-            serialised without a revision identifier can be given the right
-            revision id (but not for working tree inventories where users can
-            edit the data without triggering checksum errors or anything).
-        :param entry_cache: An optional cache of InventoryEntry objects. If
-            supplied we will look up entries via (file_id, revision_id) which
-            should map to a valid InventoryEntry (File/Directory/etc) object.
-        :param return_from_cache: Return entries directly from the cache,
-            rather than copying them first. This is only safe if the caller
-            promises not to mutate the returned inventory entries, but it can
-            make some operations significantly faster.
-        """
-        try:
-            return self._unpack_inventory(fromstring(xml_string), revision_id,
-                                          entry_cache=entry_cache,
-                                          return_from_cache=return_from_cache)
-        except ParseError, e:
-            raise errors.UnexpectedInventoryFormat(e)
-
-    def read_inventory(self, f, revision_id=None):
-        try:
-            try:
-                return self._unpack_inventory(self._read_element(f),
-                    revision_id=None)
-            finally:
-                f.close()
-        except ParseError, e:
-            raise errors.UnexpectedInventoryFormat(e)
-
-    def write_revision(self, rev, f):
-        self._write_element(self._pack_revision(rev), f)
-
-    def write_revision_to_string(self, rev):
-        return tostring(self._pack_revision(rev)) + '\n'
-
-    def read_revision(self, f):
-        return self._unpack_revision(self._read_element(f))
-
-    def read_revision_from_string(self, xml_string):
-        return self._unpack_revision(fromstring(xml_string))
-
-    def _write_element(self, elt, f):
-        ElementTree(elt).write(f, 'utf-8')
-        f.write('\n')
-
-    def _read_element(self, f):
-        return ElementTree().parse(f)
-
-
-# performance tuning for elementree's serialiser. This should be
-# sent upstream - RBC 20060523.
-# the functions here are patched into elementtree at runtime.
-import re
-escape_re = re.compile("[&'\"<>]")
-escape_map = {
-    "&":'&amp;',
-    "'":"&apos;", # FIXME: overkill
-    "\"":"&quot;",
-    "<":"&lt;",
-    ">":"&gt;",
-    }
-def _escape_replace(match, map=escape_map):
-    return map[match.group()]
-
-def _escape_attrib(text, encoding=None, replace=None):
-    # escape attribute value
-    try:
-        if encoding:
-            try:
-                text = elementtree.ElementTree._encode(text, encoding)
-            except UnicodeError:
-                return elementtree.ElementTree._encode_entity(text)
-        if replace is None:
-            return escape_re.sub(_escape_replace, text)
-        else:
-            text = replace(text, "&", "&amp;")
-            text = replace(text, "'", "&apos;") # FIXME: overkill
-            text = replace(text, "\"", "&quot;")
-            text = replace(text, "<", "&lt;")
-            text = replace(text, ">", "&gt;")
-            return text
-    except (TypeError, AttributeError):
-        elementtree.ElementTree._raise_serialization_error(text)
-
-elementtree.ElementTree._escape_attrib = _escape_attrib
-
-escape_cdata_re = re.compile("[&<>]")
-escape_cdata_map = {
-    "&":'&amp;',
-    "<":"&lt;",
-    ">":"&gt;",
-    }
-def _escape_cdata_replace(match, map=escape_cdata_map):
-    return map[match.group()]
-
-def _escape_cdata(text, encoding=None, replace=None):
-    # escape character data
-    try:
-        if encoding:
-            try:
-                text = elementtree.ElementTree._encode(text, encoding)
-            except UnicodeError:
-                return elementtree.ElementTree._encode_entity(text)
-        if replace is None:
-            return escape_cdata_re.sub(_escape_cdata_replace, text)
-        else:
-            text = replace(text, "&", "&amp;")
-            text = replace(text, "<", "&lt;")
-            text = replace(text, ">", "&gt;")
-            return text
-    except (TypeError, AttributeError):
-        elementtree.ElementTree._raise_serialization_error(text)
-
-elementtree.ElementTree._escape_cdata = _escape_cdata
-
-
-def escape_invalid_chars(message):
-    """Escape the XML-invalid characters in a commit message.
-
-    :param message: Commit message to escape
-    :return: tuple with escaped message and number of characters escaped
-    """
-    if message is None:
-        return None, 0
-    # Python strings can include characters that can't be
-    # represented in well-formed XML; escape characters that
-    # aren't listed in the XML specification
-    # (http://www.w3.org/TR/REC-xml/#NT-Char).
-    return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
-            lambda match: match.group(0).encode('unicode_escape'),
-            message)

=== added directory '.pc/debian-changes-2.2.1-0ubuntu1'
=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib'
=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py'
--- .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py	1970-01-01 00:00:00 +0000
+++ .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py	2011-09-27 11:59:19 +0000
@@ -0,0 +1,155 @@
+# Copyright (C) 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Rule-based definition of preferences for selected files in selected branches.
+
+See ``bzr help rules`` for details.
+"""
+
+from bzrlib import (
+    config,
+    cmdline,
+    errors,
+    globbing,
+    osutils,
+    )
+from bzrlib.util.configobj import configobj
+
+
+# Name of the file holding rules in a tree
+RULES_TREE_FILENAME = ".bzrrules"
+
+# Namespace prefix for per file preferences
+FILE_PREFS_PREFIX = 'name '
+FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
+
+# The object providing default rules
+_per_user_searcher = None
+
+
+class _RulesSearcher(object):
+    """An object that provides rule-based preferences."""
+
+    def get_items(self, path):
+        """Return the preferences for a path as name,value tuples.
+
+        :param path: tree relative path
+        :return: () if no rule matched, otherwise a sequence of name,value
+          tuples.
+        """
+        raise NotImplementedError(self.get_items)
+
+    def get_selected_items(self, path, names):
+        """Return selected preferences for a path as name,value tuples.
+
+        :param path: tree relative path
+        :param names: the list of preferences to lookup
+        :return: () if no rule matched, otherwise a sequence of name,value
+          tuples. The sequence is the same length as names,
+          tuple order matches the order in names, and
+          undefined preferences are given the value None.
+        """
+        raise NotImplementedError(self.get_selected_items)
+
+
+class _IniBasedRulesSearcher(_RulesSearcher):
+
+    def __init__(self, inifile):
+        """Construct a _RulesSearcher based on an ini file.
+
+        The content will be decoded as utf-8.
+
+        :param inifile: the name of the file or a sequence of lines.
+        """
+        options = {'encoding': 'utf-8'}
+        self._cfg = configobj.ConfigObj(inifile, options=options)
+        sections = self._cfg.keys()
+        patterns = []
+        self.pattern_to_section = {}
+        for s in sections:
+            if s.startswith(FILE_PREFS_PREFIX):
+                file_patterns = cmdline.split(s[FILE_PREFS_PREFIX_LEN:])
+                patterns.extend(file_patterns)
+                for fp in file_patterns:
+                    self.pattern_to_section[fp] = s
+        if len(patterns) < len(sections):
+            unknowns = [s for s in sections
+                if not s.startswith(FILE_PREFS_PREFIX)]
+            raise errors.UnknownRules(unknowns)
+        elif patterns:
+            self._globster = globbing._OrderedGlobster(patterns)
+        else:
+            self._globster = None
+
+    def get_items(self, path):
+        """See _RulesSearcher.get_items."""
+        if self._globster is None:
+            return ()
+        pat = self._globster.match(path)
+        if pat is None:
+            return ()
+        else:
+            all = self._cfg[self.pattern_to_section[pat]]
+            return tuple(all.items())
+
+    def get_selected_items(self, path, names):
+        """See _RulesSearcher.get_selected_items."""
+        if self._globster is None:
+            return ()
+        pat = self._globster.match(path)
+        if pat is None:
+            return ()
+        else:
+            all = self._cfg[self.pattern_to_section[pat]]
+            return tuple((k, all.get(k)) for k in names)
+
+
+class _StackedRulesSearcher(_RulesSearcher):
+
+    def __init__(self, searchers):
+        """Construct a _RulesSearcher based on a stack of other ones.
+
+        :param searchers: a sequence of searchers.
+        """
+        self.searchers = searchers
+
+    def get_items(self, path):
+        """See _RulesSearcher.get_items."""
+        for searcher in self.searchers:
+            result = searcher.get_items(path)
+            if result:
+                return result
+        return ()
+
+    def get_selected_items(self, path, names):
+        """See _RulesSearcher.get_selected_items."""
+        for searcher in self.searchers:
+            result = searcher.get_selected_items(path, names)
+            if result:
+                return result
+        return ()
+
+
+def rules_filename():
+    """Return the default rules filename."""
+    return osutils.pathjoin(config.config_dir(), 'rules')
+
+
+def reset_rules():
+    global _per_user_searcher
+    _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
+
+reset_rules()

=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util'
=== added directory '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util/configobj'
=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/util/configobj/__init__.py'
=== added file '.pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py'
--- .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py	1970-01-01 00:00:00 +0000
+++ .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py	2011-09-27 11:59:19 +0000
@@ -0,0 +1,197 @@
+# Copyright (C) 2005-2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""XML externalization support."""
+
+# "XML is like violence: if it doesn't solve your problem, you aren't
+# using enough of it." -- various
+
+# importing this module is fairly slow because it has to load several
+# ElementTree bits
+
+from bzrlib.serializer import Serializer
+from bzrlib.trace import mutter
+
+try:
+    try:
+        # it's in this package in python2.5
+        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
+            XMLTreeBuilder, fromstring, tostring)
+        import xml.etree as elementtree
+        # Also import ElementTree module so monkey-patching below always works
+        import xml.etree.ElementTree
+    except ImportError:
+        from cElementTree import (ElementTree, SubElement, Element,
+                                  XMLTreeBuilder, fromstring, tostring)
+        import elementtree.ElementTree
+    ParseError = SyntaxError
+except ImportError:
+    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
+           " and make sure it's on your PYTHONPATH")
+    # this copy is shipped with bzr
+    from util.elementtree.ElementTree import (ElementTree, SubElement,
+                                              Element, XMLTreeBuilder,
+                                              fromstring, tostring)
+    import util.elementtree as elementtree
+    from xml.parsers.expat import ExpatError as ParseError
+
+from bzrlib import errors
+
+
+class XMLSerializer(Serializer):
+    """Abstract XML object serialize/deserialize"""
+
+    squashes_xml_invalid_characters = True
+
+    def read_inventory_from_string(self, xml_string, revision_id=None,
+                                   entry_cache=None, return_from_cache=False):
+        """Read xml_string into an inventory object.
+
+        :param xml_string: The xml to read.
+        :param revision_id: If not-None, the expected revision id of the
+            inventory. Some serialisers use this to set the results' root
+            revision. This should be supplied for deserialising all
+            from-repository inventories so that xml5 inventories that were
+            serialised without a revision identifier can be given the right
+            revision id (but not for working tree inventories where users can
+            edit the data without triggering checksum errors or anything).
+        :param entry_cache: An optional cache of InventoryEntry objects. If
+            supplied we will look up entries via (file_id, revision_id) which
+            should map to a valid InventoryEntry (File/Directory/etc) object.
+        :param return_from_cache: Return entries directly from the cache,
+            rather than copying them first. This is only safe if the caller
+            promises not to mutate the returned inventory entries, but it can
+            make some operations significantly faster.
+        """
+        try:
+            return self._unpack_inventory(fromstring(xml_string), revision_id,
+                                          entry_cache=entry_cache,
+                                          return_from_cache=return_from_cache)
+        except ParseError, e:
+            raise errors.UnexpectedInventoryFormat(e)
+
+    def read_inventory(self, f, revision_id=None):
+        try:
+            try:
+                return self._unpack_inventory(self._read_element(f),
+                    revision_id=None)
+            finally:
+                f.close()
+        except ParseError, e:
+            raise errors.UnexpectedInventoryFormat(e)
+
+    def write_revision(self, rev, f):
+        self._write_element(self._pack_revision(rev), f)
+
+    def write_revision_to_string(self, rev):
+        return tostring(self._pack_revision(rev)) + '\n'
+
+    def read_revision(self, f):
+        return self._unpack_revision(self._read_element(f))
+
+    def read_revision_from_string(self, xml_string):
+        return self._unpack_revision(fromstring(xml_string))
+
+    def _write_element(self, elt, f):
+        ElementTree(elt).write(f, 'utf-8')
+        f.write('\n')
+
+    def _read_element(self, f):
+        return ElementTree().parse(f)
+
+
+# performance tuning for elementree's serialiser. This should be
+# sent upstream - RBC 20060523.
+# the functions here are patched into elementtree at runtime.
+import re
+escape_re = re.compile("[&'\"<>]")
+escape_map = {
+    "&":'&amp;',
+    "'":"&apos;", # FIXME: overkill
+    "\"":"&quot;",
+    "<":"&lt;",
+    ">":"&gt;",
+    }
+def _escape_replace(match, map=escape_map):
+    return map[match.group()]
+
+def _escape_attrib(text, encoding=None, replace=None):
+    # escape attribute value
+    try:
+        if encoding:
+            try:
+                text = elementtree.ElementTree._encode(text, encoding)
+            except UnicodeError:
+                return elementtree.ElementTree._encode_entity(text)
+        if replace is None:
+            return escape_re.sub(_escape_replace, text)
+        else:
+            text = replace(text, "&", "&amp;")
+            text = replace(text, "'", "&apos;") # FIXME: overkill
+            text = replace(text, "\"", "&quot;")
+            text = replace(text, "<", "&lt;")
+            text = replace(text, ">", "&gt;")
+            return text
+    except (TypeError, AttributeError):
+        elementtree.ElementTree._raise_serialization_error(text)
+
+elementtree.ElementTree._escape_attrib = _escape_attrib
+
+escape_cdata_re = re.compile("[&<>]")
+escape_cdata_map = {
+    "&":'&amp;',
+    "<":"&lt;",
+    ">":"&gt;",
+    }
+def _escape_cdata_replace(match, map=escape_cdata_map):
+    return map[match.group()]
+
+def _escape_cdata(text, encoding=None, replace=None):
+    # escape character data
+    try:
+        if encoding:
+            try:
+                text = elementtree.ElementTree._encode(text, encoding)
+            except UnicodeError:
+                return elementtree.ElementTree._encode_entity(text)
+        if replace is None:
+            return escape_cdata_re.sub(_escape_cdata_replace, text)
+        else:
+            text = replace(text, "&", "&amp;")
+            text = replace(text, "<", "&lt;")
+            text = replace(text, ">", "&gt;")
+            return text
+    except (TypeError, AttributeError):
+        elementtree.ElementTree._raise_serialization_error(text)
+
+elementtree.ElementTree._escape_cdata = _escape_cdata
+
+
+def escape_invalid_chars(message):
+    """Escape the XML-invalid characters in a commit message.
+
+    :param message: Commit message to escape
+    :return: tuple with escaped message and number of characters escaped
+    """
+    if message is None:
+        return None, 0
+    # Python strings can include characters that can't be
+    # represented in well-formed XML; escape characters that
+    # aren't listed in the XML specification
+    # (http://www.w3.org/TR/REC-xml/#NT-Char).
+    return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
+            lambda match: match.group(0).encode('unicode_escape'),
+            message)

=== modified file 'Makefile'
--- Makefile	2010-08-07 00:54:52 +0000
+++ Makefile	2011-09-27 11:59:19 +0000
@@ -40,7 +40,7 @@
 
 check-nodocs: extensions
 	# Generate a stream for PQM to watch.
-	$(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
 	# Check that there were no errors reported.
 	subunit-stats < selftest.log
 

=== modified file 'NEWS'
--- NEWS	2010-08-07 00:54:52 +0000
+++ NEWS	2011-09-27 11:59:19 +0000
@@ -5,6 +5,605 @@
 .. contents:: List of Releases
    :depth: 1
 
+This is a bugfix release. One regression introduced in 2.2b1 has been fixed
+for some rare conflict resolutions. Also a warning is now emmitted when
+branching an out-of-date ubuntu packaging branch. Upgrading is recommended
+for all users on earlier 2.2 releases.
+
+bzr 2.2.5
+#########
+
+:2.2.5: 2011-09-01
+
+Compatibility Breaks
+********************
+
+None.
+
+New Features
+************
+
+None.
+
+Bug Fixes
+*********
+
+* Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a
+  doubly-stacked branch.
+  (James Westby, Martin Pool, #715000)
+
+* Don't crash while merging and encountering obscure path conflicts
+  involving different root-ids. (Vincent Ladeuil, #805809)
+
+Internals
+*********
+
+* Fixed bug in the bundled copy of ConfigObj with quoting of triple quotes
+  in the value string. Fix suggested by ConfigObj's author Michael Foord.
+  (Alexander Belchenko, #710410)
+
+bzr 2.1.5
+#########
+
+:2.1.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now
+  checks to see if the most recent published source package version for
+  that project is present in the branch tags. This should help developers
+  trust whether the packaging branch is up-to-date and can be used for new
+  changes. The level of verbosity is controlled by the config item
+  ``launchpad.packaging_verbosity``. It can be set to one of
+
+  off
+    disable all checks
+
+
+  minimal
+    only display if the branch is out-of-date
+
+  short
+    also display single-line up-to-date and missing,
+
+
+  all
+    (default) display multi-line content for all states
+
+
+  (John Arbash Meinel, #609187, #812928)
+
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.2.4
+#########
+
+:2.2.4: 2011-02-04
+
+This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
+involving only certain operations with launchpad. Upgrading is recommended for
+all users on earlier 2.2 releases.
+
+Bug Fixes
+*********
+
+* Fix communications with the Launchpad web service when using
+  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
+  with Launchpad's production instance, which only became a problem when
+  the default instance was switched from edge to production in bzr 2.2.3.
+  (Max Bowsher, #707075)
+
+
+bzr 2.2.3
+#########
+
+:2.2.3: 2011-01-20
+
+This is a bugfix release. Upgrading is recommended for all users
+on earlier 2.2 releases.
+
+Compatibility Breaks
+********************
+
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
+
+New Features
+************
+
+(none)
+
+Bug Fixes
+*********
+
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+  path on windows from symlink support addition. (Martin [gz], #686611)
+
+* Correctly resolve content (and path) conflicts for files in subdirs.
+  (Vincent Ladeuil, #660935)
+
+* Don't probe for a repository from within ``NotBranchError.__repr__``,
+  because this can cause knock-on errors at awkward times.
+  (Andrew Bennetts, #687653)
+
+* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
+  concurrent repository pack operation.  This was particularly affecting
+  ``bzr-svn`` users.  (Andrew Bennetts, #701940)
+
+* ``https`` access works again with recent versions of python2.7.
+  (Vincent Ladeuil, #693880)
+
+* RevisionTree.is_executable no longer returns None for directories and
+  symlinks.  Instead, it returns False, like other Trees and methods.
+  (Aaron Bentley, #681885)
+
+
+bzr 2.2.2
+#########
+
+:2.2.2: 2010-11-25
+
+This is a bugfix release. None of these bugfixes are critical, but upgrading
+is recommended for all users on earlier 2.2 releases.
+
+Bug Fixes
+*********
+
+* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
+  is involved in a text conflict (but the conflict is still not
+  resolved). (Vincent Ladeuil, #646961)
+
+* Commit in a bound branch or heavyweight checkout now propagates tags
+  (e.g. from a merge) to the master branch (and informs the user if there
+  is a conflict).  (Andrew Bennetts, #603395)
+  
+* Correctly set the Content-Type header when http POSTing to comply
+  with stricter web frameworks. (Vincent Ladeuil, #665100)
+
+* ``NotBranchError`` no longer allows errors from calling
+  ``bzrdir.open_repository()`` to propagate.  This is unhelpful at best,
+  and at worst can trigger infinite loops in callers.  (Andrew Bennetts)
+  
+* Skip tests that needs a bzr source tree when there isn't one. This is
+  needed to succesfully run the test suite for installed versions.
+  (Vincent Ladeuil, #644855).
+
+* Skip the tests that requires respecting the chmod bits when running as
+  root. Including the one that wasn't present in 2.1.
+  (Vincent Ladeuil, #646133)
+
+* Using bzr with `lp:` urls behind an http proxy should work.
+  (Robert Collins, #558343)
+
+* Windows installers no longer requires the Microsoft vcredist to be
+  installed.
+  (Martin [gz], Gary van der Merwe, #632465)
+
+* Close leaked socket to SSH subprocesses, which caused dput sftp uploads
+  to hang.  (Max Bowsher, #659590)
+
+Testing
+*******
+
+* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
+  involving the pycurl https test server fail otherwise when running
+  selftest from an installed version. (Vincent Ladeuil, #651706)
+
+* Fix tests that failed when run under ``LANG=C``.
+  (Andrew Bennetts, #632387)
+
+
+bzr 2.2.1
+#########
+
+:2.2.1: 2010-09-17
+
+This is a bugfix release which also includes bugfixes from 2.0.6 and
+2.1.3. None are critical, but upgrading is recommended for all users on
+earlier 2.2 releases.
+
+Bug Fixes
+*********
+
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
+  previously-unversioned directory within the tree: the directory is
+  marked versioned too.
+  (Martin Pool, #192859)
+
+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
+  target of the symlink.
+  (Martin Pool, John Arbash Meinel, #128562)
+
+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
+  permissions as ``.bzr`` directory on a POSIX OS.
+  (Parth Malwankar, #262450)
+
+* CommitBuilder now uses the committer instead of _config.username to generate
+  the revision-id.  (Aaron Bentley, #614404)
+
+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
+  way which should help avoid problems with concurrent writers.
+  (Vincent Ladeuil, #525571)
+
+* Cope with Microsoft FTP server that returns reply '250 Directory
+  created' when mkdir succeeds.  (Martin Pool, #224373)
+
+* Don't traceback trying to unversion children files of an already
+  unversioned directory.  (Vincent Ladeuil, #494221)
+
+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
+  contains only NUL bytes).  Instead warn the user, and allow ``bzr
+  break-lock`` to remove it.  (Andrew Bennetts, #619872)
+  
+* Fix ``AttributeError on parent.children`` when adding a file under a
+  directory that was a symlink in the previous commit.
+  (Martin Pool, #192859)
+
+* Fix ``AttributeError: 'NoneType' object has no attribute 'close'`` in
+  ``_close_ssh_proc`` when using ``bzr+ssh://``.  This was causing
+  connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
+  stderr in some other circumstances.  (Andrew Bennetts, #633745)
+
+* Only call ``setlocale`` in the bzr startup script on posix systems. This
+  avoids an issue with the newer windows C runtimes used by Python 2.6 and
+  later which can mangle bytestrings printed to the console.
+  (Martin [gz], #631350)
+
+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
+  which can result in "missing referenced chk root keys" errors when
+  fetching from repositories with affected revisions.
+  (Andrew Bennetts, #522637)
+
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
+* Repositories accessed via a smart server now reject being stacked on a
+  repository in an incompatible format, as is the case when accessing them
+  via other methods.  This was causing fetches from those repositories via
+  a smart server (e.g. using ``bzr branch``) to receive invalid data.
+  (Andrew Bennetts, #562380)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+  error. This error was caused by 2.0 not being updated when upstream
+  python merged the end of run patch, which chose ``stopTestRun`` rather than
+  ``done``. (Robert Collins, #571437)
+
+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
+  being thrown from ``xml_serializer`` on certain cElementTree setups.
+  (Martin [gz], #254278)
+
+* Upgrading or fetching from a non-rich-root repository to a rich-root
+  repository (e.g. from pack-0.92 to 2a) no longer fails with
+  ``'Inter1and2Helper' object has no attribute 'source_repo'``.  This was
+  a regression from Bazaar 2.1.  (Andrew Bennetts, #636930)
+  
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
+
+Documentation
+*************
+
+* Fix a lot of references in the docs to the old http://bazaar-vcs.org to
+  the new http://bazaar.canonical.com or http://wiki.bazaar.canonical.com
+  (John Arbash Meinel, #617503)
+
+Internals
+*********
+
+* Remove used and broken code path in ``BranchInitHookParams.__repr__``.
+  (Andrew Bennetts)
+
+Testing
+*******
+
+* ``build_tree_contents`` can create symlinks.
+  (Martin Pool, John Arbash Meinel)
+
+* Tracebacks from a parameterized test are no longer reported against every
+  parameterization of that test.  This was done by adding a hack to
+  ``bzrlib.tests.clone_test`` so that it no longer causes
+  testtools.TestCase instances to share a details dict.
+  (Andrew Bennetts, #625574)
+
+
+bzr 2.1.4
+#########
+
+:2.1.4: 2011-05-16
+
+The fourth release in our 2.1 series addresses some user-inconvenience bugs.
+None are critical, but upgrading is recommended for all users on earlier 2.1
+releases.
+
+
+Compatibility Breaks
+********************
+
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
+
+New Features
+************
+
+None.
+
+Bug Fixes
+*********
+
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+  path on windows from symlink support addition. (Martin [gz], #686611)
+
+* Skip tests that needs a bzr source tree when there isn't one. This is
+  needed to succesfully run the test suite for installed versions.
+  (Vincent Ladeuil, #644855).
+
+* Skip the tests that requires respecting the chmod bits when running as root.
+  (Vincent Ladeuil, #646133)
+
+* Using bzr with `lp:` urls behind an http proxy should work.
+  (Robert Collins, #558343)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.1.3
+#########
+
+:Codename: Do run run
+:2.1.3: 2010-09-17
+
+The third release in our 2.1 series addresses several user-inconvenience bugs
+(and includes the fixes done in 2.0.6).  None are critical, but upgrading is
+recommended for all users on earlier 2.1 releases.
+
+Bug Fixes
+*********
+
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
+  previously-unversioned directory within the tree: the directory is
+  marked versioned too.  
+  (Martin Pool, #192859)
+
+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
+  target of the symlink.
+  (Martin Pool, John Arbash Meinel, #128562)
+
+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
+  permissions as ``.bzr`` directory on a POSIX OS.
+  (Parth Malwankar, #262450)
+
+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
+  way which should help avoid problems with concurrent writers.
+  (Vincent Ladeuil, #525571)
+
+* Don't traceback trying to unversion children files of an already
+  unversioned directory.  (Vincent Ladeuil, #494221)
+
+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
+  contains only NUL bytes).  Instead warn the user, and allow ``bzr
+  break-lock`` to remove it.  (Andrew Bennetts, #619872)
+  
+* Fix ``AttributeError on parent.children`` when adding a file under a 
+  directory that was a symlink in the previous commit.
+  (Martin Pool, #192859)
+
+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
+  which can result in "missing referenced chk root keys" errors when
+  fetching from repositories with affected revisions.
+  (Andrew Bennetts, #522637)
+
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
+* Repositories accessed via a smart server now reject being stacked on a
+  repository in an incompatible format, as is the case when accessing them
+  via other methods.  This was causing fetches from those repositories via
+  a smart server (e.g. using ``bzr branch``) to receive invalid data.
+  (Andrew Bennetts, #562380)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+  error. This error was caused by 2.0 not being updated when upstream
+  python merged the end of run patch, which chose ``stopTestRun`` rather than
+  ``done``. (Robert Collins, #571437)
+
+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
+  being thrown from ``xml_serializer`` on certain cElementTree setups.
+  (Martin [gz], #254278)
+
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
+
+Testing
+*******
+
+* ``build_tree_contents`` can create symlinks.
+  (Martin Pool, John Arbash Meinel)
+
+
+bzr 2.0.7
+#########
+
+:2.0.7: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
+  path on windows from symlink support addition. (Martin [gz], #686611)
+
+* Avoid spurious ValueErrors when autopacking a subset of the repository,
+  and seeing a revision without its related inventory
+  (John Arbash Meinel, #437003)
+ 
+* Fix activity reporting for pycurl when using https with some
+  implementations of curl. (Vincent Ladeuil, #614713)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.0.6
+#########
+
+:2.0.6: 2010-09-17
+
+The sixth release in our 2.0 series addresses several user-inconvenience
+bugs.  None are critical, but upgrading is recommended for all users on
+earlier 2.0 releases.
+
+Bug Fixes
+*********
+
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
+  previously-unversioned directory within the tree: the directory is
+  marked versioned too.  
+  (Martin Pool, #192859)
+
+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
+  target of the symlink.
+  (Martin Pool, John Arbash Meinel, #128562)
+
+* ``bzr revert`` now only takes write lock on working tree, instead of on 
+  both working tree and branch.
+  (Danny van Heumen, #498409)
+
+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
+  permissions as ``.bzr`` directory on a POSIX OS.
+  (Parth Malwankar, #262450)
+
+* Don't traceback trying to unversion children files of an already
+  unversioned directory.  (Vincent Ladeuil, #494221)
+
+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
+  contains only NUL bytes).  Instead warn the user, and allow ``bzr
+  break-lock`` to remove it.  (Andrew Bennetts, #619872)
+  
+* Fix ``AttributeError on parent.children`` when adding a file under a 
+  directory that was a symlink in the previous commit.
+  (Martin Pool, #192859)
+
+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
+  which can result in "missing referenced chk root keys" errors when
+  fetching from repositories with affected revisions.
+  (Andrew Bennetts, #522637)
+
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
+* Repositories accessed via a smart server now reject being stacked on a
+  repository in an incompatible format, as is the case when accessing them
+  via other methods.  This was causing fetches from those repositories via
+  a smart server (e.g. using ``bzr branch``) to receive invalid data.
+  (Andrew Bennetts, #562380)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+  error. This error was caused by 2.0 not being updated when upstream
+  python merged the end of run patch, which chose ``stopTestRun`` rather than
+  ``done``. (Robert Collins, #571437)
+
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
+
+
+Testing
+*******
+
+* ``build_tree_contents`` can create symlinks.
+  (Martin Pool, John Arbash Meinel)
+
+
 bzr 2.2
 #######
 
@@ -58,7 +657,7 @@
 * Don't traceback trying to unversion children files of an already
   unversioned directory.  (Vincent Ladeuil, #494221)
 
-* ``HTTP/1.1` test servers now set a ``Content-Length`` header to comply
+* ``HTTP/1.1`` test servers now set a ``Content-Length`` header to comply
   with pedantic ``HTTP/1.1`` clients. (Vincent Ladeuil, #568421)
 
 * Progress bars prefer to truncate the text message rather than the
@@ -102,7 +701,7 @@
 #########
 
 :Codename: Monkey Magic
-:2.2b4: 2004-07-09
+:2.2b4: 2010-07-10
 
 
 This fourth and final beta in the 2.2 series now stabilizes the internal
@@ -609,6 +1208,63 @@
   executables on the ``PATH``. Migrated from bash_completion plugin.
   (Martin von Gagern)
 
+bzr 2.1.2
+#########
+
+:2.1.2: 2010-05-28
+
+This release fixes two critical networking issues with older servers and
+with interrupted system call errors when pushing or pulling.  We recommend
+upgrading to anyone running a 2.1.x version of bzr.
+
+Bug Fixes
+*********
+
+* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
+  support of bzr-externals and scmproj plugins.
+  (Alexander Belchenko, bug #572098)
+
+* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
+  (Aaron Bentley, #559436)
+
+* Do not register a SIGWINCH signal handler, instead just poll for the
+  terminal width as needed.  This avoids the "Interrupted System Call"
+  problems that occur on POSIX with all currently released versions of
+  Python.
+  (Andrew Bennetts, #583941)
+
+* Fixed ``AssertionError`` when accessing smart servers running Bazaar
+  versions before 1.6.
+  (Andrew Bennetts, #528041)
+
+* Reset ``siginterrupt`` flag to False every time we handle a signal
+  installed with ``set_signal_handler(..., restart_syscall=True)`` (from
+  ``bzrlib.osutils``.  Reduces the likelihood of "Interrupted System Call"
+  errors compared to registering ``signal.signal`` directly.
+  (Andrew Bennetts)
+
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
+* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
+  (John Arbash Meinel, #582656)
+
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
+
+Internals
+*********
+
+* ``_remember_remote_is_before`` no longer raises AssertionError when
+  suboptimal network behaviour is noticed; instead it just mutters to the
+  log file (and warns the user if they have set the ``hpss`` debug flag).
+  This was causing unnecessary aborts for performance bugs that are minor
+  at worst.
+  (Andrew Bennetts, #528041)
+
+
 bzr 2.2b2
 #########
 
@@ -796,8 +1452,8 @@
   without specific permission from the user.  (Martin Pool, #515052)
 
 * Parsing of command lines, for example in ``diff --using``, no longer
-  treats backslash as an escape character on Windows.   (Gordon Tyler,
-  #392248)
+  treats backslash as an escape character on Windows.
+  (Gordon Tyler, #392428)
 
 * Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
   a list of plugin names separated by ':' (';' on windows).
@@ -1032,108 +1688,6 @@
   happens, and another warning will be written if the log file could not
   be closed after retrying 100 times.  (Andrew Bennetts, #531746)
 
-bzr 2.1.3
-#########
-
-:Codename: Do run run
-:2.1.3: NOT RELEASED YET
-
-Compatibility Breaks
-********************
-
-New Features
-************
-
-Bug Fixes
-*********
-
-* Configuration files in ``${BZR_HOME}`` are now written in an atomic
-  way which should help avoid problems with concurrent writers.
-  (Vincent Ladeuil, #525571)
-
-* Don't traceback trying to unversion children files of an already
-  unversioned directory.  (Vincent Ladeuil, #494221)
-
-* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
-  which can result in "missing referenced chk root keys" errors when
-  fetching from repositories with affected revisions.
-  (Andrew Bennetts, #522637)
-
-* Raise ValueError instead of a string exception.
-  (John Arbash Meinel, #586926)
-
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
-bzr 2.1.2
-#########
-
-:2.1.2: 2010-05-28
-
-This release fixes two critical networking issues with older servers and
-with interrupted system call errors when pushing or pulling.  We recommend
-upgrading to anyone running a 2.1.x version of bzr.
-
-Bug Fixes
-*********
-
-* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
-  support of bzr-externals and scmproj plugins.
-  (Alexander Belchenko, bug #572098)
-
-* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
-  (Aaron Bentley, #559436)
-
-* Do not register a SIGWINCH signal handler, instead just poll for the
-  terminal width as needed.  This avoids the "Interrupted System Call"
-  problems that occur on POSIX with all currently released versions of
-  Python.
-  (Andrew Bennetts, #583941)
-
-* Fixed ``AssertionError`` when accessing smart servers running Bazaar
-  versions before 1.6.
-  (Andrew Bennetts, #528041)
-
-* Reset ``siginterrupt`` flag to False every time we handle a signal
-  installed with ``set_signal_handler(..., restart_syscall=True)`` (from
-  ``bzrlib.osutils``.  Reduces the likelihood of "Interrupted System Call"
-  errors compared to registering ``signal.signal`` directly.
-  (Andrew Bennetts)
-
-* Reduce peak memory by one copy of compressed text.
-  (John Arbash Meinel, #566940)
-
-* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
-  (John Arbash Meinel, #582656)
-
-* When passing a file to ``UTF8DirReader`` make sure to close the current
-  directory file handle after the chdir fails. Otherwise when passing many
-  filenames into a command line ``bzr status`` we would leak descriptors.
-  (John Arbash Meinel, #583486)
-
-Internals
-*********
-
-* ``_remember_remote_is_before`` no longer raises AssertionError when
-  suboptimal network behaviour is noticed; instead it just mutters to the
-  log file (and warns the user if they have set the ``hpss`` debug flag).
-  This was causing unnecessary aborts for performance bugs that are minor
-  at worst.
-  (Andrew Bennetts, #528041)
-
-
 bzr 2.1.1
 #########
 
@@ -1199,6 +1753,65 @@
   (Andrew Bennetts, #496813)
 
 
+bzr 2.0.5
+#########
+
+:2.0.5: 2010-03-23
+
+This fifth release in our 2.0 series addresses several user-inconvenience
+bugs.  None are critical, but upgrading is recommended for all users on
+earlier 2.0 releases.
+
+Bug Fixes
+*********
+
+* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
+  (Martin Pool, #331095)
+
+* Concurrent autopacking is more resilient to already-renamed pack files.
+  If we find that a file we are about to obsolete is already obsoleted, we
+  do not try to rename it, and we leave the file in ``obsolete_packs``.
+  The code is also fault tolerant if a file goes missing, assuming that
+  another process already removed the file.
+  (John Arbash Meinel, Gareth White, #507557)
+
+* Cope with the lockdir ``held/info`` file being empty, which seems to
+  happen fairly often if the process is suddenly interrupted while taking
+  a lock.
+  (Martin Pool, #185103)
+
+* Give the warning about potentially slow cross-format fetches much
+  earlier on in the fetch operation.  Don't show this message during
+  upgrades, and show the correct format indication for remote
+  repositories.
+  (Martin Pool, #456077, #515356, #513157)
+
+* Handle renames correctly when there are files or directories that 
+  differ only in case.  (Chris Jones, Martin Pool, #368931)
+
+* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
+  error, report that error rather than failing with an unhelpful
+  ``UnboundLocalError``.
+  (Andrew Bennetts, #423563)
+
+* Running ``bzr`` command without any arguments now shows bzr
+  version number along with rest of the help text.
+  (Parth Malwankar, #369501)
+
+* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
+  errors.
+  (Inada Naoki, #524560)
+
+Documentation
+*************
+
+* Added ``location-alias`` help topic.
+  (Andrew Bennetts, #337834)
+
+* Fixed CHM generation by moving the NEWS section template into
+  a separate file. (Ian Clatworthy, #524184)
+
+
 bzr 2.1.0
 #########
 
@@ -1552,127 +2165,6 @@
   tests that 'failed' - they're all just failures.
   (Martin Pool)
 
-bzr 2.0.6
-#########
-
-:2.0.6: NOT RELEASED YET
-
-Bug Fixes
-*********
-
-* Additional merges after an unrelated branch has been merged with its
-  history no longer crash when deleted files are involved.
-  (Vincent Ladeuil, John Arbash Meinel, #375898)
-
-* ``bzr commit SYMLINK`` now works, rather than trying to commit the
-  target of the symlink.
-  (Martin Pool, John Arbash Meinel, #128562)
-
-* ``bzr revert`` now only takes write lock on working tree, instead of on 
-  both working tree and branch.
-  (Danny van Heumen, #498409)
-
-* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
-  permissions as ``.bzr`` directory on a POSIX OS.
-  (Parth Malwankar, #262450)
-
-* Don't traceback trying to unversion children files of an already
-  unversioned directory.  (Vincent Ladeuil, #494221)
-
-* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
-  which can result in "missing referenced chk root keys" errors when
-  fetching from repositories with affected revisions.
-  (Andrew Bennetts, #522637)
-
-* Raise ValueError instead of a string exception.
-  (John Arbash Meinel, #586926)
-
-* Reduce peak memory by one copy of compressed text.
-  (John Arbash Meinel, #566940)
-
-* Repositories accessed via a smart server now reject being stacked on a
-  repository in an incompatible format, as is the case when accessing them
-  via other methods.  This was causing fetches from those repositories via
-  a smart server (e.g. using ``bzr branch``) to receive invalid data.
-  (Andrew Bennetts, #562380)
-
-* Selftest with versions of subunit that support ``stopTestRun`` will no longer
-  error. This error was caused by 2.0 not being updated when upstream
-  python merged the end of run patch, which chose ``stopTestRun`` rather than
-  ``done``. (Robert Collins, #571437)
-
-* When passing a file to ``UTF8DirReader`` make sure to close the current
-  directory file handle after the chdir fails. Otherwise when passing many
-  filenames into a command line ``bzr status`` we would leak descriptors.
-  (John Arbash Meinel, #583486)
-
-
-Testing
-*******
-
-* ``build_tree_contents`` can create symlinks.
-  (Martin Pool, John Arbash Meinel)
-
-
-bzr 2.0.5
-#########
-
-:2.0.5: 2010-03-23
-
-This fifth release in our 2.0 series addresses several user-inconvenience
-bugs.  None are critical, but upgrading is recommended for all users on
-earlier 2.0 releases.
-
-Bug Fixes
-*********
-
-* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
-  (Martin Pool, #331095)
-
-* Concurrent autopacking is more resilient to already-renamed pack files.
-  If we find that a file we are about to obsolete is already obsoleted, we
-  do not try to rename it, and we leave the file in ``obsolete_packs``.
-  The code is also fault tolerant if a file goes missing, assuming that
-  another process already removed the file.
-  (John Arbash Meinel, Gareth White, #507557)
-
-* Cope with the lockdir ``held/info`` file being empty, which seems to
-  happen fairly often if the process is suddenly interrupted while taking
-  a lock.
-  (Martin Pool, #185103)
-
-* Give the warning about potentially slow cross-format fetches much
-  earlier on in the fetch operation.  Don't show this message during
-  upgrades, and show the correct format indication for remote
-  repositories.
-  (Martin Pool, #456077, #515356, #513157)
-
-* Handle renames correctly when there are files or directories that 
-  differ only in case.  (Chris Jones, Martin Pool, #368931)
-
-* If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
-  error, report that error rather than failing with an unhelpful
-  ``UnboundLocalError``.
-  (Andrew Bennetts, #423563)
-
-* Running ``bzr`` command without any arguments now shows bzr
-  version number along with rest of the help text.
-  (Parth Malwankar, #369501)
-
-* Use osutils.O_NOINHERIT for some files on win32 to avoid PermissionDenied
-  errors.
-  (Inada Naoki, #524560)
-
-Documentation
-*************
-
-* Added ``location-alias`` help topic.
-  (Andrew Bennetts, #337834)
-
-* Fixed CHM generation by moving the NEWS section template into
-  a separate file. (Ian Clatworthy, #524184)
-
-
 bzr 2.0.4
 #########
 
@@ -3048,7 +3540,7 @@
   
 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
   supported at the moment on workingtree formats that can do content
-  filtering.  (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
+  filtering.  (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
   bzr now says so, rather than just ignoring the option.  (Martin Pool)
 
 * There was a bug in ``osutils.relpath`` that was only triggered on
@@ -5910,7 +6402,7 @@
   when the path to the root of the tree has been given. Users of
   the internal ``show_tree_status`` function should be aware that
   the show_pending flag is now authoritative for showing pending
-  merges, as it was originally. (Robert Collins, #225204)
+  merges, as it was originally. (Robert Collins, #255204)
 
 * Set valid default _param_name for Option so that ListOption can embed
   '-' in names. (Vincent Ladeuil, #263249)
@@ -9826,7 +10318,7 @@
   hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
   iterator was using direct comparison and ``'abc/a'`` sorts after
   ``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
-  (John Arbash Meinel, #111227)
+  (John Arbash Meinel, #111127)
 
 * Handle when someone renames a file on disk without telling bzr.
   Previously we would report the first file as missing, but not show
@@ -11110,11 +11602,11 @@
 * ``Branch.bind(other_branch)`` no longer takes a write lock on the
   other branch, and will not push or pull between the two branches.
   API users will need to perform a push or pull or update operation if they
-  require branch synchronisation to take place. (Robert Collins, #47344)
+  require branch synchronisation to take place. (Robert Collins, #43744)
 
 * When creating a tarball or zipfile export, export unicode names as utf-8
   paths. This may not work perfectly on all platforms, but has the best
-  chance of working in the common case. (John Arbash Meinel, #56816)
+  chance of working in the common case. (John Arbash Meinel, #56815)
 
 * When committing, only files that exist in working tree or basis tree
   may be specified (Aaron Bentley, #50793)

=== modified file 'bzr'
--- bzr	2010-08-07 00:54:52 +0000
+++ bzr	2011-09-27 11:59:19 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 2, 0)
+_script_version = (2, 2, 5)
 
 try:
     version_info = sys.version_info
@@ -75,6 +75,16 @@
 else:
     import locale
 
+if os.name == "posix":
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except locale.Error, e:
+        sys.stderr.write('bzr: warning: %s\n'
+            '  bzr could not set the application locale.\n'
+            '  Although this should be no problem for bzr itself, it might\n'
+            '  cause problems with some plugins. To investigate the issue,\n'
+            '  look at the output of the locale(1p) tool.\n' % e)
+
 
 # The python2.6 release includes some libraries that have deprecation warnings
 # against the interpreter - see https://bugs.launchpad.net/bzr/+bug/387139
@@ -86,17 +96,6 @@
     )
 
 
-try:
-    locale.setlocale(locale.LC_ALL, '')
-except locale.Error, e:
-    sys.stderr.write('bzr: warning: %s\n'
-                     '  bzr could not set the application locale.\n'
-                     '  Although this should be no problem for bzr itself,\n'
-                     '  it might cause problems with some plugins.\n'
-                     '  To investigate the issue, look at the output\n'
-                     '  of the locale(1p) tool available on POSIX systems.\n'
-                     % e)
-
 # instruct bzrlib/__init__.py to install lazy_regex
 sys._bzr_lazy_regex = True
 try:

=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2010-08-07 00:54:52 +0000
+++ bzrlib/__init__.py	2011-09-27 11:59:19 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 IGNORE_FILENAME = ".bzrignore"
 
 
-__copyright__ = "Copyright 2005-2010 Canonical Ltd."
+__copyright__ = "Copyright 2005-2011 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All
@@ -52,7 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 2, 0, 'final', 0)
+version_info = (2, 2, 5, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 2, 0)

=== modified file 'bzrlib/_annotator_pyx.c'
--- bzrlib/_annotator_pyx.c	2010-08-07 00:54:52 +0000
+++ bzrlib/_annotator_pyx.c	2011-09-27 11:59:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.5 on Fri Aug  6 14:29:04 2010 */
+/* Generated by Pyrex 0.9.8.5 on Wed Oct  6 23:21:00 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -145,7 +145,7 @@
   Py_INCREF(__pyx_v_annotations);
   Py_INCREF(__pyx_v_parent_annotations);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":63 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":63 */
   __pyx_1 = (!PyList_CheckExact(__pyx_v_annotations));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; goto __pyx_L1;}
@@ -160,7 +160,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":65 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":65 */
   __pyx_1 = (!PyList_CheckExact(__pyx_v_parent_annotations));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
@@ -175,7 +175,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":67 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":67 */
   __pyx_r = 0;
   goto __pyx_L0;
 
@@ -201,7 +201,7 @@
   Py_INCREF(__pyx_v_parent_annotations);
   Py_INCREF(__pyx_v_annotations);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":73 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":73 */
   __pyx_1 = ((__pyx_v_parent_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_parent_annotations));
   if (__pyx_1) {
     __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;}
@@ -225,7 +225,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":78 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":78 */
   __pyx_1 = ((__pyx_v_lines_idx + __pyx_v_match_len) > PyList_GET_SIZE(__pyx_v_annotations));
   if (__pyx_1) {
     __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;}
@@ -249,7 +249,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":83 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":83 */
   __pyx_r = 0;
   goto __pyx_L0;
 
@@ -272,10 +272,10 @@
   int __pyx_1;
   Py_INCREF(__pyx_v_tpl);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":94 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":94 */
   (__pyx_v_pos[0]) = ((__pyx_v_pos[0]) + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":95 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":95 */
   __pyx_1 = ((__pyx_v_pos[0]) >= PyTuple_GET_SIZE(__pyx_v_tpl));
   if (__pyx_1) {
     __pyx_r = NULL;
@@ -284,7 +284,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":97 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":97 */
   __pyx_r = PyTuple_GET_ITEM(__pyx_v_tpl,(__pyx_v_pos[0]));
   goto __pyx_L0;
 
@@ -313,7 +313,7 @@
   __pyx_v_cache_key = Py_None; Py_INCREF(Py_None);
   __pyx_v_new_ann = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":106 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":106 */
   __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;}
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
@@ -338,10 +338,10 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":110 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":110 */
   __pyx_v_temp = PyDict_GetItem(__pyx_v_cache,__pyx_v_cache_key);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":111 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":111 */
   __pyx_1 = (__pyx_v_temp != NULL);
   if (__pyx_1) {
     Py_INCREF(((PyObject *)__pyx_v_temp));
@@ -351,7 +351,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":114 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":114 */
   __pyx_1 = (!PyTuple_CheckExact(__pyx_v_ann_one));
   if (!__pyx_1) {
     __pyx_1 = (!PyTuple_CheckExact(__pyx_v_ann_two));
@@ -369,28 +369,28 @@
   }
   __pyx_L4:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":118 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":118 */
   __pyx_v_pos_one = (-1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":119 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":119 */
   __pyx_v_pos_two = (-1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":120 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":120 */
   __pyx_v_out_pos = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":121 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":121 */
   __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":122 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":122 */
   __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":123 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":123 */
   __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;}
   Py_DECREF(__pyx_v_new_ann);
   __pyx_v_new_ann = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":125 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":125 */
   while (1) {
     __pyx_1 = (__pyx_v_left != NULL);
     if (__pyx_1) {
@@ -398,93 +398,93 @@
     }
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":129 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":129 */
     __pyx_1 = (__pyx_v_left == __pyx_v_right);
     if (!__pyx_1) {
       __pyx_1 = PyObject_RichCompareBool(__pyx_v_left,__pyx_v_right,Py_EQ);
     }
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":132 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":132 */
       Py_INCREF(__pyx_v_left);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":133 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":133 */
       PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":134 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":134 */
       __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":135 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":135 */
       __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
       goto __pyx_L7;
     }
     __pyx_1 = PyObject_RichCompareBool(__pyx_v_left,__pyx_v_right,Py_LT);
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":138 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":138 */
       Py_INCREF(__pyx_v_left);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":139 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":139 */
       PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":140 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":140 */
       __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
       goto __pyx_L7;
     }
     /*else*/ {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":142 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":142 */
       Py_INCREF(__pyx_v_right);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":143 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":143 */
       PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_right);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":144 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":144 */
       __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
     }
     __pyx_L7:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":145 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":145 */
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":146 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":146 */
   while (1) {
     __pyx_1 = (__pyx_v_left != NULL);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":147 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":147 */
     Py_INCREF(__pyx_v_left);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":148 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":148 */
     PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_left);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":149 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":149 */
     __pyx_v_left = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_one,(&__pyx_v_pos_one));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":150 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":150 */
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":151 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":151 */
   while (1) {
     __pyx_1 = (__pyx_v_right != NULL);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":152 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":152 */
     Py_INCREF(__pyx_v_right);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":153 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":153 */
     PyTuple_SET_ITEM(__pyx_v_new_ann,__pyx_v_out_pos,__pyx_v_right);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":154 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":154 */
     __pyx_v_right = __pyx_f_6bzrlib_14_annotator_pyx__next_tuple_entry(__pyx_v_ann_two,(&__pyx_v_pos_two));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":155 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":155 */
     __pyx_v_out_pos = (__pyx_v_out_pos + 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":156 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":156 */
   __pyx_1 = (__pyx_v_out_pos != PyTuple_GET_SIZE(__pyx_v_new_ann));
   if (__pyx_1) {
     __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;}
@@ -495,10 +495,10 @@
   }
   __pyx_L12:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":160 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":160 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":161 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":161 */
   Py_INCREF(__pyx_v_new_ann);
   __pyx_r = __pyx_v_new_ann;
   goto __pyx_L0;
@@ -538,16 +538,16 @@
   Py_INCREF(__pyx_v_parent_annotations);
   Py_INCREF(__pyx_v_matching_blocks);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":174 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":174 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":175 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":175 */
   __pyx_v_par_list = ((PyListObject *)__pyx_v_parent_annotations);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":176 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":176 */
   __pyx_v_ann_list = ((PyListObject *)__pyx_v_annotations);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":181 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":181 */
   __pyx_2 = PyObject_GetIter(__pyx_v_matching_blocks); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
   for (;;) {
     __pyx_3 = PyIter_Next(__pyx_2);
@@ -572,31 +572,31 @@
     if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":182 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":182 */
     __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;}
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":184 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":184 */
     __pyx_v_par_temp = (__pyx_v_par_list->ob_item + __pyx_v_parent_idx);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":185 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":185 */
     __pyx_v_ann_temp = (__pyx_v_ann_list->ob_item + __pyx_v_lines_idx);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":186 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":186 */
     for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_v_match_len; ++__pyx_v_idx) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":187 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":187 */
       Py_INCREF((__pyx_v_par_temp[__pyx_v_idx]));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":188 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":188 */
       Py_DECREF((__pyx_v_ann_temp[__pyx_v_idx]));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":189 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":189 */
       (__pyx_v_ann_temp[__pyx_v_idx]) = (__pyx_v_par_temp[__pyx_v_idx]);
     }
   }
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":190 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":190 */
   __pyx_r = 0;
   goto __pyx_L0;
 
@@ -647,25 +647,25 @@
   __pyx_v_ann = Py_None; Py_INCREF(Py_None);
   __pyx_v_new_ann = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":199 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":199 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":200 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":200 */
   Py_INCREF(Py_None);
   Py_DECREF(__pyx_v_last_ann);
   __pyx_v_last_ann = Py_None;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":201 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":201 */
   Py_INCREF(Py_None);
   Py_DECREF(__pyx_v_last_parent);
   __pyx_v_last_parent = Py_None;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":202 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":202 */
   Py_INCREF(Py_None);
   Py_DECREF(__pyx_v_last_res);
   __pyx_v_last_res = Py_None;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":203 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":203 */
   __pyx_2 = PyObject_GetIter(__pyx_v_matching_blocks); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
   for (;;) {
     __pyx_3 = PyIter_Next(__pyx_2);
@@ -690,22 +690,22 @@
     if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 203; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":204 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":204 */
     __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;}
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":208 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":208 */
     for (__pyx_v_idx = 0; __pyx_v_idx < __pyx_v_match_len; ++__pyx_v_idx) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":209 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":209 */
       __pyx_v_ann_idx = (__pyx_v_lines_idx + __pyx_v_idx);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":210 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":210 */
       __pyx_v_ann_temp = PyList_GET_ITEM(__pyx_v_annotations,__pyx_v_ann_idx);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":211 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":211 */
       __pyx_v_par_temp = PyList_GET_ITEM(__pyx_v_parent_annotations,(__pyx_v_parent_idx + __pyx_v_idx));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":212 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":212 */
       __pyx_1 = (__pyx_v_ann_temp == __pyx_v_par_temp);
       if (__pyx_1) {
         goto __pyx_L4;
@@ -713,71 +713,71 @@
       }
       __pyx_L6:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":221 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":221 */
       Py_INCREF(((PyObject *)__pyx_v_par_temp));
       Py_DECREF(__pyx_v_par_ann);
       __pyx_v_par_ann = ((PyObject *)__pyx_v_par_temp);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":222 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":222 */
       Py_INCREF(((PyObject *)__pyx_v_ann_temp));
       Py_DECREF(__pyx_v_ann);
       __pyx_v_ann = ((PyObject *)__pyx_v_ann_temp);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":223 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":223 */
       __pyx_1 = __pyx_v_ann == __pyx_v_this_annotation;
       if (__pyx_1) {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":226 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":226 */
         Py_INCREF(__pyx_v_par_ann);
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":227 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":227 */
         __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;}
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":228 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":228 */
         goto __pyx_L4;
         goto __pyx_L7;
       }
       __pyx_L7:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":231 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":231 */
       __pyx_1 = __pyx_v_ann == __pyx_v_last_ann;
       if (__pyx_1) {
         __pyx_1 = __pyx_v_par_ann == __pyx_v_last_parent;
       }
       if (__pyx_1) {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":232 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":232 */
         Py_INCREF(__pyx_v_last_res);
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":233 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":233 */
         __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;}
         goto __pyx_L8;
       }
       /*else*/ {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":235 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":235 */
         __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;}
         Py_DECREF(__pyx_v_new_ann);
         __pyx_v_new_ann = __pyx_3;
         __pyx_3 = 0;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":236 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":236 */
         Py_INCREF(__pyx_v_new_ann);
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":237 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":237 */
         __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;}
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":238 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":238 */
         Py_INCREF(__pyx_v_ann);
         Py_DECREF(__pyx_v_last_ann);
         __pyx_v_last_ann = __pyx_v_ann;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":239 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":239 */
         Py_INCREF(__pyx_v_par_ann);
         Py_DECREF(__pyx_v_last_parent);
         __pyx_v_last_parent = __pyx_v_par_ann;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":240 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":240 */
         Py_INCREF(__pyx_v_new_ann);
         Py_DECREF(__pyx_v_last_res);
         __pyx_v_last_res = __pyx_v_new_ann;
@@ -788,7 +788,7 @@
   }
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":241 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":241 */
   __pyx_r = 0;
   goto __pyx_L0;
 
@@ -841,7 +841,7 @@
   __pyx_v_parent_annotations = Py_None; Py_INCREF(Py_None);
   __pyx_v_matching_blocks = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":250 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":250 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_k6p); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
   Py_INCREF(__pyx_v_key);
@@ -866,7 +866,7 @@
   if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":253 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":253 */
   __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;}
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
@@ -916,7 +916,7 @@
   __pyx_v_parent_annotations = Py_None; Py_INCREF(Py_None);
   __pyx_v_matching_blocks = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":260 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":260 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_k6p); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
   Py_INCREF(__pyx_v_key);
@@ -941,7 +941,7 @@
   if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":262 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":262 */
   __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;}
   __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;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1005,7 +1005,7 @@
   __pyx_v_head = Py_None; Py_INCREF(Py_None);
   __pyx_v_the_heads = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":272 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":272 */
   __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; goto __pyx_L1;}
   Py_INCREF(__pyx_n_annotate);
   PyList_SET_ITEM(__pyx_1, 0, __pyx_n_annotate);
@@ -1017,13 +1017,13 @@
   __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":274 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":274 */
   __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;}
   Py_DECREF(__pyx_v_custom_tiebreaker);
   __pyx_v_custom_tiebreaker = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":275 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":275 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_annotate); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
   Py_INCREF(__pyx_v_key);
@@ -1044,17 +1044,17 @@
   if (__Pyx_EndUnpack(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":276 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":276 */
   __pyx_4 = PyObject_Length(__pyx_v_lines); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; goto __pyx_L1;}
   __pyx_v_num_lines = __pyx_4;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":277 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":277 */
   __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; goto __pyx_L1;}
   Py_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":278 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":278 */
   __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;}
   __pyx_1 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -1064,22 +1064,22 @@
   __pyx_v_heads = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":279 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":279 */
   for (__pyx_v_pos = 0; __pyx_v_pos < __pyx_v_num_lines; ++__pyx_v_pos) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":280 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":280 */
     __pyx_3 = __Pyx_GetItemInt(__pyx_v_annotations, __pyx_v_pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;}
     Py_DECREF(__pyx_v_annotation);
     __pyx_v_annotation = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":281 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":281 */
     __pyx_1 = __Pyx_GetItemInt(__pyx_v_lines, __pyx_v_pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; goto __pyx_L1;}
     Py_DECREF(__pyx_v_line);
     __pyx_v_line = __pyx_1;
     __pyx_1 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":282 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":282 */
     __pyx_4 = PyObject_Length(__pyx_v_annotation); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; goto __pyx_L1;}
     __pyx_5 = (__pyx_4 == 1);
     if (__pyx_5) {
@@ -1091,7 +1091,7 @@
     }
     /*else*/ {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":285 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":285 */
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
       Py_INCREF(__pyx_v_annotation);
       PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_annotation);
@@ -1101,7 +1101,7 @@
       __pyx_v_the_heads = __pyx_1;
       __pyx_1 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":286 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":286 */
       __pyx_4 = PyObject_Length(__pyx_v_the_heads); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
       __pyx_5 = (__pyx_4 == 1);
       if (__pyx_5) {
@@ -1141,7 +1141,7 @@
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":293 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":293 */
     __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
     Py_INCREF(__pyx_v_head);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_head);
@@ -1151,7 +1151,7 @@
     Py_DECREF(__pyx_1); __pyx_1 = 0;
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":294 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":294 */
   Py_INCREF(__pyx_v_out);
   __pyx_r = __pyx_v_out;
   goto __pyx_L0;
@@ -1201,7 +1201,7 @@
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;};
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":58 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":58 */
   __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;}
   Py_INCREF(__pyx_n__annotator_py);
   PyList_SET_ITEM(__pyx_1, 0, __pyx_n__annotator_py);
@@ -1212,7 +1212,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":244 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":244 */
   __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__annotator_py); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_Annotator); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; goto __pyx_L1;}
@@ -1224,21 +1224,21 @@
   __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;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":247 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":247 */
   __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;}
   __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   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;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":256 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":256 */
   __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;}
   __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   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;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_annotator_pyx.pyx":265 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_annotator_pyx.pyx":265 */
   __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;}
   __pyx_4 = PyMethod_New(__pyx_1, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;

=== modified file 'bzrlib/_bencode_pyx.c'
--- bzrlib/_bencode_pyx.c	2010-08-07 00:54:52 +0000
+++ bzrlib/_bencode_pyx.c	2011-09-27 11:59:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.5 on Fri Aug  6 14:29:12 2010 */
+/* Generated by Pyrex 0.9.8.5 on Wed Oct  6 23:21:00 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -249,7 +249,7 @@
   Py_INCREF(__pyx_v_s);
   Py_INCREF(__pyx_v_yield_tuples);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":81 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":81 */
   __pyx_1 = (!PyString_CheckExact(__pyx_v_s));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; goto __pyx_L1;}
@@ -264,20 +264,20 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":84 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":84 */
   Py_INCREF(__pyx_v_s);
   Py_DECREF(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text);
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->text = __pyx_v_s;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":85 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":85 */
   __pyx_4 = PyString_AS_STRING(__pyx_v_s); if (__pyx_4 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; goto __pyx_L1;}
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->tail = __pyx_4;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":86 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":86 */
   __pyx_5 = PyString_GET_SIZE(__pyx_v_s); if (__pyx_5 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; goto __pyx_L1;}
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size = __pyx_5;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":87 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":87 */
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
   Py_INCREF(__pyx_v_yield_tuples);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_yield_tuples);
@@ -313,13 +313,13 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_result = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":90 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":90 */
   __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;}
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":91 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":91 */
   __pyx_2 = (((struct __pyx_obj_6bzrlib_12_bencode_pyx_Decoder *)__pyx_v_self)->size != 0);
   if (__pyx_2) {
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; goto __pyx_L1;}
@@ -334,7 +334,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":93 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":93 */
   Py_INCREF(__pyx_v_result);
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
@@ -383,7 +383,7 @@
   PyObject *__pyx_3 = 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":101 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":101 */
   __pyx_1 = (0 == __pyx_v_self->size);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
@@ -398,7 +398,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":104 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":104 */
   __pyx_1 = Py_EnterRecursiveCall(__pyx_k4);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; goto __pyx_L1;}
@@ -413,13 +413,13 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":106 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":106 */
   /*try:*/ {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":107 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":107 */
     __pyx_v_ch = (__pyx_v_self->tail[0]);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":108 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":108 */
     __pyx_1 = '0' <= __pyx_v_ch;
     if (__pyx_1) {
       __pyx_1 = __pyx_v_ch <= '9';
@@ -434,10 +434,10 @@
     __pyx_1 = (__pyx_v_ch == 'l');
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":111 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":111 */
       D_UPDATE_TAIL(__pyx_v_self,1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":112 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":112 */
       __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;}
       __pyx_r = __pyx_3;
       __pyx_3 = 0;
@@ -447,10 +447,10 @@
     __pyx_1 = (__pyx_v_ch == 'i');
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":114 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":114 */
       D_UPDATE_TAIL(__pyx_v_self,1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":115 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":115 */
       __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;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -460,10 +460,10 @@
     __pyx_1 = (__pyx_v_ch == 'd');
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":117 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":117 */
       D_UPDATE_TAIL(__pyx_v_self,1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":118 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":118 */
       __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;}
       __pyx_r = __pyx_3;
       __pyx_3 = 0;
@@ -535,10 +535,10 @@
   PyObject *__pyx_4 = 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":126 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":126 */
   __pyx_v_i = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":127 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":127 */
   while (1) {
     __pyx_1 = ((__pyx_v_self->tail[__pyx_v_i]) >= '0');
     if (__pyx_1) {
@@ -554,7 +554,7 @@
     __pyx_v_i = (__pyx_v_i + 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":131 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":131 */
   __pyx_1 = ((__pyx_v_self->tail[__pyx_v_i]) != __pyx_v_stop_char);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_stop_char); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; goto __pyx_L1;}
@@ -578,7 +578,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":134 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":134 */
   __pyx_1 = ((__pyx_v_self->tail[0]) == '0');
   if (!__pyx_1) {
     __pyx_1 = ((__pyx_v_self->tail[0]) == '-');
@@ -602,7 +602,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":140 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":140 */
   __pyx_r = __pyx_v_i;
   goto __pyx_L0;
 
@@ -628,14 +628,14 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_ret = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":144 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":144 */
   __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;}
   __pyx_v_i = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":145 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":145 */
   (__pyx_v_self->tail[__pyx_v_i]) = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":146 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":146 */
   /*try:*/ {
     __pyx_2 = PyInt_FromString(__pyx_v_self->tail,NULL,10); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L3;}
     Py_DECREF(__pyx_v_ret);
@@ -668,10 +668,10 @@
     }
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":150 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":150 */
   D_UPDATE_TAIL(__pyx_v_self,(__pyx_v_i + 1));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":151 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":151 */
   Py_INCREF(__pyx_v_ret);
   __pyx_r = __pyx_v_ret;
   goto __pyx_L0;
@@ -699,10 +699,10 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_result = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":160 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":160 */
   __pyx_v_n = strtol(__pyx_v_self->tail,(&__pyx_v_next_tail),10);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":161 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":161 */
   __pyx_1 = (__pyx_v_next_tail == NULL);
   if (!__pyx_1) {
     __pyx_1 = ((__pyx_v_next_tail[0]) != ':');
@@ -720,7 +720,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":164 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":164 */
   __pyx_1 = ((__pyx_v_self->tail[0]) == '0');
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_n != 0);
@@ -741,10 +741,10 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":167 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":167 */
   D_UPDATE_TAIL(__pyx_v_self,((__pyx_v_next_tail - __pyx_v_self->tail) + 1));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":168 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":168 */
   __pyx_1 = (__pyx_v_n == 0);
   if (__pyx_1) {
     Py_INCREF(__pyx_k10p);
@@ -754,7 +754,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":170 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":170 */
   __pyx_1 = (__pyx_v_n > __pyx_v_self->size);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; goto __pyx_L1;}
@@ -769,7 +769,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":172 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":172 */
   __pyx_1 = (__pyx_v_n < 0);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_n); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
@@ -787,16 +787,16 @@
   }
   __pyx_L6:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":175 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":175 */
   __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;}
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":176 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":176 */
   D_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":177 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":177 */
   Py_INCREF(__pyx_v_result);
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
@@ -823,23 +823,23 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_result = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":180 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":180 */
   __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":182 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":182 */
   while (1) {
     __pyx_2 = (__pyx_v_self->size > 0);
     if (!__pyx_2) break;
     __pyx_2 = ((__pyx_v_self->tail[0]) == 'e');
     if (__pyx_2) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":184 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":184 */
       D_UPDATE_TAIL(__pyx_v_self,1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":185 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":185 */
       __pyx_2 = __pyx_v_self->_yield_tuples;
       if (__pyx_2) {
         __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;}
@@ -868,7 +868,7 @@
     __pyx_L4:;
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":195 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":195 */
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
   Py_INCREF(__pyx_k12p);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k12p);
@@ -907,33 +907,33 @@
   __pyx_v_key = Py_None; Py_INCREF(Py_None);
   __pyx_v_value = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":200 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":200 */
   __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;}
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":201 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":201 */
   Py_INCREF(Py_None);
   Py_DECREF(__pyx_v_lastkey);
   __pyx_v_lastkey = Py_None;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":203 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":203 */
   while (1) {
     __pyx_2 = (__pyx_v_self->size > 0);
     if (!__pyx_2) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":204 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":204 */
     __pyx_v_ch = (__pyx_v_self->tail[0]);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":205 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":205 */
     __pyx_2 = (__pyx_v_ch == 'e');
     if (__pyx_2) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":206 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":206 */
       D_UPDATE_TAIL(__pyx_v_self,1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":207 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":207 */
       Py_INCREF(__pyx_v_result);
       __pyx_r = __pyx_v_result;
       goto __pyx_L0;
@@ -941,7 +941,7 @@
     }
     /*else*/ {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":210 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":210 */
       __pyx_2 = ((__pyx_v_self->tail[0]) < '0');
       if (!__pyx_2) {
         __pyx_2 = ((__pyx_v_self->tail[0]) > '9');
@@ -959,13 +959,13 @@
       }
       __pyx_L5:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":212 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":212 */
       __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;}
       Py_DECREF(__pyx_v_key);
       __pyx_v_key = __pyx_1;
       __pyx_1 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":213 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":213 */
       if (PyObject_Cmp(__pyx_v_lastkey, __pyx_v_key, &__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
       __pyx_2 = __pyx_2 >= 0;
       if (__pyx_2) {
@@ -986,19 +986,19 @@
       }
       __pyx_L6:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":217 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":217 */
       __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;}
       Py_DECREF(__pyx_v_value);
       __pyx_v_value = __pyx_3;
       __pyx_3 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":218 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":218 */
       if (PyObject_SetItem(__pyx_v_result, __pyx_v_key, __pyx_v_value) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; goto __pyx_L1;}
     }
     __pyx_L4:;
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":220 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":220 */
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
   Py_INCREF(__pyx_k15p);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k15p);
@@ -1132,19 +1132,19 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|i", __pyx_argnames, &__pyx_v_maxsize)) return -1;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":259 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":259 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":260 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":260 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->size = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":261 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":261 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = NULL;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":263 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":263 */
   __pyx_v_p = ((char *)malloc(__pyx_v_maxsize));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":264 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":264 */
   __pyx_1 = (__pyx_v_p == NULL);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
@@ -1159,13 +1159,13 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":267 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":267 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = __pyx_v_p;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":268 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":268 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = __pyx_v_maxsize;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":269 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":269 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->tail = __pyx_v_p;
 
   __pyx_r = 0;
@@ -1184,13 +1184,13 @@
 static void __pyx_f_6bzrlib_12_bencode_pyx_7Encoder___dealloc__(PyObject *__pyx_v_self) {
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":272 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":272 */
   free(((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":273 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":273 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->buffer = NULL;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":274 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":274 */
   ((struct __pyx_obj_6bzrlib_12_bencode_pyx_Encoder *)__pyx_v_self)->maxsize = 0;
 
   Py_DECREF(__pyx_v_self);
@@ -1240,7 +1240,7 @@
   PyObject *__pyx_3 = 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":290 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":290 */
   __pyx_1 = ((__pyx_v_self->size + __pyx_v_required) < __pyx_v_self->maxsize);
   if (__pyx_1) {
     __pyx_r = 1;
@@ -1249,20 +1249,20 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":293 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":293 */
   __pyx_v_new_size = __pyx_v_self->maxsize;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":294 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":294 */
   while (1) {
     __pyx_1 = (__pyx_v_new_size < (__pyx_v_self->size + __pyx_v_required));
     if (!__pyx_1) break;
     __pyx_v_new_size = (__pyx_v_new_size * 2);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":296 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":296 */
   __pyx_v_new_buffer = ((char *)realloc(__pyx_v_self->buffer,__pyx_v_new_size));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":297 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":297 */
   __pyx_1 = (__pyx_v_new_buffer == NULL);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; goto __pyx_L1;}
@@ -1277,16 +1277,16 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":300 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":300 */
   __pyx_v_self->buffer = __pyx_v_new_buffer;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":301 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":301 */
   __pyx_v_self->maxsize = __pyx_v_new_size;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":302 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":302 */
   __pyx_v_self->tail = (&(__pyx_v_new_buffer[__pyx_v_self->size]));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":303 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":303 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1310,13 +1310,13 @@
   PyObject *__pyx_3 = 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":310 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":310 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":311 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":311 */
   __pyx_v_n = snprintf(__pyx_v_self->tail,__pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE,__pyx_k20,__pyx_v_x);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":312 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":312 */
   __pyx_1 = (__pyx_v_n < 0);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromLong(__pyx_v_x); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 313; goto __pyx_L1;}
@@ -1334,10 +1334,10 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":314 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":314 */
   E_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":315 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":315 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1408,21 +1408,21 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_s);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":322 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":322 */
   __pyx_1 = PyString_GET_SIZE(__pyx_v_s); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;}
   __pyx_v_n = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":323 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":323 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":324 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":324 */
   __pyx_3 = PyString_AS_STRING(__pyx_v_s); if (__pyx_3 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;}
   memcpy(__pyx_v_self->tail,__pyx_3,__pyx_v_n);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":325 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":325 */
   E_UPDATE_TAIL(__pyx_v_self,__pyx_v_n);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":326 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":326 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1449,17 +1449,17 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":331 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":331 */
   __pyx_1 = PyString_GET_SIZE(__pyx_v_x); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; goto __pyx_L1;}
   __pyx_v_x_len = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":332 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":332 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":333 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":333 */
   __pyx_v_n = snprintf(__pyx_v_self->tail,__pyx_e_6bzrlib_12_bencode_pyx_INT_BUF_SIZE,__pyx_k25,__pyx_v_x_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":334 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":334 */
   __pyx_2 = (__pyx_v_n < 0);
   if (__pyx_2) {
     __pyx_3 = PyNumber_Remainder(__pyx_k26p, __pyx_v_x); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
@@ -1475,14 +1475,14 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":336 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":336 */
   __pyx_5 = PyString_AS_STRING(__pyx_v_x); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;}
   memcpy((__pyx_v_self->tail + __pyx_v_n),__pyx_5,__pyx_v_x_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":337 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":337 */
   E_UPDATE_TAIL(__pyx_v_self,(__pyx_v_n + __pyx_v_x_len));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":338 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":338 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1511,16 +1511,16 @@
   Py_INCREF(__pyx_v_x);
   __pyx_v_i = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":341 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":341 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":342 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":342 */
   (__pyx_v_self->tail[0]) = 'l';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":343 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":343 */
   E_UPDATE_TAIL(__pyx_v_self,1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":345 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":345 */
   __pyx_2 = PyObject_GetIter(__pyx_v_x); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
   for (;;) {
     __pyx_3 = PyIter_Next(__pyx_2);
@@ -1542,16 +1542,16 @@
   }
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":348 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":348 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":349 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":349 */
   (__pyx_v_self->tail[0]) = 'e';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":350 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":350 */
   E_UPDATE_TAIL(__pyx_v_self,1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":351 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":351 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1585,16 +1585,16 @@
   __pyx_v_keys = Py_None; Py_INCREF(Py_None);
   __pyx_v_k = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":354 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":354 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":355 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":355 */
   (__pyx_v_self->tail[0]) = 'd';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":356 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":356 */
   E_UPDATE_TAIL(__pyx_v_self,1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":358 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":358 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_x, __pyx_n_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; goto __pyx_L1;}
   __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1602,13 +1602,13 @@
   __pyx_v_keys = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":359 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":359 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_keys, __pyx_n_sort); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; goto __pyx_L1;}
   __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":360 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":360 */
   __pyx_2 = PyObject_GetIter(__pyx_v_keys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; goto __pyx_L1;}
   for (;;) {
     __pyx_3 = PyIter_Next(__pyx_2);
@@ -1620,7 +1620,7 @@
     __pyx_v_k = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":361 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":361 */
     __pyx_1 = (!PyString_CheckExact(__pyx_v_k));
     if (__pyx_1) {
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; goto __pyx_L1;}
@@ -1635,10 +1635,10 @@
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":363 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":363 */
     __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;}
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":364 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":364 */
     __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;}
     __pyx_4 = PyObject_GetItem(__pyx_v_x, __pyx_v_k); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
@@ -1651,16 +1651,16 @@
   }
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":366 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":366 */
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":367 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":367 */
   (__pyx_v_self->tail[0]) = 'e';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":368 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":368 */
   E_UPDATE_TAIL(__pyx_v_self,1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":369 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":369 */
   __pyx_r = 1;
   goto __pyx_L0;
 
@@ -1694,7 +1694,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":372 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":372 */
   __pyx_1 = Py_EnterRecursiveCall(__pyx_k31);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 373; goto __pyx_L1;}
@@ -1709,7 +1709,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":374 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":374 */
   /*try:*/ {
     __pyx_1 = PyString_CheckExact(__pyx_v_x);
     if (__pyx_1) {
@@ -1831,13 +1831,13 @@
   Py_INCREF(__pyx_v_x);
   __pyx_v_encoder = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":398 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":398 */
   __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;}
   Py_DECREF(__pyx_v_encoder);
   __pyx_v_encoder = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":399 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":399 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_encoder, __pyx_n_process); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
@@ -1847,7 +1847,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":400 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":400 */
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;}
   Py_INCREF(__pyx_v_encoder);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_encoder);
@@ -2244,15 +2244,15 @@
   __pyx_ptype_6bzrlib_12_bencode_pyx_Encoder = &__pyx_type_6bzrlib_12_bencode_pyx_Encoder;
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":66 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":66 */
   __pyx_1 = import_static_tuple_c(); if (__pyx_1 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":77 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":77 */
   __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; goto __pyx_L1;}
   __pyx_d1 = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":233 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":233 */
   __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
   __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_object); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;}
@@ -2261,14 +2261,14 @@
   __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;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":234 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":234 */
   __pyx_5 = PyList_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
   Py_INCREF(__pyx_n_bencoded);
   PyList_SET_ITEM(__pyx_5, 0, __pyx_n_bencoded);
   if (PyObject_SetAttr(__pyx_4, __pyx_n___slots__, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":236 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":236 */
   __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;}
   __pyx_6 = PyMethod_New(__pyx_5, 0, __pyx_4); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 236; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -2278,10 +2278,10 @@
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":253 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":253 */
   __pyx_d2 = __pyx_e_6bzrlib_12_bencode_pyx_INITSIZE;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_bencode_pyx.pyx":396 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_bencode_pyx.pyx":396 */
   return;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);

=== modified file 'bzrlib/_btree_serializer_pyx.c'
--- bzrlib/_btree_serializer_pyx.c	2010-08-07 00:54:52 +0000
+++ bzrlib/_btree_serializer_pyx.c	2011-09-27 11:59:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.5 on Fri Aug  6 14:30:57 2010 */
+/* Generated by Pyrex 0.9.8.5 on Wed Oct  6 23:21:12 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -172,18 +172,18 @@
   void *__pyx_r;
   int __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":74 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":74 */
   __pyx_v_start = ((char *)__pyx_v_s);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":75 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":75 */
   __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":76 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":76 */
   while (1) {
     __pyx_1 = (__pyx_v_pos >= __pyx_v_start);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":77 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":77 */
     __pyx_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
     if (__pyx_1) {
       __pyx_r = __pyx_v_pos;
@@ -192,11 +192,11 @@
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":79 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":79 */
     __pyx_v_pos = (__pyx_v_pos - 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":80 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":80 */
   __pyx_r = NULL;
   goto __pyx_L0;
 
@@ -212,7 +212,7 @@
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":85 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":85 */
   __pyx_1 = (__pyx_v_size < 0);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
@@ -236,7 +236,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":89 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":89 */
   __pyx_2 = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -264,7 +264,7 @@
   PyObject *__pyx_4 = 0;
   __pyx_v_result = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":94 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":94 */
   __pyx_1 = (__pyx_v_size < 0);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; goto __pyx_L1;}
@@ -288,21 +288,21 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":98 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":98 */
   __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":99 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":99 */
   PyString_InternInPlace((&__pyx_v_py_str));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":100 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":100 */
   Py_INCREF(((PyObject *)__pyx_v_py_str));
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = ((PyObject *)__pyx_v_py_str);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":103 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":103 */
   Py_DECREF(__pyx_v_py_str);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":104 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":104 */
   Py_INCREF(__pyx_v_result);
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
@@ -335,32 +335,32 @@
   Py_INCREF(__pyx_v_key_length);
   Py_INCREF(__pyx_v_ref_list_length);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":142 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":142 */
   Py_INCREF(__pyx_v_bytes);
   Py_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes = __pyx_v_bytes;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":143 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":143 */
   __pyx_1 = PyInt_AsLong(__pyx_v_key_length); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->key_length = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":144 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":144 */
   __pyx_1 = PyInt_AsLong(__pyx_v_ref_list_length); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; goto __pyx_L1;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->ref_list_length = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":145 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":145 */
   __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; goto __pyx_L1;}
   Py_DECREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys);
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":146 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":146 */
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = NULL;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":147 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":147 */
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_end_str = NULL;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":148 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":148 */
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_header_found = 0;
 
   __pyx_r = 0;
@@ -393,20 +393,20 @@
   __pyx_v_failure_string = Py_None; Py_INCREF(Py_None);
   __pyx_v_key_element = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":161 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":161 */
   __pyx_1 = ((PyObject *)StaticTuple_New(__pyx_v_self->key_length)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_key));
   __pyx_v_key = ((StaticTuple *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":162 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":162 */
   __pyx_2 = __pyx_v_self->key_length;
   for (__pyx_v_loop_counter = 0; __pyx_v_loop_counter < __pyx_2; ++__pyx_v_loop_counter) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":164 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":164 */
     __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\0',(__pyx_v_last - __pyx_v_self->_start)));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":165 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":165 */
     __pyx_3 = (__pyx_v_temp_ptr == NULL);
     if (__pyx_3) {
       __pyx_3 = ((__pyx_v_loop_counter + 1) == __pyx_v_self->key_length);
@@ -416,7 +416,7 @@
       }
       /*else*/ {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":171 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":171 */
         __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;}
         __pyx_4 = PyObject_Repr(__pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -426,7 +426,7 @@
         __pyx_v_failure_string = __pyx_1;
         __pyx_1 = 0;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":174 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":174 */
         __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
         Py_INCREF(__pyx_v_failure_string);
         PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_failure_string);
@@ -441,7 +441,7 @@
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":176 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":176 */
     __pyx_3 = (__pyx_v_self->key_length == 1);
     if (__pyx_3) {
       __pyx_3 = ((__pyx_v_temp_ptr - __pyx_v_self->_start) == 45);
@@ -464,23 +464,23 @@
     }
     __pyx_L6:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":185 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":185 */
     __pyx_v_self->_start = (__pyx_v_temp_ptr + 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":186 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":186 */
     Py_INCREF(__pyx_v_key_element);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":187 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":187 */
     StaticTuple_SET_ITEM(__pyx_v_key,__pyx_v_loop_counter,__pyx_v_key_element);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":188 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":188 */
   __pyx_4 = ((PyObject *)StaticTuple_Intern(__pyx_v_key)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_key));
   __pyx_v_key = ((StaticTuple *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":189 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":189 */
   Py_INCREF(((PyObject *)__pyx_v_key));
   __pyx_r = ((PyObject *)__pyx_v_key);
   goto __pyx_L0;
@@ -523,20 +523,20 @@
   __pyx_v_ref_list = Py_None; Py_INCREF(Py_None);
   __pyx_v_node_value = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":200 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":200 */
   __pyx_v_self->_start = __pyx_v_self->_cur_str;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":202 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":202 */
   __pyx_v_last = ((char *)memchr(__pyx_v_self->_start,'\n',(__pyx_v_self->_end_str - __pyx_v_self->_start)));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":203 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":203 */
   __pyx_1 = (__pyx_v_last == NULL);
   if (__pyx_1) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":205 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":205 */
     __pyx_v_last = __pyx_v_self->_end_str;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":206 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":206 */
     __pyx_v_self->_cur_str = __pyx_v_self->_end_str;
     goto __pyx_L2;
   }
@@ -545,7 +545,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":212 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":212 */
   __pyx_1 = (__pyx_v_last == __pyx_v_self->_start);
   if (__pyx_1) {
     __pyx_r = 0;
@@ -554,7 +554,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":215 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":215 */
   __pyx_1 = (__pyx_v_last < __pyx_v_self->_start);
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; goto __pyx_L1;}
@@ -569,16 +569,16 @@
   }
   __pyx_L4:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":218 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":218 */
   __pyx_1 = (0 == __pyx_v_self->_header_found);
   if (__pyx_1) {
     __pyx_1 = (strncmp(__pyx_k5,__pyx_v_self->_start,(__pyx_v_last - __pyx_v_self->_start)) == 0);
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":221 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":221 */
       __pyx_v_self->_header_found = 1;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":222 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":222 */
       __pyx_r = 0;
       goto __pyx_L0;
       goto __pyx_L6;
@@ -601,16 +601,16 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":227 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":227 */
   __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;}
   Py_DECREF(__pyx_v_key);
   __pyx_v_key = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":229 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":229 */
   __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)));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":230 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":230 */
   __pyx_1 = (__pyx_v_temp_ptr == NULL);
   if (__pyx_1) {
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; goto __pyx_L1;}
@@ -625,10 +625,10 @@
   }
   /*else*/ {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":240 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":240 */
     __pyx_v_str_len = ((__pyx_v_last - __pyx_v_temp_ptr) - 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":241 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":241 */
     __pyx_1 = (__pyx_v_str_len > 4);
     if (__pyx_1) {
       __pyx_1 = (strncmp(__pyx_k8,(__pyx_v_last - 4),4) == 0);
@@ -648,39 +648,39 @@
     }
     __pyx_L8:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":249 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":249 */
     __pyx_v_last = __pyx_v_temp_ptr;
   }
   __pyx_L7:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":251 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":251 */
   __pyx_1 = __pyx_v_self->ref_list_length;
   if (__pyx_1) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":252 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":252 */
     __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;}
     Py_DECREF(__pyx_v_ref_lists);
     __pyx_v_ref_lists = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":253 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":253 */
     __pyx_v_loop_counter = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":254 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":254 */
     while (1) {
       __pyx_1 = (__pyx_v_loop_counter < __pyx_v_self->ref_list_length);
       if (!__pyx_1) break;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":255 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":255 */
       __pyx_2 = PyList_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
       Py_DECREF(__pyx_v_ref_list);
       __pyx_v_ref_list = __pyx_2;
       __pyx_2 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":257 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":257 */
       __pyx_v_loop_counter = (__pyx_v_loop_counter + 1);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":258 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":258 */
       __pyx_1 = (__pyx_v_last < __pyx_v_self->_start);
       if (__pyx_1) {
         __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 259; goto __pyx_L1;}
@@ -695,10 +695,10 @@
       }
       __pyx_L12:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":261 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":261 */
       __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\t',(__pyx_v_last - __pyx_v_self->_start)));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":262 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":262 */
       __pyx_1 = (__pyx_v_temp_ptr == NULL);
       if (__pyx_1) {
         __pyx_1 = (__pyx_v_loop_counter != __pyx_v_self->ref_list_length);
@@ -715,10 +715,10 @@
         }
         /*else*/ {
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":270 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":270 */
           __pyx_v_ref_ptr = __pyx_v_last;
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":271 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":271 */
           __pyx_v_next_start = __pyx_v_last;
         }
         __pyx_L14:;
@@ -726,23 +726,23 @@
       }
       /*else*/ {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":274 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":274 */
         __pyx_v_ref_ptr = __pyx_v_temp_ptr;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":275 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":275 */
         __pyx_v_next_start = (__pyx_v_temp_ptr + 1);
       }
       __pyx_L13:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":277 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":277 */
       while (1) {
         __pyx_1 = (__pyx_v_self->_start < __pyx_v_ref_ptr);
         if (!__pyx_1) break;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":279 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":279 */
         __pyx_v_temp_ptr = ((char *)memchr(__pyx_v_self->_start,'\r',(__pyx_v_ref_ptr - __pyx_v_self->_start)));
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":281 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":281 */
         __pyx_1 = (__pyx_v_temp_ptr == NULL);
         if (__pyx_1) {
           __pyx_v_temp_ptr = __pyx_v_ref_ptr;
@@ -750,13 +750,13 @@
         }
         __pyx_L17:;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":285 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":285 */
         __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;}
         __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;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
       }
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":286 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":286 */
       __pyx_2 = PySequence_Tuple(__pyx_v_ref_list); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; goto __pyx_L1;}
       __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;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -766,18 +766,18 @@
       __pyx_v_ref_list = __pyx_2;
       __pyx_2 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":287 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":287 */
       Py_INCREF(__pyx_v_ref_list);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":288 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":288 */
       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;}
       StaticTuple_SET_ITEM(((StaticTuple *)__pyx_v_ref_lists),(__pyx_v_loop_counter - 1),__pyx_v_ref_list);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":290 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":290 */
       __pyx_v_self->_start = __pyx_v_next_start;
     }
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":291 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":291 */
     __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; goto __pyx_L1;}
     Py_INCREF(__pyx_v_value);
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_value);
@@ -792,7 +792,7 @@
   }
   /*else*/ {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":293 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":293 */
     __pyx_1 = (__pyx_v_last != __pyx_v_self->_start);
     if (__pyx_1) {
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
@@ -807,7 +807,7 @@
     }
     __pyx_L18:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":296 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":296 */
     __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;}
     __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; goto __pyx_L1;}
     Py_INCREF(__pyx_v_value);
@@ -822,7 +822,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":297 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":297 */
   __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 297; goto __pyx_L1;}
   Py_INCREF(__pyx_v_key);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_key);
@@ -833,7 +833,7 @@
   __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;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":298 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":298 */
   __pyx_r = 0;
   goto __pyx_L0;
 
@@ -866,7 +866,7 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":302 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":302 */
   __pyx_1 = (!PyString_CheckExact(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; goto __pyx_L1;}
@@ -881,24 +881,24 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":304 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":304 */
   __pyx_v_byte_count = PyString_Size(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->bytes);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":305 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":305 */
   __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;}
   ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->_cur_str = __pyx_4;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":307 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":307 */
   ((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);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":308 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":308 */
   while (1) {
     __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);
     if (!__pyx_1) break;
     __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;}
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":310 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":310 */
   Py_INCREF(((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys);
   __pyx_r = ((struct __pyx_obj_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser *)__pyx_v_self)->keys;
   goto __pyx_L0;
@@ -931,7 +931,7 @@
   Py_INCREF(__pyx_v_ref_list_length);
   __pyx_v_parser = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":314 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":314 */
   __pyx_1 = PyTuple_New(3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; goto __pyx_L1;}
   Py_INCREF(__pyx_v_bytes);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_bytes);
@@ -945,7 +945,7 @@
   __pyx_v_parser = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":315 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":315 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_parser, __pyx_n_parse); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;}
   __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1014,7 +1014,7 @@
   __pyx_v_val = Py_None; Py_INCREF(Py_None);
   __pyx_v_line = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":342 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":342 */
   __pyx_1 = (!PyTuple_CheckExact(__pyx_v_node));
   if (__pyx_1) {
     __pyx_1 = (!StaticTuple_CheckExact(__pyx_v_node));
@@ -1039,15 +1039,15 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":345 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":345 */
   __pyx_4 = PyObject_Length(__pyx_v_node); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
   __pyx_v_node_len = __pyx_4;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":346 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":346 */
   __pyx_1 = PyInt_AsLong(__pyx_v_reference_lists); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; goto __pyx_L1;}
   __pyx_v_have_reference_lists = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":347 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":347 */
   __pyx_1 = __pyx_v_have_reference_lists;
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_node_len != 4);
@@ -1087,7 +1087,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":364 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":364 */
   __pyx_3 = PyObject_GetAttr(__pyx_k16p, __pyx_n_join); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
   __pyx_2 = __Pyx_GetItemInt(__pyx_v_node, 1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; goto __pyx_L1;}
@@ -1100,31 +1100,31 @@
   __pyx_v_string_key = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":378 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":378 */
   __pyx_v_refs_len = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":379 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":379 */
   __pyx_1 = __pyx_v_have_reference_lists;
   if (__pyx_1) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":381 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":381 */
     __pyx_3 = __Pyx_GetItemInt(__pyx_v_node, 3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
     Py_DECREF(__pyx_v_ref_lists);
     __pyx_v_ref_lists = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":382 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":382 */
     __pyx_4 = PyObject_Length(__pyx_v_ref_lists); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; goto __pyx_L1;}
     __pyx_v_next_len = __pyx_4;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":383 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":383 */
     __pyx_1 = (__pyx_v_next_len > 0);
     if (__pyx_1) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":387 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":387 */
       __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":388 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":388 */
       __pyx_5 = PyObject_GetIter(__pyx_v_ref_lists); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;}
       for (;;) {
         __pyx_2 = PyIter_Next(__pyx_5);
@@ -1136,18 +1136,18 @@
         __pyx_v_ref_list = __pyx_2;
         __pyx_2 = 0;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":389 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":389 */
         __pyx_4 = PyObject_Length(__pyx_v_ref_list); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 389; goto __pyx_L1;}
         __pyx_v_next_len = __pyx_4;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":390 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":390 */
         __pyx_1 = (__pyx_v_next_len > 0);
         if (__pyx_1) {
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":393 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":393 */
           __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":394 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":394 */
           __pyx_3 = PyObject_GetIter(__pyx_v_ref_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; goto __pyx_L1;}
           for (;;) {
             __pyx_2 = PyIter_Next(__pyx_3);
@@ -1159,7 +1159,7 @@
             __pyx_v_reference = __pyx_2;
             __pyx_2 = 0;
 
-            /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":395 */
+            /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":395 */
             __pyx_1 = (!PyTuple_CheckExact(__pyx_v_reference));
             if (__pyx_1) {
               __pyx_1 = (!StaticTuple_CheckExact(__pyx_v_reference));
@@ -1184,18 +1184,18 @@
             }
             __pyx_L12:;
 
-            /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":400 */
+            /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":400 */
             __pyx_4 = PyObject_Length(__pyx_v_reference); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;}
             __pyx_v_next_len = __pyx_4;
 
-            /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":401 */
+            /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":401 */
             __pyx_1 = (__pyx_v_next_len > 0);
             if (__pyx_1) {
 
-              /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":404 */
+              /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":404 */
               __pyx_v_refs_len = (__pyx_v_refs_len + (__pyx_v_next_len - 1));
 
-              /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":405 */
+              /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":405 */
               __pyx_6 = PyObject_GetIter(__pyx_v_reference); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 405; goto __pyx_L1;}
               for (;;) {
                 __pyx_2 = PyIter_Next(__pyx_6);
@@ -1207,7 +1207,7 @@
                 __pyx_v_ref_bit = __pyx_2;
                 __pyx_2 = 0;
 
-                /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":406 */
+                /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":406 */
                 __pyx_1 = (!PyString_CheckExact(__pyx_v_ref_bit));
                 if (__pyx_1) {
                   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 409; goto __pyx_L1;}
@@ -1229,7 +1229,7 @@
                 }
                 __pyx_L16:;
 
-                /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":410 */
+                /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":410 */
                 __pyx_v_refs_len = (__pyx_v_refs_len + PyString_GET_SIZE(__pyx_v_ref_bit));
               }
               Py_DECREF(__pyx_6); __pyx_6 = 0;
@@ -1250,16 +1250,16 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":413 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":413 */
   __pyx_v_key_len = PyString_Size(__pyx_v_string_key);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":414 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":414 */
   __pyx_7 = __Pyx_GetItemInt(__pyx_v_node, 2); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 414; goto __pyx_L1;}
   Py_DECREF(__pyx_v_val);
   __pyx_v_val = __pyx_7;
   __pyx_7 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":415 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":415 */
   __pyx_1 = (!PyString_CheckExact(__pyx_v_val));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 417; goto __pyx_L1;}
@@ -1281,46 +1281,46 @@
   }
   __pyx_L17:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":418 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":418 */
   __pyx_v_value = PyString_AS_STRING(__pyx_v_val);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":419 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":419 */
   __pyx_v_value_len = PyString_GET_SIZE(__pyx_v_val);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":420 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":420 */
   __pyx_v_flat_len = (((((__pyx_v_key_len + 1) + __pyx_v_refs_len) + 1) + __pyx_v_value_len) + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":421 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":421 */
   __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_flat_len); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;}
   Py_DECREF(__pyx_v_line);
   __pyx_v_line = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":423 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":423 */
   __pyx_8 = PyString_AsString(__pyx_v_line); if (__pyx_8 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;}
   __pyx_v_out = __pyx_8;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":424 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":424 */
   __pyx_8 = PyString_AsString(__pyx_v_string_key); if (__pyx_8 == NULL) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; goto __pyx_L1;}
   memcpy(__pyx_v_out,__pyx_8,__pyx_v_key_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":425 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":425 */
   __pyx_v_out = (__pyx_v_out + __pyx_v_key_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":426 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":426 */
   (__pyx_v_out[0]) = '\0';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":427 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":427 */
   __pyx_v_out = (__pyx_v_out + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":428 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":428 */
   __pyx_1 = (__pyx_v_refs_len > 0);
   if (__pyx_1) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":429 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":429 */
     __pyx_v_first_ref_list = 1;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":430 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":430 */
     __pyx_6 = PyObject_GetIter(__pyx_v_ref_lists); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;}
     for (;;) {
       __pyx_3 = PyIter_Next(__pyx_6);
@@ -1332,26 +1332,26 @@
       __pyx_v_ref_list = __pyx_3;
       __pyx_3 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":431 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":431 */
       __pyx_1 = (__pyx_v_first_ref_list == 0);
       if (__pyx_1) {
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":432 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":432 */
         (__pyx_v_out[0]) = '\t';
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":433 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":433 */
         __pyx_v_out = (__pyx_v_out + 1);
         goto __pyx_L21;
       }
       __pyx_L21:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":434 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":434 */
       __pyx_v_first_ref_list = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":435 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":435 */
       __pyx_v_first_reference = 1;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":436 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":436 */
       __pyx_5 = PyObject_GetIter(__pyx_v_ref_list); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; goto __pyx_L1;}
       for (;;) {
         __pyx_7 = PyIter_Next(__pyx_5);
@@ -1363,55 +1363,55 @@
         __pyx_v_reference = __pyx_7;
         __pyx_7 = 0;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":437 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":437 */
         __pyx_1 = (__pyx_v_first_reference == 0);
         if (__pyx_1) {
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":438 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":438 */
           (__pyx_v_out[0]) = '\r';
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":439 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":439 */
           __pyx_v_out = (__pyx_v_out + 1);
           goto __pyx_L24;
         }
         __pyx_L24:;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":440 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":440 */
         __pyx_v_first_reference = 0;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":441 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":441 */
         __pyx_4 = PyObject_Length(__pyx_v_reference); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;}
         __pyx_v_next_len = __pyx_4;
 
-        /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":442 */
+        /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":442 */
         for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_next_len; ++__pyx_v_i) {
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":443 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":443 */
           __pyx_1 = (__pyx_v_i != 0);
           if (__pyx_1) {
 
-            /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":444 */
+            /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":444 */
             (__pyx_v_out[0]) = '\x000';
 
-            /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":445 */
+            /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":445 */
             __pyx_v_out = (__pyx_v_out + 1);
             goto __pyx_L27;
           }
           __pyx_L27:;
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":446 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":446 */
           __pyx_2 = __Pyx_GetItemInt(__pyx_v_reference, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; goto __pyx_L1;}
           Py_DECREF(__pyx_v_ref_bit);
           __pyx_v_ref_bit = __pyx_2;
           __pyx_2 = 0;
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":447 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":447 */
           __pyx_v_ref_bit_len = PyString_GET_SIZE(__pyx_v_ref_bit);
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":448 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":448 */
           memcpy(__pyx_v_out,PyString_AS_STRING(__pyx_v_ref_bit),__pyx_v_ref_bit_len);
 
-          /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":449 */
+          /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":449 */
           __pyx_v_out = (__pyx_v_out + __pyx_v_ref_bit_len);
         }
       }
@@ -1422,22 +1422,22 @@
   }
   __pyx_L18:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":450 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":450 */
   (__pyx_v_out[0]) = '\0';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":451 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":451 */
   __pyx_v_out = (__pyx_v_out + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":452 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":452 */
   memcpy(__pyx_v_out,__pyx_v_value,__pyx_v_value_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":453 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":453 */
   __pyx_v_out = (__pyx_v_out + __pyx_v_value_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":454 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":454 */
   (__pyx_v_out[0]) = '\n';
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":455 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":455 */
   __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; goto __pyx_L1;}
   Py_INCREF(__pyx_v_string_key);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_string_key);
@@ -1668,7 +1668,7 @@
   __pyx_ptype_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser = &__pyx_type_6bzrlib_21_btree_serializer_pyx_BTreeLeafParser;
   __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;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":106 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":106 */
   __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
   Py_INCREF(__pyx_n__static_tuple_c);
   PyList_SET_ITEM(__pyx_1, 0, __pyx_n__static_tuple_c);
@@ -1679,10 +1679,10 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":108 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":108 */
   __pyx_3 = import_static_tuple_c(); if (__pyx_3 == (-1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_btree_serializer_pyx.pyx":318 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_btree_serializer_pyx.pyx":318 */
   return;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);

=== modified file 'bzrlib/_chk_map_pyx.c'
--- bzrlib/_chk_map_pyx.c	2010-08-07 00:54:52 +0000
+++ bzrlib/_chk_map_pyx.c	2011-09-27 11:59:19 +0000
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.5 on Fri Aug  6 14:30:42 2010 */
+/* Generated by Pyrex 0.9.8.5 on Wed Oct  6 23:21:10 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -232,18 +232,18 @@
   void *__pyx_r;
   int __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":76 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":76 */
   __pyx_v_start = ((char *)__pyx_v_s);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":77 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":77 */
   __pyx_v_pos = ((__pyx_v_start + __pyx_v_n) - 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":78 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":78 */
   while (1) {
     __pyx_1 = (__pyx_v_pos >= __pyx_v_start);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":79 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":79 */
     __pyx_1 = ((__pyx_v_pos[0]) == __pyx_v_c);
     if (__pyx_1) {
       __pyx_r = __pyx_v_pos;
@@ -252,11 +252,11 @@
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":81 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":81 */
     __pyx_v_pos = (__pyx_v_pos - 1);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":82 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":82 */
   __pyx_r = NULL;
   goto __pyx_L0;
 
@@ -275,7 +275,7 @@
   PyObject *__pyx_4 = 0;
   __pyx_v_result = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":87 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":87 */
   __pyx_1 = (__pyx_v_size < 0);
   if (__pyx_1) {
     __pyx_2 = PyInt_FromSsize_t(__pyx_v_size); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;}
@@ -299,21 +299,21 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":91 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":91 */
   __pyx_v_py_str = PyString_FromStringAndSize(__pyx_v_s,__pyx_v_size);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":92 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":92 */
   PyString_InternInPlace((&__pyx_v_py_str));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":93 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":93 */
   Py_INCREF(((PyObject *)__pyx_v_py_str));
   Py_DECREF(__pyx_v_result);
   __pyx_v_result = ((PyObject *)__pyx_v_py_str);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":96 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":96 */
   Py_DECREF(__pyx_v_py_str);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":97 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":97 */
   Py_INCREF(__pyx_v_result);
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
@@ -351,39 +351,39 @@
   Py_INCREF(__pyx_v_key);
   __pyx_v_out = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":109 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":109 */
   __pyx_1 = PyObject_Length(__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
   __pyx_v_num_bits = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":111 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":111 */
   __pyx_v_num_out_bytes = ((9 * __pyx_v_num_bits) - 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":112 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":112 */
   __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_num_out_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; goto __pyx_L1;}
   Py_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":113 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":113 */
   __pyx_v_c_out = PyString_AS_STRING(__pyx_v_out);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":114 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":114 */
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_bits; ++__pyx_v_i) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":115 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":115 */
     __pyx_3 = (__pyx_v_i > 0);
     if (__pyx_3) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":116 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":116 */
       (__pyx_v_c_out[0]) = '\x000';
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":117 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":117 */
       __pyx_v_c_out = (__pyx_v_c_out + 1);
       goto __pyx_L4;
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":118 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":118 */
     __pyx_2 = __Pyx_GetItemInt(__pyx_v_key, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
@@ -393,14 +393,14 @@
     __pyx_v_crc_val = PyInt_AS_LONG(__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":120 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":120 */
     sprintf(__pyx_v_c_out,__pyx_k2,__pyx_v_crc_val);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":121 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":121 */
     __pyx_v_c_out = (__pyx_v_c_out + 8);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":122 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":122 */
   Py_INCREF(__pyx_v_out);
   __pyx_r = __pyx_v_out;
   goto __pyx_L0;
@@ -439,39 +439,39 @@
   Py_INCREF(__pyx_v_key);
   __pyx_v_out = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":134 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":134 */
   __pyx_1 = PyObject_Length(__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; goto __pyx_L1;}
   __pyx_v_num_bits = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":136 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":136 */
   __pyx_v_num_out_bytes = ((5 * __pyx_v_num_bits) - 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":137 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":137 */
   __pyx_2 = PyString_FromStringAndSize(NULL,__pyx_v_num_out_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;}
   Py_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":138 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":138 */
   __pyx_v_c_out = PyString_AS_STRING(__pyx_v_out);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":139 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":139 */
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_bits; ++__pyx_v_i) {
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":140 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":140 */
     __pyx_3 = (__pyx_v_i > 0);
     if (__pyx_3) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":141 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":141 */
       (__pyx_v_c_out[0]) = '\x000';
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":142 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":142 */
       __pyx_v_c_out = (__pyx_v_c_out + 1);
       goto __pyx_L4;
     }
     __pyx_L4:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":143 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":143 */
     __pyx_2 = __Pyx_GetItemInt(__pyx_v_key, __pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
@@ -481,19 +481,19 @@
     __pyx_v_crc_val = PyInt_AS_LONG(__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":145 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":145 */
     (__pyx_v_c_out[0]) = ((__pyx_v_crc_val >> 24) & 0xFF);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":146 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":146 */
     (__pyx_v_c_out[1]) = ((__pyx_v_crc_val >> 16) & 0xFF);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":147 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":147 */
     (__pyx_v_c_out[2]) = ((__pyx_v_crc_val >> 8) & 0xFF);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":148 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":148 */
     (__pyx_v_c_out[3]) = ((__pyx_v_crc_val >> 0) & 0xFF);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":149 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":149 */
     for (__pyx_v_j = 0; __pyx_v_j < 4; ++__pyx_v_j) {
       __pyx_3 = ((__pyx_v_c_out[__pyx_v_j]) == '\n');
       if (__pyx_3) {
@@ -503,11 +503,11 @@
       __pyx_L7:;
     }
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":152 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":152 */
     __pyx_v_c_out = (__pyx_v_c_out + 4);
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":153 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":153 */
   Py_INCREF(__pyx_v_out);
   __pyx_r = __pyx_v_out;
   goto __pyx_L0;
@@ -534,10 +534,10 @@
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":167 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":167 */
   __pyx_v_next_line = ((char *)memchr((__pyx_v_cur[0]),'\n',(__pyx_v_end - (__pyx_v_cur[0]))));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":168 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":168 */
   __pyx_1 = (__pyx_v_next_line == NULL);
   if (__pyx_1) {
     __pyx_2 = PyString_FromString(__pyx_v_message); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; goto __pyx_L1;}
@@ -555,10 +555,10 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":171 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":171 */
   __pyx_v_value = strtol((__pyx_v_cur[0]),(&__pyx_v_next),10);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":172 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":172 */
   __pyx_1 = (__pyx_v_next != __pyx_v_next_line);
   if (__pyx_1) {
     __pyx_2 = PyString_FromString(__pyx_v_message); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
@@ -576,10 +576,10 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":174 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":174 */
   (__pyx_v_cur[0]) = (__pyx_v_next_line + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":175 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":175 */
   __pyx_r = __pyx_v_value;
   goto __pyx_L0;
 
@@ -601,7 +601,7 @@
   PyObject *__pyx_2 = 0;
   __pyx_v_chk_map = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":182 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":182 */
   __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
   Py_INCREF(__pyx_n_chk_map);
   PyList_SET_ITEM(__pyx_1, 0, __pyx_n_chk_map);
@@ -613,19 +613,19 @@
   __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":183 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":183 */
   __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;}
   Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__LeafNode);
   __pyx_v_6bzrlib_12_chk_map_pyx__LeafNode = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":184 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":184 */
   __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;}
   Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__InternalNode);
   __pyx_v_6bzrlib_12_chk_map_pyx__InternalNode = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":185 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":185 */
   __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;}
   Py_DECREF(__pyx_v_6bzrlib_12_chk_map_pyx__unknown);
   __pyx_v_6bzrlib_12_chk_map_pyx__unknown = __pyx_2;
@@ -696,7 +696,7 @@
   __pyx_v_entry = Py_None; Py_INCREF(Py_None);
   __pyx_v_value = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":204 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":204 */
   __pyx_1 = __pyx_v_6bzrlib_12_chk_map_pyx__LeafNode == Py_None;
   if (__pyx_1) {
     __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;}
@@ -705,7 +705,7 @@
   }
   __pyx_L2:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":207 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":207 */
   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
   __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 207; goto __pyx_L1;}
   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;}
@@ -716,7 +716,7 @@
   __pyx_v_result = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":210 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":210 */
   __pyx_1 = (!PyString_CheckExact(__pyx_v_bytes));
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;}
@@ -741,13 +741,13 @@
   }
   __pyx_L3:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":213 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":213 */
   __pyx_v_c_bytes = PyString_AS_STRING(__pyx_v_bytes);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":214 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":214 */
   __pyx_v_c_bytes_len = PyString_GET_SIZE(__pyx_v_bytes);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":216 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":216 */
   __pyx_1 = (__pyx_v_c_bytes_len < 9);
   if (!__pyx_1) {
     __pyx_1 = (memcmp(__pyx_v_c_bytes,__pyx_k12,9) != 0);
@@ -766,7 +766,7 @@
   }
   __pyx_L4:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":218 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":218 */
   __pyx_1 = ((__pyx_v_c_bytes[(__pyx_v_c_bytes_len - 1)]) != '\n');
   if (__pyx_1) {
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
@@ -781,28 +781,28 @@
   }
   __pyx_L5:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":221 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":221 */
   __pyx_v_end = (__pyx_v_c_bytes + __pyx_v_c_bytes_len);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":222 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":222 */
   __pyx_v_cur = (__pyx_v_c_bytes + 9);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":223 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":223 */
   __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;}
   __pyx_v_maximum_size = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":224 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":224 */
   __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;}
   __pyx_v_width = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":225 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":225 */
   __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;}
   __pyx_v_length = __pyx_1;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":227 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":227 */
   __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":228 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":228 */
   __pyx_1 = (__pyx_v_next_line == NULL);
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
@@ -817,39 +817,39 @@
   }
   __pyx_L6:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":230 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":230 */
   __pyx_v_prefix = __pyx_v_cur;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":231 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":231 */
   __pyx_v_prefix_length = (__pyx_v_next_line - __pyx_v_cur);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":232 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":232 */
   __pyx_v_cur = (__pyx_v_next_line + 1);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":234 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":234 */
   __pyx_3 = PyList_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; goto __pyx_L1;}
   Py_DECREF(__pyx_v_prefix_bits);
   __pyx_v_prefix_bits = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":235 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":235 */
   __pyx_v_prefix_tail = __pyx_v_prefix;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":236 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":236 */
   __pyx_v_num_prefix_bits = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":237 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":237 */
   __pyx_v_next_null = ((char *)memchr(__pyx_v_prefix,'\0',__pyx_v_prefix_length));
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":238 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":238 */
   while (1) {
     __pyx_1 = (__pyx_v_next_null != NULL);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":239 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":239 */
     __pyx_v_num_prefix_bits = (__pyx_v_num_prefix_bits + 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":240 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":240 */
     __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;}
     __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;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;}
@@ -860,17 +860,17 @@
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":242 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":242 */
     __pyx_v_prefix_tail = (__pyx_v_next_null + 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":243 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":243 */
     __pyx_v_next_null = ((char *)memchr(__pyx_v_prefix_tail,'\0',(__pyx_v_next_line - __pyx_v_prefix_tail)));
   }
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":244 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":244 */
   __pyx_v_prefix_tail_len = (__pyx_v_next_line - __pyx_v_prefix_tail);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":246 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":246 */
   __pyx_1 = (__pyx_v_num_prefix_bits >= __pyx_v_width);
   if (__pyx_1) {
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;}
@@ -885,27 +885,27 @@
   }
   __pyx_L9:;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":249 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":249 */
   __pyx_v_items_length = (__pyx_v_end - __pyx_v_cur);
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":250 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":250 */
   __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;}
   Py_DECREF(__pyx_v_items);
   __pyx_v_items = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":251 */
+  /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":251 */
   while (1) {
     __pyx_1 = (__pyx_v_cur < __pyx_v_end);
     if (!__pyx_1) break;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":252 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":252 */
     __pyx_v_line_start = __pyx_v_cur;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":253 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":253 */
     __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":254 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":254 */
     __pyx_1 = (__pyx_v_next_line == NULL);
     if (__pyx_1) {
       __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
@@ -920,10 +920,10 @@
     }
     __pyx_L12:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":256 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":256 */
     __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)));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":257 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":257 */
     __pyx_1 = (__pyx_v_last_null == NULL);
     if (__pyx_1) {
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 258; goto __pyx_L1;}
@@ -938,26 +938,26 @@
     }
     __pyx_L13:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":259 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":259 */
     __pyx_v_next_null = (__pyx_v_last_null + 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":260 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":260 */
     __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;}
     __pyx_v_num_value_lines = __pyx_1;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":262 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":262 */
     __pyx_v_cur = (__pyx_v_next_line + 1);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":263 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":263 */
     __pyx_v_value_start = __pyx_v_cur;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":265 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":265 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_value_lines; ++__pyx_v_i) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":266 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":266 */
       __pyx_v_next_line = ((char *)memchr(__pyx_v_cur,'\n',(__pyx_v_end - __pyx_v_cur)));
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":267 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":267 */
       __pyx_1 = (__pyx_v_next_line == NULL);
       if (__pyx_1) {
         __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; goto __pyx_L1;}
@@ -972,45 +972,45 @@
       }
       __pyx_L16:;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":269 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":269 */
       __pyx_v_cur = (__pyx_v_next_line + 1);
     }
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":270 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":270 */
     __pyx_4 = ((PyObject *)StaticTuple_New(__pyx_v_width)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; goto __pyx_L1;}
     Py_DECREF(((PyObject *)__pyx_v_entry_bits));
     __pyx_v_entry_bits = ((StaticTuple *)__pyx_4);
     __pyx_4 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":271 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":271 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_num_prefix_bits; ++__pyx_v_i) {
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":274 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":274 */
       __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;}
       Py_DECREF(__pyx_v_entry);
       __pyx_v_entry = __pyx_3;
       __pyx_3 = 0;
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":276 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":276 */
       Py_INCREF(__pyx_v_entry);
 
-      /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":277 */
+      /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":277 */
       StaticTuple_SET_ITEM(__pyx_v_entry_bits,__pyx_v_i,__pyx_v_entry);
     }
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":278 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":278 */
     __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;}
     Py_DECREF(__pyx_v_value);
     __pyx_v_value = __pyx_2;
     __pyx_2 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":281 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":281 */
     __pyx_v_entry_start = __pyx_v_line_start;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":282 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":282 */
     __pyx_v_next_null = ((char *)memchr(__pyx_v_entry_start,'\0',((__pyx_v_last_null - __pyx_v_entry_start) + 1)));
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":284 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":284 */
     __pyx_1 = (__pyx_v_next_null == NULL);
     if (__pyx_1) {
       __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; goto __pyx_L1;}
@@ -1025,16 +1025,16 @@
     }
     __pyx_L19:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":286 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":286 */
     __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;}
     Py_DECREF(__pyx_v_entry);
     __pyx_v_entry = __pyx_2;
     __pyx_2 = 0;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":288 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":288 */
     __pyx_v_c_entry = PyString_AS_STRING(__pyx_v_entry);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":289 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":289 */
     __pyx_1 = (__pyx_v_prefix_tail_len > 0);
     if (__pyx_1) {
       memcpy(__pyx_v_c_entry,__pyx_v_prefix_tail,__pyx_v_prefix_tail_len);
@@ -1042,7 +1042,7 @@
     }
     __pyx_L20:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":291 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":291 */
     __pyx_1 = ((__pyx_v_next_null - __pyx_v_line_start) > 0);
     if (__pyx_1) {
       memcpy((__pyx_v_c_entry + __pyx_v_prefix_tail_len),__pyx_v_line_start,(__pyx_v_next_null - __pyx_v_line_start));
@@ -1050,24 +1050,24 @@
     }
     __pyx_L21:;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":293 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":293 */
     Py_INCREF(__pyx_v_entry);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":294 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":294 */
     __pyx_v_i = __pyx_v_num_prefix_bits;
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":295 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":295 */
     StaticTuple_SET_ITEM(__pyx_v_entry_bits,__pyx_v_i,__pyx_v_entry);
 
-    /* "/home/jameinel/dev/bzr/work/bzrlib/_chk_map_pyx.pyx":296 */
+    /* "/home/vila/src/bzr/integration/2.2.2-dev/bzrlib/_chk_map_pyx.pyx":296 */
     while (1) {
       __pyx_1 = (__pyx_v_next_null != __pyx_v_last_null);
       if (!__pyx_1) break;