/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Martin Pool
  • Date: 2011-02-09 08:03:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5663.
  • Revision ID: mbp@sourcefrog.net-20110209080335-0gczvdsr6bzpwho8
Rename _fallback_vfs to _immediate_fallbacks

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
2
 
#
3
 
# Authors:
4
 
#   Johan Rydberg <jrydberg@gnu.org>
 
1
# Copyright (C) 2006-2011 Canonical Ltd
5
2
#
6
3
# This program is free software; you can redistribute it and/or modify
7
4
# it under the terms of the GNU General Public License as published by
930
927
 
931
928
    The use of tuples allows a single code base to support several different
932
929
    uses with only the mapping logic changing from instance to instance.
 
930
 
 
931
    :ivar _immediate_fallbacks: For subclasses that support stacking,
 
932
        this is a list of other VersionedFiles immediately underneath this
 
933
        one.  They may in turn each have further fallbacks.
933
934
    """
934
935
 
935
936
    def add_lines(self, key, parents, lines, parent_texts=None,
1201
1202
        at open time because they may change after the objects are opened.
1202
1203
        """
1203
1204
        all_fallbacks = []
1204
 
        for a_vfs in self._fallback_vfs:
 
1205
        for a_vfs in self._immediate_fallbacks:
1205
1206
            all_fallbacks.append(a_vfs)
1206
1207
            all_fallbacks.extend(a_vfs._transitive_fallbacks())
1207
1208
        return all_fallbacks