64
43
def __init__(self, **args):
65
44
self.__dict__.update(args)
46
self.parent_sha1s = []
69
49
def __repr__(self):
70
50
return "<Revision id %s>" % self.revision_id
74
from bzrlib.xml import Element, SubElement
76
root = Element('revision',
77
committer = self.committer,
78
timestamp = '%.9f' % self.timestamp,
79
revision_id = self.revision_id,
80
inventory_id = self.inventory_id,
81
inventory_sha1 = self.inventory_sha1,
84
root.set('timezone', str(self.timezone))
87
msg = SubElement(root, 'message')
88
msg.text = self.message
92
pelts = SubElement(root, 'parents')
93
pelts.tail = pelts.text = '\n'
94
for rr in self.parents:
95
assert isinstance(rr, RevisionReference)
96
p = SubElement(pelts, 'revision_ref')
99
p.set('revision_id', rr.revision_id)
101
p.set('revision_sha1', rr.revision_sha1)
106
def from_element(cls, elt):
107
return unpack_revision(elt)
109
from_element = classmethod(from_element)
113
def unpack_revision(elt):
114
"""Convert XML element into Revision object."""
115
# <changeset> is deprecated...
116
from bzrlib.errors import BzrError
118
if elt.tag not in ('revision', 'changeset'):
119
raise BzrError("unexpected tag in revision file: %r" % elt)
121
rev = Revision(committer = elt.get('committer'),
122
timestamp = float(elt.get('timestamp')),
123
revision_id = elt.get('revision_id'),
124
inventory_id = elt.get('inventory_id'),
125
inventory_sha1 = elt.get('inventory_sha1')
128
precursor = elt.get('precursor')
129
precursor_sha1 = elt.get('precursor_sha1')
131
pelts = elt.find('parents')
135
assert p.tag == 'revision_ref', \
136
"bad parent node tag %r" % p.tag
137
rev_ref = RevisionReference(p.get('revision_id'),
138
p.get('revision_sha1'))
139
rev.parents.append(rev_ref)
143
prec_parent = rev.parents[0].revision_id
144
assert prec_parent == precursor
146
# revisions written prior to 0.0.5 have a single precursor
147
# give as an attribute
148
rev_ref = RevisionReference(precursor, precursor_sha1)
149
rev.parents.append(rev_ref)
151
v = elt.get('timezone')
152
rev.timezone = v and int(v)
154
rev.message = elt.findtext('message') # text of <message>
52
def __eq__(self, other):
53
if not isinstance(other, Revision):
55
return (self.inventory_id == other.inventory_id
56
and self.inventory_sha1 == other.inventory_sha1
57
and self.revision_id == other.revision_id
58
and self.timestamp == other.timestamp
59
and self.message == other.message
60
and self.timezone == other.timezone
61
and self.committer == other.committer)
63
def __ne__(self, other):
64
return not self.__eq__(other)
159
68
REVISION_ID_RE = None
168
77
if not REVISION_ID_RE.match(rid):
169
78
raise ValueError("malformed revision-id %r" % rid)
171
def is_ancestor(revision_id, candidate_id, revision_source):
81
def is_ancestor(revision_id, candidate_id, branch):
172
82
"""Return true if candidate_id is an ancestor of revision_id.
173
84
A false negative will be returned if any intermediate descendent of
174
85
candidate_id is not present in any of the revision_sources.
176
87
revisions_source is an object supporting a get_revision operation that
177
88
behaves like Branch's.
180
from bzrlib.branch import NoSuchRevision
90
return candidate_id in branch.get_ancestry(revision_id)
93
def iter_ancestors(revision_id, revision_source, only_present=False):
181
94
ancestors = (revision_id,)
182
96
while len(ancestors) > 0:
183
97
new_ancestors = []
184
98
for ancestor in ancestors:
185
if ancestor == candidate_id:
100
yield ancestor, distance
188
102
revision = revision_source.get_revision(ancestor)
189
except NoSuchRevision, e:
103
except bzrlib.errors.NoSuchRevision, e:
190
104
if e.revision == revision_id:
194
new_ancestors.extend([p.revision_id for p in revision.parents])
109
yield ancestor, distance
110
new_ancestors.extend(revision.parent_ids)
195
111
ancestors = new_ancestors
115
def find_present_ancestors(revision_id, revision_source):
116
"""Return the ancestors of a revision present in a branch.
118
It's possible that a branch won't have the complete ancestry of
119
one of its revisions.
123
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
125
for anc_order, (anc_id, anc_distance) in anc_iter:
126
if not found_ancestors.has_key(anc_id):
127
found_ancestors[anc_id] = (anc_order, anc_distance)
128
return found_ancestors
131
def __get_closest(intersection):
134
for entry in intersection:
135
if entry[0] == intersection[0][0]:
136
matches.append(entry[2])
140
def old_common_ancestor(revision_a, revision_b, revision_source):
141
"""Find the ancestor common to both revisions that is closest to both.
143
from bzrlib.trace import mutter
144
a_ancestors = find_present_ancestors(revision_a, revision_source)
145
b_ancestors = find_present_ancestors(revision_b, revision_source)
148
# a_order is used as a tie-breaker when two equally-good bases are found
149
for revision, (a_order, a_distance) in a_ancestors.iteritems():
150
if b_ancestors.has_key(revision):
151
a_intersection.append((a_distance, a_order, revision))
152
b_intersection.append((b_ancestors[revision][1], a_order, revision))
153
mutter("a intersection: %r" % a_intersection)
154
mutter("b intersection: %r" % b_intersection)
156
a_closest = __get_closest(a_intersection)
157
if len(a_closest) == 0:
159
b_closest = __get_closest(b_intersection)
160
assert len(b_closest) != 0
161
mutter ("a_closest %r" % a_closest)
162
mutter ("b_closest %r" % b_closest)
163
if a_closest[0] in b_closest:
165
elif b_closest[0] in a_closest:
168
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
171
def revision_graph(revision, revision_source):
172
"""Produce a graph of the ancestry of the specified revision.
173
Return root, ancestors map, descendants map
175
TODO: Produce graphs with the NULL revision as root, so that we can find
176
a common even when trees are not branches don't represent a single line
183
descendants[revision] = {}
184
while len(lines) > 0:
187
if line == NULL_REVISION:
192
rev = revision_source.get_revision(line)
193
parents = list(rev.parent_ids)
194
if len(parents) == 0:
195
parents = [NULL_REVISION]
196
except bzrlib.errors.NoSuchRevision:
200
if parents is not None:
201
for parent in parents:
202
if parent not in ancestors:
203
new_lines.add(parent)
204
if parent not in descendants:
205
descendants[parent] = {}
206
descendants[parent][line] = 1
207
if parents is not None:
208
ancestors[line] = set(parents)
210
assert root not in descendants[root]
211
assert root not in ancestors[root]
212
return root, ancestors, descendants
214
def combined_graph(revision_a, revision_b, revision_source):
215
"""Produce a combined ancestry graph.
216
Return graph root, ancestors map, descendants map, set of common nodes"""
217
root, ancestors, descendants = revision_graph(revision_a, revision_source)
218
root_b, ancestors_b, descendants_b = revision_graph(revision_b,
221
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
223
for node, node_anc in ancestors_b.iteritems():
224
if node in ancestors:
227
ancestors[node] = set()
228
ancestors[node].update(node_anc)
229
for node, node_dec in descendants_b.iteritems():
230
if node not in descendants:
231
descendants[node] = {}
232
descendants[node].update(node_dec)
233
return root, ancestors, descendants, common
235
def common_ancestor(revision_a, revision_b, revision_source):
237
root, ancestors, descendants, common = \
238
combined_graph(revision_a, revision_b, revision_source)
239
except bzrlib.errors.NoCommonRoot:
240
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
242
distances = node_distances (descendants, ancestors, root)
243
farthest = select_farthest(distances, common)
244
if farthest is None or farthest == NULL_REVISION:
245
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
198
248
class MultipleRevisionSources(object):
249
"""Proxy that looks in multiple branches for revisions."""
199
250
def __init__(self, *args):
200
251
object.__init__(self)
201
252
assert len(args) != 0
202
253
self._revision_sources = args
204
255
def get_revision(self, revision_id):
205
from bzrlib.branch import NoSuchRevision
206
256
for source in self._revision_sources:
208
258
return source.get_revision(revision_id)
209
except NoSuchRevision, e:
259
except bzrlib.errors.NoSuchRevision, e:
263
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
264
revision_history=None):
265
"""Find the longest line of descent from maybe_ancestor to revision.
266
Revision history is followed where possible.
268
If ancestor_id == rev_id, list will be empty.
269
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
270
If ancestor_id is not an ancestor, NotAncestor will be thrown
272
root, ancestors, descendants = revision_graph(rev_id, rev_source)
273
if len(descendants) == 0:
274
raise NoSuchRevision(rev_source, rev_id)
275
if ancestor_id not in descendants:
276
rev_source.get_revision(ancestor_id)
277
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
278
root_descendants = all_descendants(descendants, ancestor_id)
279
root_descendants.add(ancestor_id)
280
if rev_id not in root_descendants:
281
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
282
distances = node_distances(descendants, ancestors, ancestor_id,
283
root_descendants=root_descendants)
285
def best_ancestor(rev_id):
287
for anc_id in ancestors[rev_id]:
289
distance = distances[anc_id]
292
if revision_history is not None and anc_id in revision_history:
294
elif best is None or distance > best[1]:
295
best = (anc_id, distance)
300
while next != ancestor_id:
302
next = best_ancestor(next)
added
removed
bzrlib/revision.py
