/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/chk_map.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-06-15 04:32:49 UTC
  • mfrom: (5254.2.5 534787-pull-lp-in-config)
  • Revision ID: pqm@pqm.ubuntu.com-20100615043249-b5xx4yeyfyfbfyav
(spiv) Fix 'bzr pull' when lp: URL explicitly defined in
        locations.conf or branch.conf. (Gordon Tyler, #534787)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_map.py
1727
1727
 
1728
1728
try:
1729
1729
    from bzrlib._chk_map_pyx import (
 
1730
        _bytes_to_text_key,
1730
1731
        _search_key_16,
1731
1732
        _search_key_255,
1732
1733
        _deserialise_leaf_node,
1735
1736
except ImportError, e:
1736
1737
    osutils.failed_to_load_extension(e)
1737
1738
    from bzrlib._chk_map_py import (
 
1739
        _bytes_to_text_key,
1738
1740
        _search_key_16,
1739
1741
        _search_key_255,
1740
1742
        _deserialise_leaf_node,