← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-22 12:52:39 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622125239-kabo9smxt9c3vnir
Use a consistent scheme for naming pyrex source files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
 
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib.util import bencode
 
31
from bzrlib import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34
 
35
35
 
 
36
def topo_iter_keys(vf, keys=None):
 
37
    if keys is None:
 
38
        keys = vf.keys()
 
39
    parents = vf.get_parent_map(keys)
 
40
    return _topo_iter(parents, keys)
 
41
 
36
42
def topo_iter(vf, versions=None):
37
 
    seen = set()
38
 
    descendants = {}
39
43
    if versions is None:
40
44
        versions = vf.versions()
41
45
    parents = vf.get_parent_map(versions)
 
46
    return _topo_iter(parents, versions)
 
47
 
 
48
def _topo_iter(parents, versions):
 
49
    seen = set()
 
50
    descendants = {}
42
51
    def pending_parents(version):
 
52
        if parents[version] is None:
 
53
            return []
43
54
        return [v for v in parents[version] if v in versions and
44
55
                v not in seen]
45
56
    for version_id in versions:
 
57
        if parents[version_id] is None:
 
58
            # parentless
 
59
            continue
46
60
        for parent_id in parents[version_id]:
47
61
            descendants.setdefault(parent_id, []).append(version_id)
48
62
    cur = [v for v in versions if len(pending_parents(v)) == 0]
276
290
            ' %(num_lines)r)' % self.__dict__
277
291
 
278
292
    def __eq__(self, other):
279
 
        if self.__class__ != other.__class__:
 
293
        if self.__class__ is not other.__class__:
280
294
            return False
281
295
        return (self.__dict__ == other.__dict__)
282
296
 
302
316
        return version in self._parents
303
317
 
304
318
    def do_snapshot(self, version_id, parent_ids):
305
 
        """Determine whether to perform a a snapshot for this version"""
 
319
        """Determine whether to perform a snapshot for this version"""
306
320
        if self.snapshot_interval is None:
307
321
            return False
308
322
        if self.max_snapshots is not None and\