← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-11 00:23:23 UTC
  • mfrom: (2070 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061011002323-82ba88c293d7caff
[merge] bzr.dev 2070

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
1
1
# Copyright (C) 2005, 2006 Canonical
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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