← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/graph.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-27 20:24:43 UTC
  • mfrom: (3960.2.1 1.12-progress-warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
(jam) Avoid getting a UserWarning by not creating an unused progress
        bar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/graph.py
920
920
        return set([candidate_descendant]) == self.heads(
921
921
            [candidate_ancestor, candidate_descendant])
922
922
 
923
 
    def is_between(self, revid, lower_bound_revid, upper_bound_revid):
924
 
        """Determine whether a revision is between two others.
925
 
 
926
 
        returns true if and only if:
927
 
        lower_bound_revid <= revid <= upper_bound_revid
928
 
        """
929
 
        return ((upper_bound_revid is None or
930
 
                    self.is_ancestor(revid, upper_bound_revid)) and
931
 
               (lower_bound_revid is None or
932
 
                    self.is_ancestor(lower_bound_revid, revid)))
933
 
 
934
923
    def _search_for_extra_common(self, common, searchers):
935
924
        """Make sure that unique nodes are genuinely unique.
936
925