/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

Cherrypick some self-contained improvements from fetch-tags-from-non-sprout-too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/graph.py
1716
1716
    def __init__(self, repo):
1717
1717
        self._repo = repo
1718
1718
 
 
1719
    def __repr__(self):
 
1720
        return '%s(%r)' % (self.__class__.__name__, self._repo)
 
1721
 
1719
1722
    def get_recipe(self):
1720
1723
        raise NotImplementedError(self.get_recipe)
1721
1724
 
1758
1761
 
1759
1762
class NotInOtherForRevs(object):
1760
1763
 
1761
 
    def __init__(self, to_repo, from_repo, revision_ids, find_ghosts=False):
 
1764
    def __init__(self, to_repo, from_repo, required_ids, if_present_ids=None,
 
1765
            find_ghosts=False):
1762
1766
        self.to_repo = to_repo
1763
1767
        self.from_repo = from_repo
1764
1768
        self.find_ghosts = find_ghosts
1765
 
        self.revision_ids = revision_ids
 
1769
        self.required_ids = required_ids
 
1770
        self.if_present_ids = if_present_ids
 
1771
 
 
1772
    def __repr__(self):
 
1773
        if len(self.required_ids) > 5:
 
1774
            reqd_revs_repr = repr(list(self.required_ids)[:5])[:-1] + ', ...]'
 
1775
        else:
 
1776
            reqd_revs_repr = repr(self.required_ids)
 
1777
        if self.if_present_ids and len(self.if_present_ids) > 5:
 
1778
            ifp_revs_repr = repr(list(self.if_present_ids)[:5])[:-1] + ', ...]'
 
1779
        else:
 
1780
            ifp_revs_repr = repr(self.if_present_ids)
 
1781
 
 
1782
        return "<%s from:%r to:%r find_ghosts:%r req'd:%r if-present:%r>" % (
 
1783
            self.__class__.__name__, self.from_repo, self.to_repo,
 
1784
            self.find_ghosts, reqd_revs_repr, ifp_revs_repr)
1766
1785
 
1767
1786
    def get_search(self):
1768
1787
        return self.to_repo.search_missing_revision_ids(
1769
 
            self.from_repo, revision_ids=self.revision_ids,
1770
 
            find_ghosts=self.find_ghosts)
 
1788
            self.from_repo, revision_ids=self.required_ids,
 
1789
            if_present_ids=self.if_present_ids, find_ghosts=self.find_ghosts)
1771
1790
 
1772
1791
 
1773
1792
def collapse_linear_regions(parent_map):