← 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: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

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