/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/revision.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
28
28
 
29
29
NULL_REVISION="null:"
30
30
 
 
31
 
31
32
class Revision(object):
32
33
    """Single revision on a branch.
33
34
 
117
118
    revisions_source is an object supporting a get_revision operation that
118
119
    behaves like Branch's.
119
120
    """
120
 
    return candidate_id in branch.repository.get_ancestry(revision_id)
 
121
    return (candidate_id in branch.repository.get_ancestry(revision_id))
121
122
 
122
123
 
123
124
def iter_ancestors(revision_id, revision_source, only_present=False):
153
154
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
154
155
                         only_present=True))
155
156
    for anc_order, (anc_id, anc_distance) in anc_iter:
156
 
        if not found_ancestors.has_key(anc_id):
 
157
        if anc_id not in found_ancestors:
157
158
            found_ancestors[anc_id] = (anc_order, anc_distance)
158
159
    return found_ancestors
159
160