~bzr-pqm/bzr/bzr.dev

« 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:
1556
1556
    def _get_keys(self, graph):
1557
1557
        NULL_REVISION = revision.NULL_REVISION
1558
1558
        keys = [key for (key, parents) in graph.iter_ancestry(self.heads)
1559
 
                if key != NULL_REVISION]
 
1559
                if key != NULL_REVISION and parents is not None]
1560
1560
        return keys
1561
1561
 
1562
1562
    def is_empty(self):