1
# Copyright (C) 2005, 2006 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# TODO: Some kind of command-line display of revision properties:
17
# TODO: Some kind of command-line display of revision properties:
18
18
# perhaps show them in log -v and allow them as options to the commit command.
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
from bzrlib import deprecated_graph
24
from bzrlib import bugtracker
22
import bzrlib.errors as errors
23
from bzrlib.graph import node_distances, select_farthest, all_descendants, Graph
30
24
from bzrlib.osutils import contains_whitespace
25
from bzrlib.progress import DummyProgress
26
from bzrlib.symbol_versioning import *
32
28
NULL_REVISION="null:"
33
CURRENT_REVISION="current:"
36
30
class Revision(object):
37
31
"""Single revision on a branch.
111
101
reversed_result.reverse()
112
102
return reversed_result
114
def get_summary(self):
115
"""Get the first line of the log message for this revision.
117
Return an empty string if message is None.
120
return self.message.lstrip().split('\n', 1)[0]
124
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((1, 13, 0)))
125
def get_apparent_author(self):
126
"""Return the apparent author of this revision.
128
This method is deprecated in favour of get_apparent_authors.
130
If the revision properties contain any author names,
131
return the first. Otherwise return the committer name.
133
authors = self.get_apparent_authors()
139
def get_apparent_authors(self):
140
"""Return the apparent authors of this revision.
142
If the revision properties contain the names of the authors,
143
return them. Otherwise return the committer name.
145
The return value will be a list containing at least one element.
147
authors = self.properties.get('authors', None)
149
author = self.properties.get('author', self.committer)
154
return authors.split("\n")
157
"""Iterate over the bugs associated with this revision."""
158
bug_property = self.properties.get('bugs', None)
159
if bug_property is None:
161
for line in bug_property.splitlines():
163
url, status = line.split(None, 2)
165
raise errors.InvalidLineInBugsProperty(line)
166
if status not in bugtracker.ALLOWED_BUG_STATUSES:
167
raise errors.InvalidBugStatus(status)
105
def is_ancestor(revision_id, candidate_id, branch):
106
"""Return true if candidate_id is an ancestor of revision_id.
108
A false negative will be returned if any intermediate descendent of
109
candidate_id is not present in any of the revision_sources.
111
revisions_source is an object supporting a get_revision operation that
112
behaves like Branch's.
114
return candidate_id in branch.repository.get_ancestry(revision_id)
171
117
def iter_ancestors(revision_id, revision_source, only_present=False):
194
140
"""Return the ancestors of a revision present in a branch.
196
142
It's possible that a branch won't have the complete ancestry of
197
one of its revisions.
143
one of its revisions.
200
146
found_ancestors = {}
201
147
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
202
148
only_present=True))
203
149
for anc_order, (anc_id, anc_distance) in anc_iter:
204
if anc_id not in found_ancestors:
150
if not found_ancestors.has_key(anc_id):
205
151
found_ancestors[anc_id] = (anc_order, anc_distance)
206
152
return found_ancestors
209
155
def __get_closest(intersection):
210
156
intersection.sort()
212
158
for entry in intersection:
213
159
if entry[0] == intersection[0][0]:
214
160
matches.append(entry[2])
218
def is_reserved_id(revision_id):
219
"""Determine whether a revision id is reserved
221
:return: True if the revision is reserved, False otherwise
164
def revision_graph(revision, revision_source):
165
"""Produce a graph of the ancestry of the specified revision.
167
:return: root, ancestors map, descendants map
223
return isinstance(revision_id, basestring) and revision_id.endswith(':')
226
def check_not_reserved_id(revision_id):
227
"""Raise ReservedId if the supplied revision_id is reserved"""
228
if is_reserved_id(revision_id):
229
raise errors.ReservedId(revision_id)
232
def ensure_null(revision_id):
233
"""Ensure only NULL_REVISION is used to represent the null revision"""
234
if revision_id is None:
235
symbol_versioning.warn('NULL_REVISION should be used for the null'
236
' revision instead of None, as of bzr 0.91.',
237
DeprecationWarning, stacklevel=2)
243
def is_null(revision_id):
244
if revision_id is None:
245
symbol_versioning.warn('NULL_REVISION should be used for the null'
246
' revision instead of None, as of bzr 0.90.',
247
DeprecationWarning, stacklevel=2)
248
return revision_id in (None, NULL_REVISION)
169
revision_source.lock_read()
171
return _revision_graph(revision, revision_source)
173
revision_source.unlock()
176
def _revision_graph(revision, revision_source):
177
"""See revision_graph."""
178
from bzrlib.tsort import topo_sort
179
graph = revision_source.get_revision_graph(revision)
180
# mark all no-parent revisions as being NULL_REVISION parentage.
181
for node, parents in graph.items():
182
if len(parents) == 0:
183
graph[node] = [NULL_REVISION]
184
# add NULL_REVISION to the graph
185
graph[NULL_REVISION] = []
187
# pick a root. If there are multiple roots
188
# this could pick a random one.
189
topo_order = topo_sort(graph.items())
195
# map the descendants of the graph.
196
# and setup our set based return graph.
197
for node in graph.keys():
198
descendants[node] = {}
199
for node, parents in graph.items():
200
for parent in parents:
201
descendants[parent][node] = 1
202
ancestors[node] = set(parents)
204
assert root not in descendants[root]
205
assert root not in ancestors[root]
206
return root, ancestors, descendants
209
def combined_graph(revision_a, revision_b, revision_source):
210
"""Produce a combined ancestry graph.
211
Return graph root, ancestors map, descendants map, set of common nodes"""
212
root, ancestors, descendants = revision_graph(
213
revision_a, revision_source)
214
root_b, ancestors_b, descendants_b = revision_graph(
215
revision_b, revision_source)
217
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
219
for node, node_anc in ancestors_b.iteritems():
220
if node in ancestors:
223
ancestors[node] = set()
224
ancestors[node].update(node_anc)
225
for node, node_dec in descendants_b.iteritems():
226
if node not in descendants:
227
descendants[node] = {}
228
descendants[node].update(node_dec)
229
return root, ancestors, descendants, common
232
def common_ancestor(revision_a, revision_b, revision_source,
234
if None in (revision_a, revision_b):
236
# trivial optimisation
237
if revision_a == revision_b:
241
pb.update('Picking ancestor', 1, 3)
242
graph = revision_source.get_revision_graph_with_ghosts(
243
[revision_a, revision_b])
244
# convert to a NULL_REVISION based graph.
245
ancestors = graph.get_ancestors()
246
descendants = graph.get_descendants()
247
common = set(graph.get_ancestry(revision_a)).intersection(
248
set(graph.get_ancestry(revision_b)))
249
descendants[NULL_REVISION] = {}
250
ancestors[NULL_REVISION] = []
251
for root in graph.roots:
252
descendants[NULL_REVISION][root] = 1
253
ancestors[root].append(NULL_REVISION)
254
for ghost in graph.ghosts:
255
# ghosts act as roots for the purpose of finding
256
# the longest paths from the root: any ghost *might*
257
# be directly attached to the root, so we treat them
259
# ghost now descends from NULL
260
descendants[NULL_REVISION][ghost] = 1
261
# that is it has an ancestor of NULL
262
ancestors[ghost] = [NULL_REVISION]
263
# ghost is common if any of ghosts descendants are common:
264
for ghost_descendant in descendants[ghost]:
265
if ghost_descendant in common:
269
common.add(NULL_REVISION)
270
except bzrlib.errors.NoCommonRoot:
271
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
273
pb.update('Picking ancestor', 2, 3)
274
distances = node_distances (descendants, ancestors, root)
275
pb.update('Picking ancestor', 3, 2)
276
farthest = select_farthest(distances, common)
277
if farthest is None or farthest == NULL_REVISION:
278
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
284
class MultipleRevisionSources(object):
285
"""Proxy that looks in multiple branches for revisions."""
286
def __init__(self, *args):
287
object.__init__(self)
288
assert len(args) != 0
289
self._revision_sources = args
291
def revision_parents(self, revision_id):
292
for source in self._revision_sources:
294
return source.revision_parents(revision_id)
295
except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
299
def get_revision(self, revision_id):
300
for source in self._revision_sources:
302
return source.get_revision(revision_id)
303
except bzrlib.errors.NoSuchRevision, e:
307
def get_revision_graph(self, revision_id):
308
# we could probe incrementally until the pending
309
# ghosts list stop growing, but its cheaper for now
310
# to just ask for the complete graph for each repository.
312
for source in self._revision_sources:
313
ghost_graph = source.get_revision_graph_with_ghosts()
314
graphs.append(ghost_graph)
317
if not revision_id in graph.get_ancestors():
319
if absent == len(graphs):
320
raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
324
pending = set([revision_id])
325
def find_parents(node_id):
326
"""find the parents for node_id."""
328
ancestors = graph.get_ancestors()
330
return ancestors[node_id]
333
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
335
# all the graphs should have identical parent lists
336
node_id = pending.pop()
338
result[node_id] = find_parents(node_id)
339
for parent_node in result[node_id]:
340
if not parent_node in result:
341
pending.add(parent_node)
342
except errors.NoSuchRevision:
347
def get_revision_graph_with_ghosts(self, revision_ids):
348
# query all the sources for their entire graphs
349
# and then build a combined graph for just
352
for source in self._revision_sources:
353
ghost_graph = source.get_revision_graph_with_ghosts()
354
graphs.append(ghost_graph.get_ancestors())
355
for revision_id in revision_ids:
358
if not revision_id in graph:
360
if absent == len(graphs):
361
raise errors.NoSuchRevision(self._revision_sources[0],
366
pending = set(revision_ids)
368
def find_parents(node_id):
369
"""find the parents for node_id."""
372
return graph[node_id]
375
raise errors.NoSuchRevision(self._revision_sources[0], node_id)
377
# all the graphs should have identical parent lists
378
node_id = pending.pop()
380
parents = find_parents(node_id)
381
for parent_node in parents:
383
if (parent_node not in pending and
384
parent_node not in done):
386
pending.add(parent_node)
387
result.add_node(node_id, parents)
389
except errors.NoSuchRevision:
391
result.add_ghost(node_id)
396
for source in self._revision_sources:
400
for source in self._revision_sources: