← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
29
29
    knit,
30
30
    osutils,
31
31
    pack,
32
 
    remote,
33
32
    revision as _mod_revision,
34
33
    trace,
35
34
    ui,
882
881
            if basis_tree is not None:
883
882
                basis_tree.unlock()
884
883
 
885
 
    def deserialise_inventory(self, revision_id, bytes):
 
884
    def _deserialise_inventory(self, revision_id, bytes):
886
885
        return inventory.CHKInventory.deserialise(self.chk_bytes, bytes,
887
886
            (revision_id,))
888
887
 
904
903
    def _iter_inventory_xmls(self, revision_ids, ordering):
905
904
        # Without a native 'xml' inventory, this method doesn't make sense.
906
905
        # However older working trees, and older bundles want it - so we supply
907
 
        # it allowing get_inventory_xml to work. Bundles currently use the
 
906
        # it allowing _get_inventory_xml to work. Bundles currently use the
908
907
        # serializer directly; this also isn't ideal, but there isn't an xml
909
908
        # iteration interface offered at all for repositories. We could make
910
909
        # _iter_inventory_xmls be part of the contract, even if kept private.