1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
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.
25
from bzrlib.deprecated_graph import (
31
from bzrlib.osutils import contains_whitespace
32
from bzrlib.progress import DummyProgress
33
from bzrlib.symbol_versioning import (deprecated_function,
37
CURRENT_REVISION="current:"
40
class Revision(object):
41
"""Single revision on a branch.
43
Revisions may know their revision_hash, but only once they've been
44
written out. This is not stored because you cannot write the hash
45
into the file it describes.
47
After bzr 0.0.5 revisions are allowed to have multiple parents.
50
List of parent revision_ids
53
Dictionary of revision properties. These are attached to the
54
revision as extra metadata. The name must be a single
55
word; the value can be an arbitrary string.
58
def __init__(self, revision_id, properties=None, **args):
59
self.revision_id = revision_id
60
self.properties = properties or {}
61
self._check_properties()
63
self.parent_sha1s = []
64
"""Not used anymore - legacy from for 4."""
65
self.__dict__.update(args)
68
return "<Revision id %s>" % self.revision_id
70
def __eq__(self, other):
71
if not isinstance(other, Revision):
73
# FIXME: rbc 20050930 parent_ids are not being compared
75
self.inventory_sha1 == other.inventory_sha1
76
and self.revision_id == other.revision_id
77
and self.timestamp == other.timestamp
78
and self.message == other.message
79
and self.timezone == other.timezone
80
and self.committer == other.committer
81
and self.properties == other.properties)
83
def __ne__(self, other):
84
return not self.__eq__(other)
86
def _check_properties(self):
87
"""Verify that all revision properties are OK."""
88
for name, value in self.properties.iteritems():
89
if not isinstance(name, basestring) or contains_whitespace(name):
90
raise ValueError("invalid property name %r" % name)
91
if not isinstance(value, basestring):
92
raise ValueError("invalid property value %r for %r" %
95
def get_history(self, repository):
96
"""Return the canonical line-of-history for this revision.
98
If ghosts are present this may differ in result from a ghost-free
101
current_revision = self
103
while current_revision is not None:
104
reversed_result.append(current_revision.revision_id)
105
if not len (current_revision.parent_ids):
106
reversed_result.append(None)
107
current_revision = None
109
next_revision_id = current_revision.parent_ids[0]
110
current_revision = repository.get_revision(next_revision_id)
111
reversed_result.reverse()
112
return reversed_result
114
def get_summary(self):
115
"""Get the first line of the log message for this revision.
117
return self.message.lstrip().split('\n', 1)[0]
119
def get_apparent_author(self):
120
"""Return the apparent author of this revision.
122
If the revision properties contain the author name,
123
return it. Otherwise return the committer name.
125
return self.properties.get('author', self.committer)
128
def is_ancestor(revision_id, candidate_id, branch):
129
"""Return true if candidate_id is an ancestor of revision_id.
131
A false negative will be returned if any intermediate descendent of
132
candidate_id is not present in any of the revision_sources.
134
revisions_source is an object supporting a get_revision operation that
135
behaves like Branch's.
137
if is_null(candidate_id):
139
return branch.repository.get_graph().is_ancestor(candidate_id, revision_id)
142
def iter_ancestors(revision_id, revision_source, only_present=False):
143
ancestors = (revision_id,)
145
while len(ancestors) > 0:
147
for ancestor in ancestors:
149
yield ancestor, distance
151
revision = revision_source.get_revision(ancestor)
152
except errors.NoSuchRevision, e:
153
if e.revision == revision_id:
158
yield ancestor, distance
159
new_ancestors.extend(revision.parent_ids)
160
ancestors = new_ancestors
164
def find_present_ancestors(revision_id, revision_source):
165
"""Return the ancestors of a revision present in a branch.
167
It's possible that a branch won't have the complete ancestry of
168
one of its revisions.
172
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
174
for anc_order, (anc_id, anc_distance) in anc_iter:
175
if anc_id not in found_ancestors:
176
found_ancestors[anc_id] = (anc_order, anc_distance)
177
return found_ancestors
180
def __get_closest(intersection):
183
for entry in intersection:
184
if entry[0] == intersection[0][0]:
185
matches.append(entry[2])
189
def revision_graph(revision, revision_source):
190
"""Produce a graph of the ancestry of the specified revision.
192
:return: root, ancestors map, descendants map
194
revision_source.lock_read()
196
return _revision_graph(revision, revision_source)
198
revision_source.unlock()
201
def _revision_graph(revision, revision_source):
202
"""See revision_graph."""
203
from bzrlib.tsort import topo_sort
204
graph = revision_source.get_revision_graph(revision)
205
# mark all no-parent revisions as being NULL_REVISION parentage.
206
for node, parents in graph.items():
207
if len(parents) == 0:
208
graph[node] = [NULL_REVISION]
209
# add NULL_REVISION to the graph
210
graph[NULL_REVISION] = []
212
# pick a root. If there are multiple roots
213
# this could pick a random one.
214
topo_order = topo_sort(graph.items())
220
# map the descendants of the graph.
221
# and setup our set based return graph.
222
for node in graph.keys():
223
descendants[node] = {}
224
for node, parents in graph.items():
225
for parent in parents:
226
descendants[parent][node] = 1
227
ancestors[node] = set(parents)
229
assert root not in descendants[root]
230
assert root not in ancestors[root]
231
return root, ancestors, descendants
234
def combined_graph(revision_a, revision_b, revision_source):
235
"""Produce a combined ancestry graph.
236
Return graph root, ancestors map, descendants map, set of common nodes"""
237
root, ancestors, descendants = revision_graph(
238
revision_a, revision_source)
239
root_b, ancestors_b, descendants_b = revision_graph(
240
revision_b, revision_source)
242
raise errors.NoCommonRoot(revision_a, revision_b)
244
for node, node_anc in ancestors_b.iteritems():
245
if node in ancestors:
248
ancestors[node] = set()
249
ancestors[node].update(node_anc)
250
for node, node_dec in descendants_b.iteritems():
251
if node not in descendants:
252
descendants[node] = {}
253
descendants[node].update(node_dec)
254
return root, ancestors, descendants, common
257
def common_ancestor(revision_a, revision_b, revision_source,
259
if None in (revision_a, revision_b):
261
if NULL_REVISION in (revision_a, revision_b):
263
# trivial optimisation
264
if revision_a == revision_b:
268
pb.update('Picking ancestor', 1, 3)
269
graph = revision_source.get_revision_graph_with_ghosts(
270
[revision_a, revision_b])
271
# Shortcut the case where one of the tips is already included in
272
# the other graphs ancestry.
273
ancestry_a = graph.get_ancestry(revision_a, topo_sorted=False)
274
if revision_b in ancestry_a:
276
ancestry_b = graph.get_ancestry(revision_b, topo_sorted=False)
277
if revision_a in ancestry_b:
279
# convert to a NULL_REVISION based graph.
280
ancestors = graph.get_ancestors()
281
descendants = graph.get_descendants()
282
common = set(ancestry_a)
283
common.intersection_update(ancestry_b)
284
descendants[NULL_REVISION] = {}
285
ancestors[NULL_REVISION] = []
286
for root in graph.roots:
287
descendants[NULL_REVISION][root] = 1
288
ancestors[root].append(NULL_REVISION)
289
for ghost in graph.ghosts:
290
# ghosts act as roots for the purpose of finding
291
# the longest paths from the root: any ghost *might*
292
# be directly attached to the root, so we treat them
294
# ghost now descends from NULL
295
descendants[NULL_REVISION][ghost] = 1
296
# that is it has an ancestor of NULL
297
ancestors[ghost] = [NULL_REVISION]
298
# ghost is common if any of ghosts descendants are common:
299
for ghost_descendant in descendants[ghost]:
300
if ghost_descendant in common:
304
common.add(NULL_REVISION)
305
except errors.NoCommonRoot:
306
raise errors.NoCommonAncestor(revision_a, revision_b)
308
pb.update('Picking ancestor', 2, 3)
309
distances = node_distances (descendants, ancestors, root)
310
pb.update('Picking ancestor', 3, 2)
311
farthest = select_farthest(distances, common)
312
if farthest is None or farthest == NULL_REVISION:
313
raise errors.NoCommonAncestor(revision_a, revision_b)
319
class MultipleRevisionSources(object):
320
"""Proxy that looks in multiple branches for revisions."""
321
def __init__(self, *args):
322
object.__init__(self)
323
assert len(args) != 0
324
self._revision_sources = args
326
def revision_parents(self, revision_id):
327
for source in self._revision_sources:
329
return source.revision_parents(revision_id)
330
except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
334
def get_revision(self, revision_id):
335
for source in self._revision_sources:
337
return source.get_revision(revision_id)
338
except errors.NoSuchRevision, e:
342
def get_revision_graph(self, revision_id):
343
# we could probe incrementally until the pending
344
# ghosts list stop growing, but its cheaper for now
345
# to just ask for the complete graph for each repository.
347
for source in self._revision_sources:
348
ghost_graph = source.get_revision_graph_with_ghosts()
349
graphs.append(ghost_graph)
352
if not revision_id in graph.get_ancestors():
354
if absent == len(graphs):
355
raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
359
pending = set([revision_id])
360
def find_parents(node_id):
361
"""find the parents for node_id."""
363
ancestors = graph.get_ancestors()
365
return ancestors[node_id]
368
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
370
# all the graphs should have identical parent lists
371
node_id = pending.pop()
373
result[node_id] = find_parents(node_id)
374
for parent_node in result[node_id]:
375
if not parent_node in result:
376
pending.add(parent_node)
377
except errors.NoSuchRevision:
382
def get_revision_graph_with_ghosts(self, revision_ids):
383
# query all the sources for their entire graphs
384
# and then build a combined graph for just
387
for source in self._revision_sources:
388
ghost_graph = source.get_revision_graph_with_ghosts()
389
graphs.append(ghost_graph.get_ancestors())
390
for revision_id in revision_ids:
393
if not revision_id in graph:
395
if absent == len(graphs):
396
raise errors.NoSuchRevision(self._revision_sources[0],
401
pending = set(revision_ids)
403
def find_parents(node_id):
404
"""find the parents for node_id."""
407
return graph[node_id]
410
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
412
# all the graphs should have identical parent lists
413
node_id = pending.pop()
415
parents = find_parents(node_id)
416
for parent_node in parents:
418
if (parent_node not in pending and
419
parent_node not in done):
421
pending.add(parent_node)
422
result.add_node(node_id, parents)
424
except errors.NoSuchRevision:
426
result.add_ghost(node_id)
431
for source in self._revision_sources:
435
for source in self._revision_sources:
439
def is_reserved_id(revision_id):
440
"""Determine whether a revision id is reserved
442
:return: True if the revision is is reserved, False otherwise
444
return isinstance(revision_id, basestring) and revision_id.endswith(':')
447
def check_not_reserved_id(revision_id):
448
"""Raise ReservedId if the supplied revision_id is reserved"""
449
if is_reserved_id(revision_id):
450
raise errors.ReservedId(revision_id)
453
def ensure_null(revision_id):
454
"""Ensure only NULL_REVISION is used to represent the null revision"""
455
if revision_id is None:
456
symbol_versioning.warn('NULL_REVISION should be used for the null'
457
' revision instead of None, as of bzr 0.91.',
458
DeprecationWarning, stacklevel=2)
464
def is_null(revision_id):
465
if revision_id is None:
466
symbol_versioning.warn('NULL_REVISION should be used for the null'
467
' revision instead of None, as of bzr 0.90.',
468
DeprecationWarning, stacklevel=2)
469
return revision_id in (None, NULL_REVISION)
added
removed
bzrlib/revision.py
