← Back to branch summary

~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:33 UTC
  • mfrom: (1731.1744.1078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: aaron@aaronbentley.com-20090505181633-3qtq1skwjzed0kug
Merge bzr.dev into composite-tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
30
30
    errors,
31
31
    symbol_versioning,
32
32
    )
33
 
from bzrlib.errors import InstallFailed
34
 
from bzrlib.progress import ProgressPhase
35
33
from bzrlib.revision import NULL_REVISION
36
34
from bzrlib.tsort import topo_sort
37
35
from bzrlib.trace import mutter
170
168
        if self._last_revision is NULL_REVISION:
171
169
            # explicit limit of no revisions needed
172
170
            return None
173
 
        if (self._last_revision is not None and
174
 
            self.to_repository.has_revision(self._last_revision)):
175
 
            return None
176
 
        try:
177
 
            return self.to_repository.search_missing_revision_ids(
178
 
                self.from_repository, self._last_revision,
179
 
                find_ghosts=self.find_ghosts)
180
 
        except errors.NoSuchRevision, e:
181
 
            raise InstallFailed([self._last_revision])
 
171
        return self.to_repository.search_missing_revision_ids(
 
172
            self.from_repository, self._last_revision,
 
173
            find_ghosts=self.find_ghosts)
182
174
 
183
175
    def _parent_inventories(self, revision_ids):
184
176
        # Find all the parent revisions referenced by the stream, but