← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
21
21
import itertools
22
22
 
23
23
from bzrlib import (
24
 
    bzrdir,
 
24
    controldir,
25
25
    errors,
26
26
    knit as _mod_knit,
27
27
    lockable_files,
405
405
        return xml7.serializer_v7
406
406
 
407
407
    def _get_matching_bzrdir(self):
408
 
        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
408
        return controldir.format_registry.make_bzrdir('dirstate-with-subtree')
409
409
 
410
410
    def _ignore_setting_bzrdir(self, format):
411
411
        pass
447
447
        return xml6.serializer_v6
448
448
 
449
449
    def _get_matching_bzrdir(self):
450
 
        return bzrdir.format_registry.make_bzrdir('rich-root')
 
450
        return controldir.format_registry.make_bzrdir('rich-root')
451
451
 
452
452
    def _ignore_setting_bzrdir(self, format):
453
453
        pass
488
488
 
489
489
    @needs_read_lock
490
490
    def search_missing_revision_ids(self,
491
 
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
492
491
            find_ghosts=True, revision_ids=None, if_present_ids=None,
493
492
            limit=None):
494
493
        """See InterRepository.search_missing_revision_ids()."""
495
 
        if symbol_versioning.deprecated_passed(revision_id):
496
 
            symbol_versioning.warn(
497
 
                'search_missing_revision_ids(revision_id=...) was '
498
 
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
499
 
                DeprecationWarning, stacklevel=2)
500
 
            if revision_ids is not None:
501
 
                raise AssertionError(
502
 
                    'revision_ids is mutually exclusive with revision_id')
503
 
            if revision_id is not None:
504
 
                revision_ids = [revision_id]
505
 
        del revision_id
506
494
        source_ids_set = self._present_source_revisions_for(
507
495
            revision_ids, if_present_ids)
508
496
        # source_ids is the worst possible case we may need to pull.