/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: Robert Collins
  • Date: 2010-05-20 02:57:52 UTC
  • mfrom: (4797.43.11 2.1)
  • mto: This revision was merged to the branch mainline in revision 5243.
  • Revision ID: robertc@robertcollins.net-20100520025752-dbfi4kx7y4ivtiff
Merge up from 2.0/2.1:

* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
  (John Arbash Meinel, #582656)

* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
  support of bzr-externals and scmproj plugins.
  (Alexander Belchenko, bug #572098)

* 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)

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,