71
70
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>
75
159
REVISION_ID_RE = None
84
168
if not REVISION_ID_RE.match(rid):
85
169
raise ValueError("malformed revision-id %r" % rid)
87
def is_ancestor(revision_id, candidate_id, revision_source):
88
"""Return true if candidate_id is an ancestor of revision_id.
89
A false negative will be returned if any intermediate descendent of
90
candidate_id is not present in any of the revision_sources.
92
revisions_source is an object supporting a get_revision operation that
93
behaves like Branch's.
96
for ancestor_id, distance in iter_ancestors(revision_id, revision_source):
97
if ancestor_id == candidate_id:
101
def iter_ancestors(revision_id, revision_source, only_present=False):
102
ancestors = (revision_id,)
104
while len(ancestors) > 0:
106
for ancestor in ancestors:
108
yield ancestor, distance
110
revision = revision_source.get_revision(ancestor)
111
except bzrlib.errors.NoSuchRevision, e:
112
if e.revision == revision_id:
117
yield ancestor, distance
118
new_ancestors.extend([p.revision_id for p in revision.parents])
119
ancestors = new_ancestors
123
def find_present_ancestors(revision_id, revision_source):
124
"""Return the ancestors of a revision present in a branch.
126
It's possible that a branch won't have the complete ancestry of
127
one of its revisions.
131
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
133
for anc_order, (anc_id, anc_distance) in anc_iter:
134
if not found_ancestors.has_key(anc_id):
135
found_ancestors[anc_id] = (anc_order, anc_distance)
136
return found_ancestors
139
def __get_closest(intersection):
142
for entry in intersection:
143
if entry[0] == intersection[0][0]:
144
matches.append(entry[2])
148
def common_ancestor(revision_a, revision_b, revision_source):
149
"""Find the ancestor common to both revisions that is closest to both.
151
from bzrlib.trace import mutter
152
a_ancestors = find_present_ancestors(revision_a, revision_source)
153
b_ancestors = find_present_ancestors(revision_b, revision_source)
156
# a_order is used as a tie-breaker when two equally-good bases are found
157
for revision, (a_order, a_distance) in a_ancestors.iteritems():
158
if b_ancestors.has_key(revision):
159
a_intersection.append((a_distance, a_order, revision))
160
b_intersection.append((b_ancestors[revision][1], a_order, revision))
161
mutter("a intersection: %r" % a_intersection)
162
mutter("b intersection: %r" % b_intersection)
164
a_closest = __get_closest(a_intersection)
165
if len(a_closest) == 0:
167
b_closest = __get_closest(b_intersection)
168
assert len(b_closest) != 0
169
mutter ("a_closest %r" % a_closest)
170
mutter ("b_closest %r" % b_closest)
171
if a_closest[0] in b_closest:
173
elif b_closest[0] in a_closest:
176
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
179
class MultipleRevisionSources(object):
180
"""Proxy that looks in multiple branches for revisions."""
181
def __init__(self, *args):
182
object.__init__(self)
183
assert len(args) != 0
184
self._revision_sources = args
186
def get_revision(self, revision_id):
187
for source in self._revision_sources:
189
return source.get_revision(revision_id)
190
except bzrlib.errors.NoSuchRevision, e:
194
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
195
revision_history=None):
196
"""Find the longest line of descent from maybe_ancestor to revision.
197
Revision history is followed where possible.
199
If ancestor_id == rev_id, list will be empty.
200
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
201
If ancestor_id is not an ancestor, NotAncestor will be thrown
203
[rev_source.get_revision(r) for r in (ancestor_id, rev_id)]
204
if ancestor_id == rev_id:
206
def historical_lines(line):
207
"""Return a tuple of historical/non_historical lines, for sorting.
208
The non_historical count is negative, since non_historical lines are
213
for revision in line:
214
if revision in revision_history:
218
return good_count, bad_count
220
successful_lines = []
221
while len(active) > 0:
224
parent_ids = [p.revision_id for p in
225
rev_source.get_revision(line[-1]).parents]
226
for parent in parent_ids:
228
if parent == ancestor_id:
229
successful_lines.append(line_copy)
231
line_copy.append(parent)
232
new_active.append(line_copy)
234
if len(successful_lines) == 0:
235
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
236
for line in successful_lines:
238
if revision_history is not None:
239
by_historical_lines = []
240
for line in successful_lines:
241
count = historical_lines(line)
242
by_historical_lines.append((count, line))
243
by_historical_lines.sort()
244
if by_historical_lines[-1][0][0] > 0:
245
return by_historical_lines[-1][1]
246
assert len(successful_lines)
247
successful_lines.sort(cmp, len)
248
return successful_lines[-1]
added
removed
bzrlib/revision.py
