72
70
def __repr__(self):
73
71
return "<Revision id %s>" % self.revision_id
75
def __eq__(self, other):
76
if not isinstance(other, Revision):
78
return (self.inventory_id == other.inventory_id
79
and self.inventory_sha1 == other.inventory_sha1
80
and self.revision_id == other.revision_id
81
and self.timestamp == other.timestamp
82
and self.message == other.message
83
and self.timezone == other.timezone
84
and self.committer == other.committer)
86
def __ne__(self, other):
87
return not self.__eq__(other)
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>
91
158
REVISION_ID_RE = None
152
213
found_ancestors[anc_id] = (anc_order, anc_distance)
153
214
return found_ancestors
156
def __get_closest(intersection):
159
for entry in intersection:
160
if entry[0] == intersection[0][0]:
161
matches.append(entry[2])
165
def old_common_ancestor(revision_a, revision_b, revision_source):
216
class AmbiguousBase(bzrlib.errors.BzrError):
217
def __init__(self, bases):
218
msg = "The correct base is unclear, becase %s are all equally close" %\
220
bzrlib.errors.BzrError.__init__(self, msg)
223
def common_ancestor(revision_a, revision_b, revision_source):
166
224
"""Find the ancestor common to both revisions that is closest to both.
168
226
from bzrlib.trace import mutter
177
235
b_intersection.append((b_ancestors[revision][1], a_order, revision))
178
236
mutter("a intersection: %r" % a_intersection)
179
237
mutter("b intersection: %r" % b_intersection)
238
def get_closest(intersection):
241
for entry in intersection:
242
if entry[0] == intersection[0][0]:
243
matches.append(entry[2])
181
a_closest = __get_closest(a_intersection)
246
a_closest = get_closest(a_intersection)
182
247
if len(a_closest) == 0:
184
b_closest = __get_closest(b_intersection)
249
b_closest = get_closest(b_intersection)
185
250
assert len(b_closest) != 0
186
251
mutter ("a_closest %r" % a_closest)
187
252
mutter ("b_closest %r" % b_closest)
190
255
elif b_closest[0] in a_closest:
191
256
return b_closest[0]
193
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
258
raise AmbiguousBase((a_closest[0], b_closest[0]))
194
259
return a_closest[0]
196
def revision_graph(revision, revision_source):
197
"""Produce a graph of the ancestry of the specified revision.
198
Return root, ancestors map, descendants map
200
TODO: Produce graphs with the NULL revision as root, so that we can find
201
a common even when trees are not branches don't represent a single line
208
descendants[revision] = {}
209
while len(lines) > 0:
212
if line == NULL_REVISION:
217
rev = revision_source.get_revision(line)
218
parents = [p.revision_id for p in rev.parents]
219
if len(parents) == 0:
220
parents = [NULL_REVISION]
221
except bzrlib.errors.NoSuchRevision:
225
if parents is not None:
226
for parent in parents:
227
if parent not in ancestors:
228
new_lines.add(parent)
229
if parent not in descendants:
230
descendants[parent] = {}
231
descendants[parent][line] = 1
232
if parents is not None:
233
ancestors[line] = set(parents)
235
assert root not in descendants[root]
236
assert root not in ancestors[root]
237
return root, ancestors, descendants
239
def combined_graph(revision_a, revision_b, revision_source):
240
"""Produce a combined ancestry graph.
241
Return graph root, ancestors map, descendants map, set of common nodes"""
242
root, ancestors, descendants = revision_graph(revision_a, revision_source)
243
root_b, ancestors_b, descendants_b = revision_graph(revision_b,
246
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
248
for node, node_anc in ancestors_b.iteritems():
249
if node in ancestors:
252
ancestors[node] = set()
253
ancestors[node].update(node_anc)
254
for node, node_dec in descendants_b.iteritems():
255
if node not in descendants:
256
descendants[node] = {}
257
descendants[node].update(node_dec)
258
return root, ancestors, descendants, common
260
def common_ancestor(revision_a, revision_b, revision_source):
262
root, ancestors, descendants, common = \
263
combined_graph(revision_a, revision_b, revision_source)
264
except bzrlib.errors.NoCommonRoot:
265
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
267
distances = node_distances (descendants, ancestors, root)
268
farthest = select_farthest(distances, common)
269
if farthest is None or farthest == NULL_REVISION:
270
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
273
261
class MultipleRevisionSources(object):
274
"""Proxy that looks in multiple branches for revisions."""
275
262
def __init__(self, *args):
276
263
object.__init__(self)
277
264
assert len(args) != 0
294
281
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
295
282
If ancestor_id is not an ancestor, NotAncestor will be thrown
297
root, ancestors, descendants = revision_graph(rev_id, rev_source)
298
if len(descendants) == 0:
299
raise NoSuchRevision(rev_source, rev_id)
300
if ancestor_id not in descendants:
301
rev_source.get_revision(ancestor_id)
302
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
303
root_descendants = all_descendants(descendants, ancestor_id)
304
root_descendants.add(ancestor_id)
305
if rev_id not in root_descendants:
306
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
307
distances = node_distances(descendants, ancestors, ancestor_id,
308
root_descendants=root_descendants)
310
def best_ancestor(rev_id):
312
for anc_id in ancestors[rev_id]:
314
distance = distances[anc_id]
317
if revision_history is not None and anc_id in revision_history:
319
elif best is None or distance > best[1]:
320
best = (anc_id, distance)
325
while next != ancestor_id:
327
next = best_ancestor(next)
284
[rev_source.get_revision(r) for r in (ancestor_id, rev_id)]
285
if ancestor_id == rev_id:
287
def historical_lines(line):
288
"""Return a tuple of historical/non_historical lines, for sorting.
289
The non_historical count is negative, since non_historical lines are
294
for revision in line:
295
if revision in revision_history:
299
return good_count, bad_count
301
successful_lines = []
302
while len(active) > 0:
305
parent_ids = [p.revision_id for p in
306
rev_source.get_revision(line[-1]).parents]
307
for parent in parent_ids:
309
if parent == ancestor_id:
310
successful_lines.append(line_copy)
312
line_copy.append(parent)
313
new_active.append(line_copy)
315
if len(successful_lines) == 0:
316
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
317
for line in successful_lines:
319
if revision_history is not None:
320
by_historical_lines = []
321
for line in successful_lines:
322
count = historical_lines(line)
323
by_historical_lines.append((count, line))
324
by_historical_lines.sort()
325
if by_historical_lines[-1][0][0] > 0:
326
return by_historical_lines[-1][1]
327
assert len(successful_lines)
328
successful_lines.sort(cmp, len)
329
return successful_lines[-1]
added
removed
bzrlib/revision.py
