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.
20
18
import bzrlib.errors
21
19
from bzrlib.graph import node_distances, select_farthest, all_descendants
22
from bzrlib.osutils import contains_whitespace
24
21
NULL_REVISION="null:"
23
class RevisionReference(object):
25
Reference to a stored revision.
27
Includes the revision_id and revision_sha1.
31
def __init__(self, revision_id, revision_sha1=None):
32
if revision_id == None \
33
or isinstance(revision_id, basestring):
34
self.revision_id = revision_id
36
raise ValueError('bad revision_id %r' % revision_id)
38
if revision_sha1 != None:
39
if isinstance(revision_sha1, basestring) \
40
and len(revision_sha1) == 40:
41
self.revision_sha1 = revision_sha1
43
raise ValueError('bad revision_sha1 %r' % revision_sha1)
26
47
class Revision(object):
27
48
"""Single revision on a branch.
33
54
After bzr 0.0.5 revisions are allowed to have multiple parents.
36
List of parent revision_ids
39
Dictionary of revision properties. These are attached to the
40
revision as extra metadata. The name must be a single
41
word; the value can be an arbitrary string.
57
List of parent revisions, each is a RevisionReference.
44
def __init__(self, revision_id, properties=None, **args):
45
self.revision_id = revision_id
46
self.properties = properties or {}
47
self._check_properties()
49
self.parent_sha1s = []
67
def __init__(self, **args):
50
68
self.__dict__.update(args)
52
72
def __repr__(self):
53
73
return "<Revision id %s>" % self.revision_id
55
75
def __eq__(self, other):
56
76
if not isinstance(other, Revision):
58
# FIXME: rbc 20050930 parent_ids are not being compared
60
self.inventory_sha1 == other.inventory_sha1
78
return (self.inventory_id == other.inventory_id
79
and self.inventory_sha1 == other.inventory_sha1
61
80
and self.revision_id == other.revision_id
62
81
and self.timestamp == other.timestamp
63
82
and self.message == other.message
64
83
and self.timezone == other.timezone
65
and self.committer == other.committer
66
and self.properties == other.properties)
84
and self.committer == other.committer)
68
86
def __ne__(self, other):
69
87
return not self.__eq__(other)
71
def _check_properties(self):
72
"""Verify that all revision properties are OK.
74
for name, value in self.properties.iteritems():
75
if not isinstance(name, basestring) or contains_whitespace(name):
76
raise ValueError("invalid property name %r" % name)
77
if not isinstance(value, basestring):
78
raise ValueError("invalid property value %r for %r" %
82
def is_ancestor(revision_id, candidate_id, branch):
93
def validate_revision_id(rid):
94
"""Check rid is syntactically valid for a revision id."""
96
if not REVISION_ID_RE:
98
REVISION_ID_RE = re.compile('[\w.-]+@[\w.-]+--?\d+--?[0-9a-f]+\Z')
100
if not REVISION_ID_RE.match(rid):
101
raise ValueError("malformed revision-id %r" % rid)
103
def is_ancestor(revision_id, candidate_id, revision_source):
83
104
"""Return true if candidate_id is an ancestor of revision_id.
85
105
A false negative will be returned if any intermediate descendent of
86
106
candidate_id is not present in any of the revision_sources.
88
108
revisions_source is an object supporting a get_revision operation that
89
109
behaves like Branch's.
91
return candidate_id in branch.get_ancestry(revision_id)
111
if candidate_id is None:
113
for ancestor_id, distance in iter_ancestors(revision_id, revision_source):
114
if ancestor_id == candidate_id:
94
118
def iter_ancestors(revision_id, revision_source, only_present=False):
95
119
ancestors = (revision_id,)
151
175
if b_ancestors.has_key(revision):
152
176
a_intersection.append((a_distance, a_order, revision))
153
177
b_intersection.append((b_ancestors[revision][1], a_order, revision))
154
mutter("a intersection: %r", a_intersection)
155
mutter("b intersection: %r", b_intersection)
178
mutter("a intersection: %r" % a_intersection)
179
mutter("b intersection: %r" % b_intersection)
157
181
a_closest = __get_closest(a_intersection)
158
182
if len(a_closest) == 0:
160
184
b_closest = __get_closest(b_intersection)
161
185
assert len(b_closest) != 0
162
mutter ("a_closest %r", a_closest)
163
mutter ("b_closest %r", b_closest)
186
mutter ("a_closest %r" % a_closest)
187
mutter ("b_closest %r" % b_closest)
164
188
if a_closest[0] in b_closest:
165
189
return a_closest[0]
166
190
elif b_closest[0] in a_closest:
176
200
TODO: Produce graphs with the NULL revision as root, so that we can find
177
201
a common even when trees are not branches don't represent a single line
179
RBC: 20051024: note that when we have two partial histories, this may not
180
be possible. But if we are willing to pretend :)... sure.
210
232
if parents is not None:
211
233
ancestors[line] = set(parents)
212
234
lines = new_lines
214
# The history for revision becomes inaccessible without
215
# actually hitting a no-parents revision. This then
216
# makes these asserts below trigger. So, if root is None
217
# determine the actual root by walking the accessible tree
218
# and then stash NULL_REVISION at the end.
220
descendants[root] = {}
221
# for every revision, check we can access at least
222
# one parent, if we cant, add NULL_REVISION and
224
for rev in ancestors:
225
if len(ancestors[rev]) == 0:
226
raise RuntimeError('unreachable code ?!')
228
for parent in ancestors[rev]:
229
if parent in ancestors:
233
descendants[root][rev] = 1
234
ancestors[rev].add(root)
235
ancestors[root] = set()
236
235
assert root not in descendants[root]
237
236
assert root not in ancestors[root]
238
237
return root, ancestors, descendants
241
239
def combined_graph(revision_a, revision_b, revision_source):
242
240
"""Produce a combined ancestry graph.
243
241
Return graph root, ancestors map, descendants map, set of common nodes"""
255
253
ancestors[node].update(node_anc)
256
254
for node, node_dec in descendants_b.iteritems():
257
255
if node not in descendants:
258
descendants[node] = {}
256
descendants[node] = set()
259
257
descendants[node].update(node_dec)
260
258
return root, ancestors, descendants, common
263
260
def common_ancestor(revision_a, revision_b, revision_source):
265
262
root, ancestors, descendants, common = \
added
removed
bzrlib/revision.py
