← 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-03-06 12:11:25 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060306121125-4f05992d44e3bda8
Convert Knit repositories to use knits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
829
829
        except AttributeError:
830
830
            return False
831
831
 
832
 
    def join(self, pb=None, msg=None, version_ids=None):
 
832
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
833
833
        """See InterVersionedFile.join."""
834
834
        assert isinstance(self.source, KnitVersionedFile)
835
835
        assert isinstance(self.target, KnitVersionedFile)
836
836
 
837
837
        if version_ids is None:
838
838
            version_ids = self.source.versions()
 
839
        else:
 
840
            if not ignore_missing:
 
841
                self.source._check_versions_present(version_ids)
 
842
            else:
 
843
                version_ids = set(self.source.versions()).intersection(
 
844
                    set(version_ids))
 
845
 
839
846
        if not version_ids:
840
847
            return 0
841
848