/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-19 18:40:15 UTC
  • mfrom: (5622 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5624.
  • Revision ID: jelmer@samba.org-20110119184015-ahycpz0yduideif0
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
from bzrlib.lazy_import import lazy_import
29
29
lazy_import(globals(), """
30
30
from bzrlib import (
 
31
    graph,
31
32
    tsort,
32
33
    versionedfile,
33
34
    )
93
94
        try:
94
95
            pb.update("Finding revisions", 0, 2)
95
96
            search = self._revids_to_fetch()
96
 
            if search is None:
 
97
            mutter('fetching: %s', search)
 
98
            if search.is_empty():
97
99
                return
98
100
            pb.update("Fetching revisions", 1, 2)
99
101
            self._fetch_everything_for_search(search)
148
150
        """Determines the exact revisions needed from self.from_repository to
149
151
        install self._last_revision in self.to_repository.
150
152
 
151
 
        If no revisions need to be fetched, then this just returns None.
 
153
        :returns: A SearchResult of some sort.  (Possibly a
 
154
        PendingAncestryResult, EmptySearchResult, etc.)
152
155
        """
153
 
        if self._fetch_spec is not None:
 
156
        mutter("self._fetch_spec, self._last_revision: %r, %r",
 
157
                self._fetch_spec, self._last_revision)
 
158
        get_search_result = getattr(self._fetch_spec, 'get_search_result', None)
 
159
        if get_search_result is not None:
 
160
            mutter(
 
161
                'resolving fetch_spec into search result: %s', self._fetch_spec)
 
162
            # This is EverythingNotInOther or a similar kind of fetch_spec.
 
163
            # Turn it into a search result.
 
164
            return get_search_result()
 
165
        elif self._fetch_spec is not None:
 
166
            # The fetch spec is already a concrete search result.
154
167
            return self._fetch_spec
155
 
        mutter('fetch up to rev {%s}', self._last_revision)
156
 
        if self._last_revision is NULL_REVISION:
 
168
        elif self._last_revision == NULL_REVISION:
 
169
            # fetch_spec is None + last_revision is null => empty fetch.
157
170
            # explicit limit of no revisions needed
158
 
            return None
159
 
        return self.to_repository.search_missing_revision_ids(
160
 
            self.from_repository, self._last_revision,
161
 
            find_ghosts=self.find_ghosts)
 
171
            return graph.EmptySearchResult()
 
172
        elif self._last_revision is not None:
 
173
            return graph.NotInOtherForRevs(self.to_repository,
 
174
                self.from_repository, [self._last_revision],
 
175
                find_ghosts=self.find_ghosts).get_search_result()
 
176
        else: # self._last_revision is None:
 
177
            return graph.EverythingNotInOther(self.to_repository,
 
178
                self.from_repository,
 
179
                find_ghosts=self.find_ghosts).get_search_result()
162
180
 
163
181
 
164
182
class Inter1and2Helper(object):