← 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: Martin Pool
  • Date: 2010-01-12 06:30:41 UTC
  • mfrom: (4634.119.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4951.
  • Revision ID: mbp@sourcefrog.net-20100112063041-qp2ei0clx5gh0e9e
merge 2.0 back to trunk

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
705
705
                self._remove_pack_from_memory(pack)
706
706
        # record the newly available packs and stop advertising the old
707
707
        # packs
708
 
        to_be_obsoleted = []
709
 
        for _, packs in pack_operations:
710
 
            to_be_obsoleted.extend(packs)
711
 
        result = self._save_pack_names(clear_obsolete_packs=True,
712
 
                                       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)
713
712
        return result
714
713
 
715
714