← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-19 12:06:01 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050819120601-58525b75283a9c1c
Initial greedy fetch work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
766
766
            return None
767
767
 
768
768
 
769
 
    def missing_revisions(self, other, stop_revision=None):
 
769
    def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
770
770
        """
771
771
        If self and other have not diverged, return a list of the revisions
772
772
        present in other, but missing from self.
810
810
        return other_history[self_len:stop_revision]
811
811
 
812
812
 
813
 
    def update_revisions(self, other, stop_revision=None):
 
813
    def update_revisions(self, other, stop_revision=None, revision_ids=None):
814
814
        """Pull in all new revisions from other branch.
815
815
        
816
816
        >>> from bzrlib.commit import commit
838
838
        pb = ProgressBar()
839
839
 
840
840
        pb.update('comparing histories')
841
 
        revision_ids = self.missing_revisions(other, stop_revision)
 
841
        if revision_ids is None:
 
842
            revision_ids = self.missing_revisions(other, stop_revision)
842
843
 
843
844
        if hasattr(other.revision_store, "prefetch"):
844
845
            other.revision_store.prefetch(revision_ids)