~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-09 18:17:10 UTC
  • mfrom: (5655.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110209181710-h55d74ahkew1tkhl
(vila) Merge 2.3 into trunk including fix for bug #715000 (Vincent
        Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1193
1193
    def _extract_blocks(self, version_id, source, target):
1194
1194
        return None
1195
1195
 
 
1196
    def _transitive_fallbacks(self):
 
1197
        """Return the whole stack of fallback versionedfiles.
 
1198
 
 
1199
        This VersionedFiles may have a list of fallbacks, but it doesn't
 
1200
        necessarily know about the whole stack going down, and it can't know
 
1201
        at open time because they may change after the objects are opened.
 
1202
        """
 
1203
        all_fallbacks = []
 
1204
        for a_vfs in self._fallback_vfs:
 
1205
            all_fallbacks.append(a_vfs)
 
1206
            all_fallbacks.extend(a_vfs._transitive_fallbacks())
 
1207
        return all_fallbacks
 
1208
 
1196
1209
 
1197
1210
class ThunkedVersionedFiles(VersionedFiles):
1198
1211
    """Storage for many versioned files thunked onto a 'VersionedFile' class.