← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2005-10-11 03:19:29 UTC
  • Revision ID: robertc@robertcollins.net-20051011031929-2d523107133c43be
further tuning of pull, do not do a local merge or fetch at all, if the remote branch is no newer than we are

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
117
117
            mutter('failed getting last revision: %s', e)
118
118
            raise InstallFailed([last_revision])
119
119
        mutter('fetch up to rev {%s}', self.last_revision)
120
 
        try:
121
 
            if self.last_revision is not None:
122
 
                self.to_branch.get_revision(self.last_revision)
123
 
                return
124
 
        except NoSuchRevision:
125
 
            pass
 
120
        if (self.last_revision is not None and 
 
121
            self.to_branch.has_revision(self.last_revision)):
 
122
            return
126
123
        try:
127
124
            revs_to_fetch = self._compare_ancestries()
128
125
        except WeaveError: