← 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: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
    knit,
30
30
    osutils,
31
31
    pack,
 
32
    remote,
32
33
    revision as _mod_revision,
33
34
    trace,
34
35
    ui,
704
705
                self._remove_pack_from_memory(pack)
705
706
        # record the newly available packs and stop advertising the old
706
707
        # packs
707
 
        to_be_obsoleted = []
708
 
        for _, packs in pack_operations:
709
 
            to_be_obsoleted.extend(packs)
710
 
        result = self._save_pack_names(clear_obsolete_packs=True,
711
 
                                       obsolete_packs=to_be_obsoleted)
 
708
        result = self._save_pack_names(clear_obsolete_packs=True)
 
709
        # Move the old packs out of the way now they are no longer referenced.
 
710
        for revision_count, packs in pack_operations:
 
711
            self._obsolete_packs(packs)
712
712
        return result
713
713
 
714
714
 
881
881
            if basis_tree is not None:
882
882
                basis_tree.unlock()
883
883
 
884
 
    def _deserialise_inventory(self, revision_id, bytes):
 
884
    def deserialise_inventory(self, revision_id, bytes):
885
885
        return inventory.CHKInventory.deserialise(self.chk_bytes, bytes,
886
886
            (revision_id,))
887
887
 
903
903
    def _iter_inventory_xmls(self, revision_ids, ordering):
904
904
        # Without a native 'xml' inventory, this method doesn't make sense.
905
905
        # However older working trees, and older bundles want it - so we supply
906
 
        # it allowing _get_inventory_xml to work. Bundles currently use the
 
906
        # it allowing get_inventory_xml to work. Bundles currently use the
907
907
        # serializer directly; this also isn't ideal, but there isn't an xml
908
908
        # iteration interface offered at all for repositories. We could make
909
909
        # _iter_inventory_xmls be part of the contract, even if kept private.