/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

  • Committer: Andrew Bennetts
  • Date: 2010-12-01 23:39:51 UTC
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20101201233951-0v6o7422ij3c2ocf
Cope with tags that reference missing revisions.

Show diffs side-by-side

added added

removed removed

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