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
17
# TODO: Some kind of command-line display of revision properties:
18
# perhaps show them in log -v and allow them as options to the commit command.
18
21
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)
22
import bzrlib.errors as errors
23
from bzrlib.graph import node_distances, select_farthest, all_descendants, Graph
24
from bzrlib.osutils import contains_whitespace
25
from bzrlib.progress import DummyProgress
45
29
class Revision(object):
46
30
"""Single revision on a branch.
73
58
def __eq__(self, other):
74
59
if not isinstance(other, Revision):
76
return (self.inventory_id == other.inventory_id
77
and self.inventory_sha1 == other.inventory_sha1
61
# FIXME: rbc 20050930 parent_ids are not being compared
63
self.inventory_sha1 == other.inventory_sha1
78
64
and self.revision_id == other.revision_id
79
65
and self.timestamp == other.timestamp
80
66
and self.message == other.message
81
67
and self.timezone == other.timezone
82
and self.committer == other.committer)
68
and self.committer == other.committer
69
and self.properties == other.properties)
84
71
def __ne__(self, other):
85
72
return not self.__eq__(other)
91
def validate_revision_id(rid):
92
"""Check rid is syntactically valid for a revision id."""
94
if not REVISION_ID_RE:
96
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
98
if not REVISION_ID_RE.match(rid):
99
raise ValueError("malformed revision-id %r" % rid)
101
def is_ancestor(revision_id, candidate_id, revision_source):
74
def _check_properties(self):
75
"""Verify that all revision properties are OK.
77
for name, value in self.properties.iteritems():
78
if not isinstance(name, basestring) or contains_whitespace(name):
79
raise ValueError("invalid property name %r" % name)
80
if not isinstance(value, basestring):
81
raise ValueError("invalid property value %r for %r" %
84
def get_history(self, repository):
85
"""Return the canonical line-of-history for this revision.
87
If ghosts are present this may differ in result from a ghost-free
90
current_revision = self
92
while current_revision is not None:
93
reversed_result.append(current_revision.revision_id)
94
if not len (current_revision.parent_ids):
95
reversed_result.append(None)
96
current_revision = None
98
next_revision_id = current_revision.parent_ids[0]
99
current_revision = repository.get_revision(next_revision_id)
100
reversed_result.reverse()
101
return reversed_result
104
def is_ancestor(revision_id, candidate_id, branch):
102
105
"""Return true if candidate_id is an ancestor of revision_id.
103
107
A false negative will be returned if any intermediate descendent of
104
108
candidate_id is not present in any of the revision_sources.
106
110
revisions_source is an object supporting a get_revision operation that
107
111
behaves like Branch's.
113
return candidate_id in branch.repository.get_ancestry(revision_id)
110
for ancestor_id, distance in iter_ancestors(revision_id, revision_source):
111
if ancestor_id == candidate_id:
115
116
def iter_ancestors(revision_id, revision_source, only_present=False):
116
117
ancestors = (revision_id,)
162
def common_ancestor(revision_a, revision_b, revision_source):
163
"""Find the ancestor common to both revisions that is closest to both.
163
def revision_graph(revision, revision_source):
164
"""Produce a graph of the ancestry of the specified revision.
166
:return: root, ancestors map, descendants map
165
from bzrlib.trace import mutter
166
a_ancestors = find_present_ancestors(revision_a, revision_source)
167
b_ancestors = find_present_ancestors(revision_b, revision_source)
170
# a_order is used as a tie-breaker when two equally-good bases are found
171
for revision, (a_order, a_distance) in a_ancestors.iteritems():
172
if b_ancestors.has_key(revision):
173
a_intersection.append((a_distance, a_order, revision))
174
b_intersection.append((b_ancestors[revision][1], a_order, revision))
175
mutter("a intersection: %r" % a_intersection)
176
mutter("b intersection: %r" % b_intersection)
178
a_closest = __get_closest(a_intersection)
179
if len(a_closest) == 0:
168
revision_source.lock_read()
170
return _revision_graph(revision, revision_source)
172
revision_source.unlock()
175
def _revision_graph(revision, revision_source):
176
"""See revision_graph."""
177
from bzrlib.tsort import topo_sort
178
graph = revision_source.get_revision_graph(revision)
179
# mark all no-parent revisions as being NULL_REVISION parentage.
180
for node, parents in graph.items():
181
if len(parents) == 0:
182
graph[node] = [NULL_REVISION]
183
# add NULL_REVISION to the graph
184
graph[NULL_REVISION] = []
186
# pick a root. If there are multiple roots
187
# this could pick a random one.
188
topo_order = topo_sort(graph.items())
194
# map the descendants of the graph.
195
# and setup our set based return graph.
196
for node in graph.keys():
197
descendants[node] = {}
198
for node, parents in graph.items():
199
for parent in parents:
200
descendants[parent][node] = 1
201
ancestors[node] = set(parents)
203
assert root not in descendants[root]
204
assert root not in ancestors[root]
205
return root, ancestors, descendants
208
def combined_graph(revision_a, revision_b, revision_source):
209
"""Produce a combined ancestry graph.
210
Return graph root, ancestors map, descendants map, set of common nodes"""
211
root, ancestors, descendants = revision_graph(
212
revision_a, revision_source)
213
root_b, ancestors_b, descendants_b = revision_graph(
214
revision_b, revision_source)
216
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
218
for node, node_anc in ancestors_b.iteritems():
219
if node in ancestors:
222
ancestors[node] = set()
223
ancestors[node].update(node_anc)
224
for node, node_dec in descendants_b.iteritems():
225
if node not in descendants:
226
descendants[node] = {}
227
descendants[node].update(node_dec)
228
return root, ancestors, descendants, common
231
def common_ancestor(revision_a, revision_b, revision_source,
233
if None in (revision_a, revision_b):
181
b_closest = __get_closest(b_intersection)
182
assert len(b_closest) != 0
183
mutter ("a_closest %r" % a_closest)
184
mutter ("b_closest %r" % b_closest)
185
if a_closest[0] in b_closest:
187
elif b_closest[0] in a_closest:
190
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
235
# trivial optimisation
236
if revision_a == revision_b:
240
pb.update('Picking ancestor', 1, 3)
241
graph = revision_source.get_revision_graph_with_ghosts(
242
[revision_a, revision_b])
243
# convert to a NULL_REVISION based graph.
244
ancestors = graph.get_ancestors()
245
descendants = graph.get_descendants()
246
common = set(graph.get_ancestry(revision_a)).intersection(
247
set(graph.get_ancestry(revision_b)))
248
descendants[NULL_REVISION] = {}
249
ancestors[NULL_REVISION] = []
250
for root in graph.roots:
251
descendants[NULL_REVISION][root] = 1
252
ancestors[root].append(NULL_REVISION)
253
if len(graph.roots) == 0:
254
# no reachable roots - not handled yet.
255
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
257
common.add(NULL_REVISION)
258
except bzrlib.errors.NoCommonRoot:
259
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
261
pb.update('Picking ancestor', 2, 3)
262
distances = node_distances (descendants, ancestors, root)
263
pb.update('Picking ancestor', 3, 2)
264
farthest = select_farthest(distances, common)
265
if farthest is None or farthest == NULL_REVISION:
266
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
193
272
class MultipleRevisionSources(object):
194
273
"""Proxy that looks in multiple branches for revisions."""
295
def get_revision_graph(self, revision_id):
296
# we could probe incrementally until the pending
297
# ghosts list stop growing, but its cheaper for now
298
# to just ask for the complete graph for each repository.
300
for source in self._revision_sources:
301
ghost_graph = source.get_revision_graph_with_ghosts()
302
graphs.append(ghost_graph)
305
if not revision_id in graph.get_ancestors():
307
if absent == len(graphs):
308
raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
312
pending = set([revision_id])
313
def find_parents(node_id):
314
"""find the parents for node_id."""
316
ancestors = graph.get_ancestors()
318
return ancestors[node_id]
321
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
323
# all the graphs should have identical parent lists
324
node_id = pending.pop()
326
result[node_id] = find_parents(node_id)
327
for parent_node in result[node_id]:
328
if not parent_node in result:
329
pending.add(parent_node)
330
except errors.NoSuchRevision:
335
def get_revision_graph_with_ghosts(self, revision_ids):
336
# query all the sources for their entire graphs
337
# and then build a combined graph for just
340
for source in self._revision_sources:
341
ghost_graph = source.get_revision_graph_with_ghosts()
342
graphs.append(ghost_graph.get_ancestors())
343
for revision_id in revision_ids:
346
if not revision_id in graph:
348
if absent == len(graphs):
349
raise errors.NoSuchRevision(self._revision_sources[0],
354
pending = set(revision_ids)
356
def find_parents(node_id):
357
"""find the parents for node_id."""
360
return graph[node_id]
363
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
365
# all the graphs should have identical parent lists
366
node_id = pending.pop()
368
parents = find_parents(node_id)
369
for parent_node in parents:
371
if (parent_node not in pending and
372
parent_node not in done):
374
pending.add(parent_node)
375
result.add_node(node_id, parents)
377
except errors.NoSuchRevision:
379
result.add_ghost(node_id)
384
for source in self._revision_sources:
388
for source in self._revision_sources:
208
392
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
209
393
revision_history=None):
210
394
"""Find the longest line of descent from maybe_ancestor to revision.
214
398
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
215
399
If ancestor_id is not an ancestor, NotAncestor will be thrown
217
[rev_source.get_revision(r) for r in (ancestor_id, rev_id)]
218
if ancestor_id == rev_id:
220
def historical_lines(line):
221
"""Return a tuple of historical/non_historical lines, for sorting.
222
The non_historical count is negative, since non_historical lines are
227
for revision in line:
228
if revision in revision_history:
232
return good_count, bad_count
234
successful_lines = []
235
while len(active) > 0:
238
parent_ids = [p.revision_id for p in
239
rev_source.get_revision(line[-1]).parents]
240
for parent in parent_ids:
242
if parent == ancestor_id:
243
successful_lines.append(line_copy)
245
line_copy.append(parent)
246
new_active.append(line_copy)
248
if len(successful_lines) == 0:
249
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
250
for line in successful_lines:
252
if revision_history is not None:
253
by_historical_lines = []
254
for line in successful_lines:
255
count = historical_lines(line)
256
by_historical_lines.append((count, line))
257
by_historical_lines.sort()
258
if by_historical_lines[-1][0][0] > 0:
259
return by_historical_lines[-1][1]
260
assert len(successful_lines)
261
successful_lines.sort(cmp, len)
262
return successful_lines[-1]
401
root, ancestors, descendants = revision_graph(rev_id, rev_source)
402
if len(descendants) == 0:
403
raise NoSuchRevision(rev_source, rev_id)
404
if ancestor_id not in descendants:
405
rev_source.get_revision(ancestor_id)
406
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
407
root_descendants = all_descendants(descendants, ancestor_id)
408
root_descendants.add(ancestor_id)
409
if rev_id not in root_descendants:
410
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
411
distances = node_distances(descendants, ancestors, ancestor_id,
412
root_descendants=root_descendants)
414
def best_ancestor(rev_id):
416
for anc_id in ancestors[rev_id]:
418
distance = distances[anc_id]
421
if revision_history is not None and anc_id in revision_history:
423
elif best is None or distance > best[1]:
424
best = (anc_id, distance)
429
while next != ancestor_id:
431
next = best_ancestor(next)
added
removed
bzrlib/revision.py
