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.
21
import bzrlib.errors as errors
22
from bzrlib.graph import node_distances, select_farthest, all_descendants, Graph
23
from bzrlib.osutils import contains_whitespace
24
from bzrlib.progress import DummyProgress
25
from bzrlib.symbol_versioning import (deprecated_function,
19
from bzrlib.graph import farthest_nodes, node_distances, all_descendants
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)
31
45
class Revision(object):
32
46
"""Single revision on a branch.
38
52
After bzr 0.0.5 revisions are allowed to have multiple parents.
41
List of parent revision_ids
44
Dictionary of revision properties. These are attached to the
45
revision as extra metadata. The name must be a single
46
word; the value can be an arbitrary string.
55
List of parent revisions, each is a RevisionReference.
49
def __init__(self, revision_id, properties=None, **args):
50
self.revision_id = revision_id
51
self.properties = properties or {}
52
self._check_properties()
54
self.parent_sha1s = []
55
"""Not used anymore - legacy from for 4."""
65
def __init__(self, **args):
56
66
self.__dict__.update(args)
58
70
def __repr__(self):
59
71
return "<Revision id %s>" % self.revision_id
61
73
def __eq__(self, other):
62
74
if not isinstance(other, Revision):
64
# FIXME: rbc 20050930 parent_ids are not being compared
66
self.inventory_sha1 == other.inventory_sha1
76
return (self.inventory_id == other.inventory_id
77
and self.inventory_sha1 == other.inventory_sha1
67
78
and self.revision_id == other.revision_id
68
79
and self.timestamp == other.timestamp
69
80
and self.message == other.message
70
81
and self.timezone == other.timezone
71
and self.committer == other.committer
72
and self.properties == other.properties)
82
and self.committer == other.committer)
74
84
def __ne__(self, other):
75
85
return not self.__eq__(other)
77
def _check_properties(self):
78
"""Verify that all revision properties are OK.
80
for name, value in self.properties.iteritems():
81
if not isinstance(name, basestring) or contains_whitespace(name):
82
raise ValueError("invalid property name %r" % name)
83
if not isinstance(value, basestring):
84
raise ValueError("invalid property value %r for %r" %
87
def get_history(self, repository):
88
"""Return the canonical line-of-history for this revision.
90
If ghosts are present this may differ in result from a ghost-free
93
current_revision = self
95
while current_revision is not None:
96
reversed_result.append(current_revision.revision_id)
97
if not len (current_revision.parent_ids):
98
reversed_result.append(None)
99
current_revision = None
101
next_revision_id = current_revision.parent_ids[0]
102
current_revision = repository.get_revision(next_revision_id)
103
reversed_result.reverse()
104
return reversed_result
106
def get_summary(self):
107
"""Get the first line of the log message for this revision.
109
return self.message.split('\n', 1)[0]
112
def is_ancestor(revision_id, candidate_id, branch):
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):
113
102
"""Return true if candidate_id is an ancestor of revision_id.
115
103
A false negative will be returned if any intermediate descendent of
116
104
candidate_id is not present in any of the revision_sources.
118
106
revisions_source is an object supporting a get_revision operation that
119
107
behaves like Branch's.
121
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:
124
115
def iter_ancestors(revision_id, revision_source, only_present=False):
125
116
ancestors = (revision_id,)
162
def old_common_ancestor(revision_a, revision_b, revision_source):
163
"""Find the ancestor common to both revisions that is closest to both.
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:
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]))
171
193
def revision_graph(revision, revision_source):
172
194
"""Produce a graph of the ancestry of the specified revision.
174
:return: root, ancestors map, descendants map
195
Return root, ancestors map, descendants map
197
TODO: Produce graphs with the NULL revision as root, so that we can find
198
a common even when trees are not branches don't represent a single line
176
revision_source.lock_read()
178
return _revision_graph(revision, revision_source)
180
revision_source.unlock()
183
def _revision_graph(revision, revision_source):
184
"""See revision_graph."""
185
from bzrlib.tsort import topo_sort
186
graph = revision_source.get_revision_graph(revision)
187
# mark all no-parent revisions as being NULL_REVISION parentage.
188
for node, parents in graph.items():
189
if len(parents) == 0:
190
graph[node] = [NULL_REVISION]
191
# add NULL_REVISION to the graph
192
graph[NULL_REVISION] = []
194
# pick a root. If there are multiple roots
195
# this could pick a random one.
196
topo_order = topo_sort(graph.items())
202
# map the descendants of the graph.
203
# and setup our set based return graph.
204
for node in graph.keys():
205
descendants[node] = {}
206
for node, parents in graph.items():
207
for parent in parents:
208
descendants[parent][node] = 1
209
ancestors[node] = set(parents)
205
descendants[revision] = {}
206
while len(lines) > 0:
210
rev = revision_source.get_revision(line)
211
parents = [p.revision_id for p in rev.parents]
212
if len(parents) == 0:
214
except bzrlib.errors.NoSuchRevision:
218
if parents is not None:
219
for parent in parents:
220
if parent not in ancestors:
221
new_lines.add(parent)
222
if parent not in descendants:
223
descendants[parent] = {}
224
descendants[parent][line] = 1
225
if parents is not None:
226
ancestors[line] = set(parents)
211
228
assert root not in descendants[root]
212
229
assert root not in ancestors[root]
213
230
return root, ancestors, descendants
216
232
def combined_graph(revision_a, revision_b, revision_source):
217
233
"""Produce a combined ancestry graph.
218
234
Return graph root, ancestors map, descendants map, set of common nodes"""
219
root, ancestors, descendants = revision_graph(
220
revision_a, revision_source)
221
root_b, ancestors_b, descendants_b = revision_graph(
222
revision_b, revision_source)
235
root, ancestors, descendants = revision_graph(revision_a, revision_source)
236
root_b, ancestors_b, descendants_b = revision_graph(revision_b,
223
238
if root != root_b:
224
raise errors.NoCommonRoot(revision_a, revision_b)
239
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
226
241
for node, node_anc in ancestors_b.iteritems():
227
242
if node in ancestors:
231
246
ancestors[node].update(node_anc)
232
247
for node, node_dec in descendants_b.iteritems():
233
248
if node not in descendants:
234
descendants[node] = {}
249
descendants[node] = set()
235
250
descendants[node].update(node_dec)
236
251
return root, ancestors, descendants, common
239
def common_ancestor(revision_a, revision_b, revision_source,
241
if None in (revision_a, revision_b):
243
# trivial optimisation
244
if revision_a == revision_b:
253
def common_ancestor(revision_a, revision_b, revision_source):
248
pb.update('Picking ancestor', 1, 3)
249
graph = revision_source.get_revision_graph_with_ghosts(
250
[revision_a, revision_b])
251
# convert to a NULL_REVISION based graph.
252
ancestors = graph.get_ancestors()
253
descendants = graph.get_descendants()
254
common = set(graph.get_ancestry(revision_a)).intersection(
255
set(graph.get_ancestry(revision_b)))
256
descendants[NULL_REVISION] = {}
257
ancestors[NULL_REVISION] = []
258
for root in graph.roots:
259
descendants[NULL_REVISION][root] = 1
260
ancestors[root].append(NULL_REVISION)
261
for ghost in graph.ghosts:
262
# ghosts act as roots for the purpose of finding
263
# the longest paths from the root: any ghost *might*
264
# be directly attached to the root, so we treat them
266
# ghost now descends from NULL
267
descendants[NULL_REVISION][ghost] = 1
268
# that is it has an ancestor of NULL
269
ancestors[ghost] = [NULL_REVISION]
270
# ghost is common if any of ghosts descendants are common:
271
for ghost_descendant in descendants[ghost]:
272
if ghost_descendant in common:
276
common.add(NULL_REVISION)
277
except errors.NoCommonRoot:
278
raise errors.NoCommonAncestor(revision_a, revision_b)
280
pb.update('Picking ancestor', 2, 3)
281
distances = node_distances (descendants, ancestors, root)
282
pb.update('Picking ancestor', 3, 2)
283
farthest = select_farthest(distances, common)
284
if farthest is None or farthest == NULL_REVISION:
285
raise errors.NoCommonAncestor(revision_a, revision_b)
255
root, ancestors, descendants, common = \
256
combined_graph(revision_a, revision_b, revision_source)
257
except bzrlib.errors.NoCommonRoot:
258
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
260
nodes = farthest_nodes(descendants, ancestors, root)
264
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
291
266
class MultipleRevisionSources(object):
292
267
"""Proxy that looks in multiple branches for revisions."""
295
270
assert len(args) != 0
296
271
self._revision_sources = args
298
def revision_parents(self, revision_id):
299
for source in self._revision_sources:
301
return source.revision_parents(revision_id)
302
except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
306
273
def get_revision(self, revision_id):
307
274
for source in self._revision_sources:
309
276
return source.get_revision(revision_id)
310
except errors.NoSuchRevision, e:
277
except bzrlib.errors.NoSuchRevision, e:
314
def get_revision_graph(self, revision_id):
315
# we could probe incrementally until the pending
316
# ghosts list stop growing, but its cheaper for now
317
# to just ask for the complete graph for each repository.
319
for source in self._revision_sources:
320
ghost_graph = source.get_revision_graph_with_ghosts()
321
graphs.append(ghost_graph)
324
if not revision_id in graph.get_ancestors():
326
if absent == len(graphs):
327
raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
331
pending = set([revision_id])
332
def find_parents(node_id):
333
"""find the parents for node_id."""
335
ancestors = graph.get_ancestors()
337
return ancestors[node_id]
340
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
342
# all the graphs should have identical parent lists
343
node_id = pending.pop()
345
result[node_id] = find_parents(node_id)
346
for parent_node in result[node_id]:
347
if not parent_node in result:
348
pending.add(parent_node)
349
except errors.NoSuchRevision:
354
def get_revision_graph_with_ghosts(self, revision_ids):
355
# query all the sources for their entire graphs
356
# and then build a combined graph for just
359
for source in self._revision_sources:
360
ghost_graph = source.get_revision_graph_with_ghosts()
361
graphs.append(ghost_graph.get_ancestors())
362
for revision_id in revision_ids:
365
if not revision_id in graph:
367
if absent == len(graphs):
368
raise errors.NoSuchRevision(self._revision_sources[0],
373
pending = set(revision_ids)
375
def find_parents(node_id):
376
"""find the parents for node_id."""
379
return graph[node_id]
382
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
384
# all the graphs should have identical parent lists
385
node_id = pending.pop()
387
parents = find_parents(node_id)
388
for parent_node in parents:
390
if (parent_node not in pending and
391
parent_node not in done):
393
pending.add(parent_node)
394
result.add_node(node_id, parents)
396
except errors.NoSuchRevision:
398
result.add_ghost(node_id)
403
for source in self._revision_sources:
407
for source in self._revision_sources:
411
@deprecated_function(zero_eight)
412
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
281
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
413
282
revision_history=None):
414
283
"""Find the longest line of descent from maybe_ancestor to revision.
415
284
Revision history is followed where possible.
421
290
root, ancestors, descendants = revision_graph(rev_id, rev_source)
422
291
if len(descendants) == 0:
423
raise errors.NoSuchRevision(rev_source, rev_id)
292
raise NoSuchRevision(rev_source, rev_id)
424
293
if ancestor_id not in descendants:
425
294
rev_source.get_revision(ancestor_id)
426
raise errors.NotAncestor(rev_id, ancestor_id)
295
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
427
296
root_descendants = all_descendants(descendants, ancestor_id)
428
297
root_descendants.add(ancestor_id)
429
298
if rev_id not in root_descendants:
430
raise errors.NotAncestor(rev_id, ancestor_id)
299
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
431
300
distances = node_distances(descendants, ancestors, ancestor_id,
432
301
root_descendants=root_descendants)
added
removed
bzrlib/revision.py
