/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/graph.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-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
1576
1576
 
1577
1577
class AbstractSearch(object):
1578
1578
 
1579
 
    def get_search_result(self):
 
1579
    def execute(self):
1580
1580
        """Construct a network-ready search result from this search description.
1581
1581
 
1582
1582
        This may take some time to search repositories, etc.
1583
1583
 
1584
 
        :return: A search result.
 
1584
        :return: A search result (an object that implements
 
1585
            AbstractSearchResult's API).
1585
1586
        """
1586
 
        raise NotImplementedError(self.get_search_result)
 
1587
        raise NotImplementedError(self.execute)
1587
1588
 
1588
1589
 
1589
1590
class SearchResult(AbstractSearchResult):
1814
1815
        self.from_repo = from_repo
1815
1816
        self.find_ghosts = find_ghosts
1816
1817
 
1817
 
    def get_search_result(self):
 
1818
    def execute(self):
1818
1819
        return self.to_repo.search_missing_revision_ids(
1819
1820
            self.from_repo, find_ghosts=self.find_ghosts)
1820
1821
 
1854
1855
            self.__class__.__name__, self.from_repo, self.to_repo,
1855
1856
            self.find_ghosts, reqd_revs_repr, ifp_revs_repr)
1856
1857
 
1857
 
    def get_search_result(self):
 
1858
    def execute(self):
1858
1859
        return self.to_repo.search_missing_revision_ids(
1859
1860
            self.from_repo, revision_ids=self.required_ids,
1860
1861
            if_present_ids=self.if_present_ids, find_ghosts=self.find_ghosts)