← 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
  • Date: 2005-09-12 13:05:29 UTC
  • mto: (1185.1.16)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050912130529-58593ccacd291eee
Sped up pull by copying locally first

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
809
809
 
810
810
        pb = bzrlib.ui.ui_factory.progress_bar()
811
811
        pb.update('comparing histories')
812
 
 
 
812
        if stop_revision is None:
 
813
            other_revision = other.last_patch()
 
814
        else:
 
815
            other_revision = other.lookup_revision(stop_revision)
 
816
        count = greedy_fetch(self, other, other_revision, pb)[0]
813
817
        try:
814
818
            revision_ids = self.missing_revisions(other, stop_revision)
815
819
        except DivergedBranches, e:
816
820
            try:
817
 
                if stop_revision is None:
818
 
                    end_revision = other.last_patch()
819
821
                revision_ids = get_intervening_revisions(self.last_patch(), 
820
 
                                                         end_revision, other)
 
822
                                                         other_revision, self)
821
823
                assert self.last_patch() not in revision_ids
822
824
            except bzrlib.errors.NotAncestor:
823
825
                raise e
824
826
 
825
 
        if len(revision_ids) > 0:
826
 
            count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
827
 
        else:
828
 
            count = 0
829
827
        self.append_revision(*revision_ids)
830
 
        ## note("Added %d revisions." % count)
831
828
        pb.clear()
832
829
 
833
830
    def install_revisions(self, other, revision_ids, pb):