18
18
import bzrlib.errors
21
class RevisionReference(object):
23
Reference to a stored revision.
25
Includes the revision_id and revision_sha1.
29
def __init__(self, revision_id, revision_sha1=None):
30
if revision_id == None \
31
or isinstance(revision_id, basestring):
32
self.revision_id = revision_id
34
raise ValueError('bad revision_id %r' % revision_id)
36
if revision_sha1 != None:
37
if isinstance(revision_sha1, basestring) \
38
and len(revision_sha1) == 40:
39
self.revision_sha1 = revision_sha1
41
raise ValueError('bad revision_sha1 %r' % revision_sha1)
19
from bzrlib.graph import node_distances, select_farthest, all_descendants
45
23
class Revision(object):
46
24
"""Single revision on a branch.
52
30
After bzr 0.0.5 revisions are allowed to have multiple parents.
55
List of parent revisions, each is a RevisionReference.
33
List of parent revision_ids
65
def __init__(self, **args):
36
def __init__(self, revision_id, **args):
37
self.revision_id = revision_id
66
38
self.__dict__.update(args)
40
self.parent_sha1s = []
70
42
def __repr__(self):
71
43
return "<Revision id %s>" % self.revision_id
75
from bzrlib.xml import Element, SubElement
77
root = Element('revision',
78
committer = self.committer,
79
timestamp = '%.9f' % self.timestamp,
80
revision_id = self.revision_id,
81
inventory_id = self.inventory_id,
82
inventory_sha1 = self.inventory_sha1,
85
root.set('timezone', str(self.timezone))
88
msg = SubElement(root, 'message')
89
msg.text = self.message
93
pelts = SubElement(root, 'parents')
94
pelts.tail = pelts.text = '\n'
95
for rr in self.parents:
96
assert isinstance(rr, RevisionReference)
97
p = SubElement(pelts, 'revision_ref')
100
p.set('revision_id', rr.revision_id)
102
p.set('revision_sha1', rr.revision_sha1)
107
def from_element(cls, elt):
108
return unpack_revision(elt)
110
from_element = classmethod(from_element)
114
def unpack_revision(elt):
115
"""Convert XML element into Revision object."""
116
# <changeset> is deprecated...
117
if elt.tag not in ('revision', 'changeset'):
118
raise bzrlib.errors.BzrError("unexpected tag in revision file: %r" % elt)
120
rev = Revision(committer = elt.get('committer'),
121
timestamp = float(elt.get('timestamp')),
122
revision_id = elt.get('revision_id'),
123
inventory_id = elt.get('inventory_id'),
124
inventory_sha1 = elt.get('inventory_sha1')
127
precursor = elt.get('precursor')
128
precursor_sha1 = elt.get('precursor_sha1')
130
pelts = elt.find('parents')
134
assert p.tag == 'revision_ref', \
135
"bad parent node tag %r" % p.tag
136
rev_ref = RevisionReference(p.get('revision_id'),
137
p.get('revision_sha1'))
138
rev.parents.append(rev_ref)
142
prec_parent = rev.parents[0].revision_id
143
assert prec_parent == precursor
145
# revisions written prior to 0.0.5 have a single precursor
146
# give as an attribute
147
rev_ref = RevisionReference(precursor, precursor_sha1)
148
rev.parents.append(rev_ref)
150
v = elt.get('timezone')
151
rev.timezone = v and int(v)
153
rev.message = elt.findtext('message') # text of <message>
158
REVISION_ID_RE = None
160
def validate_revision_id(rid):
161
"""Check rid is syntactically valid for a revision id."""
162
global REVISION_ID_RE
163
if not REVISION_ID_RE:
165
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
167
if not REVISION_ID_RE.match(rid):
168
raise ValueError("malformed revision-id %r" % rid)
170
def is_ancestor(revision_id, candidate_id, revision_source):
45
def __eq__(self, other):
46
if not isinstance(other, Revision):
48
# FIXME: rbc 20050930 parent_ids are not being compared
50
self.inventory_sha1 == other.inventory_sha1
51
and self.revision_id == other.revision_id
52
and self.timestamp == other.timestamp
53
and self.message == other.message
54
and self.timezone == other.timezone
55
and self.committer == other.committer)
57
def __ne__(self, other):
58
return not self.__eq__(other)
61
def is_ancestor(revision_id, candidate_id, branch):
171
62
"""Return true if candidate_id is an ancestor of revision_id.
172
64
A false negative will be returned if any intermediate descendent of
173
65
candidate_id is not present in any of the revision_sources.
175
67
revisions_source is an object supporting a get_revision operation that
176
68
behaves like Branch's.
70
return candidate_id in branch.get_ancestry(revision_id)
73
def iter_ancestors(revision_id, revision_source, only_present=False):
179
74
ancestors = (revision_id,)
180
76
while len(ancestors) > 0:
181
77
new_ancestors = []
182
78
for ancestor in ancestors:
183
if ancestor == candidate_id:
80
yield ancestor, distance
186
82
revision = revision_source.get_revision(ancestor)
187
83
except bzrlib.errors.NoSuchRevision, e:
192
new_ancestors.extend([p.revision_id for p in revision.parents])
89
yield ancestor, distance
90
new_ancestors.extend(revision.parent_ids)
193
91
ancestors = new_ancestors
95
def find_present_ancestors(revision_id, revision_source):
96
"""Return the ancestors of a revision present in a branch.
98
It's possible that a branch won't have the complete ancestry of
103
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
105
for anc_order, (anc_id, anc_distance) in anc_iter:
106
if not found_ancestors.has_key(anc_id):
107
found_ancestors[anc_id] = (anc_order, anc_distance)
108
return found_ancestors
111
def __get_closest(intersection):
114
for entry in intersection:
115
if entry[0] == intersection[0][0]:
116
matches.append(entry[2])
120
def old_common_ancestor(revision_a, revision_b, revision_source):
121
"""Find the ancestor common to both revisions that is closest to both.
123
from bzrlib.trace import mutter
124
a_ancestors = find_present_ancestors(revision_a, revision_source)
125
b_ancestors = find_present_ancestors(revision_b, revision_source)
128
# a_order is used as a tie-breaker when two equally-good bases are found
129
for revision, (a_order, a_distance) in a_ancestors.iteritems():
130
if b_ancestors.has_key(revision):
131
a_intersection.append((a_distance, a_order, revision))
132
b_intersection.append((b_ancestors[revision][1], a_order, revision))
133
mutter("a intersection: %r" % a_intersection)
134
mutter("b intersection: %r" % b_intersection)
136
a_closest = __get_closest(a_intersection)
137
if len(a_closest) == 0:
139
b_closest = __get_closest(b_intersection)
140
assert len(b_closest) != 0
141
mutter ("a_closest %r" % a_closest)
142
mutter ("b_closest %r" % b_closest)
143
if a_closest[0] in b_closest:
145
elif b_closest[0] in a_closest:
148
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
151
def revision_graph(revision, revision_source):
152
"""Produce a graph of the ancestry of the specified revision.
153
Return root, ancestors map, descendants map
155
TODO: Produce graphs with the NULL revision as root, so that we can find
156
a common even when trees are not branches don't represent a single line
163
descendants[revision] = {}
164
while len(lines) > 0:
167
if line == NULL_REVISION:
172
rev = revision_source.get_revision(line)
173
parents = list(rev.parent_ids)
174
if len(parents) == 0:
175
parents = [NULL_REVISION]
176
except bzrlib.errors.NoSuchRevision:
180
if parents is not None:
181
for parent in parents:
182
if parent not in ancestors:
183
new_lines.add(parent)
184
if parent not in descendants:
185
descendants[parent] = {}
186
descendants[parent][line] = 1
187
if parents is not None:
188
ancestors[line] = set(parents)
190
assert root not in descendants[root]
191
assert root not in ancestors[root]
192
return root, ancestors, descendants
195
def combined_graph(revision_a, revision_b, revision_source):
196
"""Produce a combined ancestry graph.
197
Return graph root, ancestors map, descendants map, set of common nodes"""
198
root, ancestors, descendants = revision_graph(revision_a, revision_source)
199
root_b, ancestors_b, descendants_b = revision_graph(revision_b,
202
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
204
for node, node_anc in ancestors_b.iteritems():
205
if node in ancestors:
208
ancestors[node] = set()
209
ancestors[node].update(node_anc)
210
for node, node_dec in descendants_b.iteritems():
211
if node not in descendants:
212
descendants[node] = {}
213
descendants[node].update(node_dec)
214
return root, ancestors, descendants, common
217
def common_ancestor(revision_a, revision_b, revision_source):
219
root, ancestors, descendants, common = \
220
combined_graph(revision_a, revision_b, revision_source)
221
except bzrlib.errors.NoCommonRoot:
222
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
224
distances = node_distances (descendants, ancestors, root)
225
farthest = select_farthest(distances, common)
226
if farthest is None or farthest == NULL_REVISION:
227
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
196
231
class MultipleRevisionSources(object):
232
"""Proxy that looks in multiple branches for revisions."""
197
233
def __init__(self, *args):
198
234
object.__init__(self)
199
235
assert len(args) != 0
206
242
except bzrlib.errors.NoSuchRevision, e:
246
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
247
revision_history=None):
248
"""Find the longest line of descent from maybe_ancestor to revision.
249
Revision history is followed where possible.
251
If ancestor_id == rev_id, list will be empty.
252
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
253
If ancestor_id is not an ancestor, NotAncestor will be thrown
255
root, ancestors, descendants = revision_graph(rev_id, rev_source)
256
if len(descendants) == 0:
257
raise NoSuchRevision(rev_source, rev_id)
258
if ancestor_id not in descendants:
259
rev_source.get_revision(ancestor_id)
260
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
261
root_descendants = all_descendants(descendants, ancestor_id)
262
root_descendants.add(ancestor_id)
263
if rev_id not in root_descendants:
264
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
265
distances = node_distances(descendants, ancestors, ancestor_id,
266
root_descendants=root_descendants)
268
def best_ancestor(rev_id):
270
for anc_id in ancestors[rev_id]:
272
distance = distances[anc_id]
275
if revision_history is not None and anc_id in revision_history:
277
elif best is None or distance > best[1]:
278
best = (anc_id, distance)
283
while next != ancestor_id:
285
next = best_ancestor(next)
added
removed
bzrlib/revision.py
