/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 bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/graph.py
16
16
 
17
17
from bzrlib import (
18
18
    errors,
 
19
    revision,
19
20
    tsort,
20
21
    )
21
22
from bzrlib.deprecated_graph import (node_distances, select_farthest)
347
348
        smallest number of parent looksup to determine the ancestral
348
349
        relationship between N revisions.
349
350
        """
 
351
        if revision.is_null(candidate_ancestor):
 
352
            return True
 
353
        if revision.is_null(candidate_descendant):
 
354
            # if candidate_descendant is NULL_REVISION, then only
 
355
            # candidate_ancestor == NULL_REVISION is an ancestor, but we've
 
356
            # already handled that case.
 
357
            return False
350
358
        return set([candidate_descendant]) == self.heads(
351
359
            [candidate_ancestor, candidate_descendant])
352
360