← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 11:13:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6144.
  • Revision ID: jriddell@canonical.com-20110916111347-fyjk426bkl0jrbfu
gettext() show_warning usage

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
70
70
    )
71
71
 
72
72
from bzrlib.trace import (
73
 
    mutter,
 
73
    mutter
74
74
    )
75
75
 
76
76
 
419
419
                return None, False, None
420
420
        # XXX: Friction: parent_candidates should return a list not a dict
421
421
        #      so that we don't have to walk the inventories again.
422
 
        parent_candiate_entries = ie.parent_candidates(parent_invs)
423
 
        head_set = self._heads(ie.file_id, parent_candiate_entries.keys())
 
422
        parent_candidate_entries = ie.parent_candidates(parent_invs)
 
423
        head_set = self._heads(ie.file_id, parent_candidate_entries.keys())
424
424
        heads = []
425
425
        for inv in parent_invs:
426
426
            if inv.has_id(ie.file_id):
441
441
            store = True
442
442
        if not store:
443
443
            # There is a single head, look it up for comparison
444
 
            parent_entry = parent_candiate_entries[heads[0]]
 
444
            parent_entry = parent_candidate_entries[heads[0]]
445
445
            # if the non-content specific data has changed, we'll be writing a
446
446
            # node:
447
447
            if (parent_entry.parent_id != ie.parent_id or
559
559
        :param iter_changes: An iter_changes iterator with the changes to apply
560
560
            to basis_revision_id. The iterator must not include any items with
561
561
            a current kind of None - missing items must be either filtered out
562
 
            or errored-on beefore record_iter_changes sees the item.
 
562
            or errored-on before record_iter_changes sees the item.
563
563
        :param _entry_factory: Private method to bind entry_factory locally for
564
564
            performance.
565
565
        :return: A generator of (file_id, relpath, fs_hash) tuples for use with
918
918
        """
919
919
        if not self._format.supports_external_lookups:
920
920
            raise errors.UnstackableRepositoryFormat(self._format, self.base)
 
921
        # This can raise an exception, so should be done before we lock the
 
922
        # fallback repository.
 
923
        self._check_fallback_repository(repository)
921
924
        if self.is_locked():
922
925
            # This repository will call fallback.unlock() when we transition to
923
926
            # the unlocked state, so we make sure to increment the lock count
924
927
            repository.lock_read()
925
 
        self._check_fallback_repository(repository)
926
928
        self._fallback_repositories.append(repository)
927
929
        self.texts.add_fallback_versioned_files(repository.texts)
928
930
        self.inventories.add_fallback_versioned_files(repository.inventories)