← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1344
1344
        return result
1345
1345
 
1346
1346
    @needs_read_lock
1347
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1347
    def search_missing_revision_ids(self, other,
 
1348
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1349
            find_ghosts=True, revision_ids=None):
1348
1350
        """Return the revision ids that other has that this does not.
1349
1351
 
1350
1352
        These are returned in topological order.
1351
1353
 
1352
1354
        revision_id: only return revision ids included by revision_id.
1353
1355
        """
1354
 
        return repository.InterRepository.get(
1355
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1356
        if symbol_versioning.deprecated_passed(revision_id):
 
1357
            symbol_versioning.warn(
 
1358
                'search_missing_revision_ids(revision_id=...) was '
 
1359
                'deprecated in 2.3.  Use revision_ids=[...] instead.',
 
1360
                DeprecationWarning, stacklevel=2)
 
1361
            if revision_ids is not None:
 
1362
                raise AssertionError(
 
1363
                    'revision_ids is mutually exclusive with revision_id')
 
1364
            if revision_id is not None:
 
1365
                revision_ids = [revision_id]
 
1366
        inter_repo = repository.InterRepository.get(other, self)
 
1367
        return inter_repo.search_missing_revision_ids(
 
1368
            find_ghosts=find_ghosts, revision_ids=revision_ids)
1356
1369
 
1357
1370
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1358
1371
            fetch_spec=None):