51
30
After bzr 0.0.5 revisions are allowed to have multiple parents.
54
List of parent revisions, each is a RevisionReference.
33
List of parent revision_ids
64
36
def __init__(self, **args):
65
37
self.__dict__.update(args)
39
self.parent_sha1s = []
69
41
def __repr__(self):
70
42
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>
44
def __eq__(self, other):
45
if not isinstance(other, Revision):
47
# FIXME: rbc 20050930 parent_ids are not being compared
49
self.inventory_sha1 == other.inventory_sha1
50
and self.revision_id == other.revision_id
51
and self.timestamp == other.timestamp
52
and self.message == other.message
53
and self.timezone == other.timezone
54
and self.committer == other.committer)
56
def __ne__(self, other):
57
return not self.__eq__(other)
159
60
REVISION_ID_RE = None
161
62
def validate_revision_id(rid):
163
64
global REVISION_ID_RE
164
65
if not REVISION_ID_RE:
166
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
67
REVISION_ID_RE = re.compile('[\w:.-]+@[\w%.-]+--?[\w]+--?[0-9a-f]+\Z')
168
69
if not REVISION_ID_RE.match(rid):
169
70
raise ValueError("malformed revision-id %r" % rid)
171
def is_ancestor(revision_id, candidate_id, revision_source):
73
def is_ancestor(revision_id, candidate_id, branch):
172
74
"""Return true if candidate_id is an ancestor of revision_id.
173
76
A false negative will be returned if any intermediate descendent of
174
77
candidate_id is not present in any of the revision_sources.
176
79
revisions_source is an object supporting a get_revision operation that
177
80
behaves like Branch's.
180
from bzrlib.branch import NoSuchRevision
82
return candidate_id in branch.get_ancestry(revision_id)
85
def iter_ancestors(revision_id, revision_source, only_present=False):
181
86
ancestors = (revision_id,)
182
88
while len(ancestors) > 0:
183
89
new_ancestors = []
184
90
for ancestor in ancestors:
185
if ancestor == candidate_id:
92
yield ancestor, distance
188
94
revision = revision_source.get_revision(ancestor)
189
except NoSuchRevision, e:
95
except bzrlib.errors.NoSuchRevision, e:
190
96
if e.revision == revision_id:
194
new_ancestors.extend([p.revision_id for p in revision.parents])
101
yield ancestor, distance
102
new_ancestors.extend(revision.parent_ids)
195
103
ancestors = new_ancestors
107
def find_present_ancestors(revision_id, revision_source):
108
"""Return the ancestors of a revision present in a branch.
110
It's possible that a branch won't have the complete ancestry of
111
one of its revisions.
115
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
117
for anc_order, (anc_id, anc_distance) in anc_iter:
118
if not found_ancestors.has_key(anc_id):
119
found_ancestors[anc_id] = (anc_order, anc_distance)
120
return found_ancestors
123
def __get_closest(intersection):
126
for entry in intersection:
127
if entry[0] == intersection[0][0]:
128
matches.append(entry[2])
132
def old_common_ancestor(revision_a, revision_b, revision_source):
133
"""Find the ancestor common to both revisions that is closest to both.
135
from bzrlib.trace import mutter
136
a_ancestors = find_present_ancestors(revision_a, revision_source)
137
b_ancestors = find_present_ancestors(revision_b, revision_source)
140
# a_order is used as a tie-breaker when two equally-good bases are found
141
for revision, (a_order, a_distance) in a_ancestors.iteritems():
142
if b_ancestors.has_key(revision):
143
a_intersection.append((a_distance, a_order, revision))
144
b_intersection.append((b_ancestors[revision][1], a_order, revision))
145
mutter("a intersection: %r" % a_intersection)
146
mutter("b intersection: %r" % b_intersection)
148
a_closest = __get_closest(a_intersection)
149
if len(a_closest) == 0:
151
b_closest = __get_closest(b_intersection)
152
assert len(b_closest) != 0
153
mutter ("a_closest %r" % a_closest)
154
mutter ("b_closest %r" % b_closest)
155
if a_closest[0] in b_closest:
157
elif b_closest[0] in a_closest:
160
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
163
def revision_graph(revision, revision_source):
164
"""Produce a graph of the ancestry of the specified revision.
165
Return root, ancestors map, descendants map
167
TODO: Produce graphs with the NULL revision as root, so that we can find
168
a common even when trees are not branches don't represent a single line
175
descendants[revision] = {}
176
while len(lines) > 0:
179
if line == NULL_REVISION:
184
rev = revision_source.get_revision(line)
185
parents = list(rev.parent_ids)
186
if len(parents) == 0:
187
parents = [NULL_REVISION]
188
except bzrlib.errors.NoSuchRevision:
192
if parents is not None:
193
for parent in parents:
194
if parent not in ancestors:
195
new_lines.add(parent)
196
if parent not in descendants:
197
descendants[parent] = {}
198
descendants[parent][line] = 1
199
if parents is not None:
200
ancestors[line] = set(parents)
202
assert root not in descendants[root]
203
assert root not in ancestors[root]
204
return root, ancestors, descendants
207
def combined_graph(revision_a, revision_b, revision_source):
208
"""Produce a combined ancestry graph.
209
Return graph root, ancestors map, descendants map, set of common nodes"""
210
root, ancestors, descendants = revision_graph(revision_a, revision_source)
211
root_b, ancestors_b, descendants_b = revision_graph(revision_b,
214
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
216
for node, node_anc in ancestors_b.iteritems():
217
if node in ancestors:
220
ancestors[node] = set()
221
ancestors[node].update(node_anc)
222
for node, node_dec in descendants_b.iteritems():
223
if node not in descendants:
224
descendants[node] = {}
225
descendants[node].update(node_dec)
226
return root, ancestors, descendants, common
229
def common_ancestor(revision_a, revision_b, revision_source):
231
root, ancestors, descendants, common = \
232
combined_graph(revision_a, revision_b, revision_source)
233
except bzrlib.errors.NoCommonRoot:
234
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
236
distances = node_distances (descendants, ancestors, root)
237
farthest = select_farthest(distances, common)
238
if farthest is None or farthest == NULL_REVISION:
239
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
198
243
class MultipleRevisionSources(object):
244
"""Proxy that looks in multiple branches for revisions."""
199
245
def __init__(self, *args):
200
246
object.__init__(self)
201
247
assert len(args) != 0
202
248
self._revision_sources = args
204
250
def get_revision(self, revision_id):
205
from bzrlib.branch import NoSuchRevision
206
251
for source in self._revision_sources:
208
253
return source.get_revision(revision_id)
209
except NoSuchRevision, e:
254
except bzrlib.errors.NoSuchRevision, e:
258
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
259
revision_history=None):
260
"""Find the longest line of descent from maybe_ancestor to revision.
261
Revision history is followed where possible.
263
If ancestor_id == rev_id, list will be empty.
264
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
265
If ancestor_id is not an ancestor, NotAncestor will be thrown
267
root, ancestors, descendants = revision_graph(rev_id, rev_source)
268
if len(descendants) == 0:
269
raise NoSuchRevision(rev_source, rev_id)
270
if ancestor_id not in descendants:
271
rev_source.get_revision(ancestor_id)
272
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
273
root_descendants = all_descendants(descendants, ancestor_id)
274
root_descendants.add(ancestor_id)
275
if rev_id not in root_descendants:
276
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
277
distances = node_distances(descendants, ancestors, ancestor_id,
278
root_descendants=root_descendants)
280
def best_ancestor(rev_id):
282
for anc_id in ancestors[rev_id]:
284
distance = distances[anc_id]
287
if revision_history is not None and anc_id in revision_history:
289
elif best is None or distance > best[1]:
290
best = (anc_id, distance)
295
while next != ancestor_id:
297
next = best_ancestor(next)
added
removed
bzrlib/revision.py
