← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Robert Collins
  • Date: 2006-04-26 05:26:38 UTC
  • mto: (1686.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1687.
  • Revision ID: robertc@robertcollins.net-20060426052638-e95d815562fc6caa
Factor out version_ids-to-join selection in InterVersionedfile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1373
1373
        assert isinstance(self.source, KnitVersionedFile)
1374
1374
        assert isinstance(self.target, KnitVersionedFile)
1375
1375
 
1376
 
        if version_ids is None:
1377
 
            version_ids = self.source.versions()
1378
 
        else:
1379
 
            if not ignore_missing:
1380
 
                self.source._check_versions_present(version_ids)
1381
 
            else:
1382
 
                version_ids = set(self.source.versions()).intersection(
1383
 
                    set(version_ids))
 
1376
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1384
1377
 
1385
1378
        if not version_ids:
1386
1379
            return 0