/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

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
165
165
        """
166
166
        mutter("self._fetch_spec, self._last_revision: %r, %r",
167
167
                self._fetch_spec, self._last_revision)
168
 
        get_search = getattr(self._fetch_spec, 'get_search', None)
169
 
        if get_search is not None:
 
168
        get_search_result = getattr(self._fetch_spec, 'get_search_result', None)
 
169
        if get_search_result is not None:
 
170
            mutter(
 
171
                'resolving fetch_spec into search result: %s', self._fetch_spec)
170
172
            # This is EverythingNotInOther or a similar kind of fetch_spec.
171
173
            # Turn it into a search result.
172
 
            return get_search()
 
174
            return get_search_result()
173
175
        elif self._fetch_spec is not None:
174
176
            # The fetch spec is already a concrete search result.
175
177
            return self._fetch_spec
180
182
        elif self._last_revision is not None:
181
183
            return graph.NotInOtherForRevs(self.to_repository,
182
184
                self.from_repository, [self._last_revision],
183
 
                find_ghosts=self.find_ghosts).get_search()
 
185
                find_ghosts=self.find_ghosts).get_search_result()
184
186
        else: # self._last_revision is None:
185
187
            return graph.EverythingNotInOther(self.to_repository,
186
 
                self.from_repository, find_ghosts=self.find_ghosts).get_search()
 
188
                self.from_repository,
 
189
                find_ghosts=self.find_ghosts).get_search_result()
187
190
 
188
191
    def _parent_inventories(self, revision_ids):
189
192
        # Find all the parent revisions referenced by the stream, but