← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-17 15:07:39 UTC
  • mfrom: (4634.119.9 2.0)
  • mto: This revision was merged to the branch mainline in revision 4968.
  • Revision ID: john@arbash-meinel.com-20100117150739-h1tgxg82726yupxw
Merge bzr.stable, including the fix for bug #507566

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
1991
1991
        if first_read:
1992
1992
            return True
1993
1993
        # out the new value.
1994
 
        disk_nodes, _, _ = self._diff_pack_names()
1995
 
        self._packs_at_load = disk_nodes
 
1994
        disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
 
1995
        # _packs_at_load is meant to be the explicit list of names in
 
1996
        # 'pack-names' at then start. As such, it should not contain any
 
1997
        # pending names that haven't been written out yet.
 
1998
        pack_names_nodes = disk_nodes.difference(new_nodes)
 
1999
        pack_names_nodes.update(deleted_nodes)
 
2000
        self._packs_at_load = pack_names_nodes
1996
2001
        (removed, added,
1997
2002
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1998
2003
        if removed or added or modified: