1
1
# Copyright (C) 2005 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
205
192
cut_revs = which_revs[(start_revision-1):(end_revision)]
196
# convert the revision history to a dictionary:
197
rev_nos = dict((k, v) for v, k in cut_revs)
208
199
# override the mainline to look like the revision history.
209
200
mainline_revs = [revision_id for index, revision_id in cut_revs]
210
201
if cut_revs[0][0] == 1:
211
202
mainline_revs.insert(0, None)
213
204
mainline_revs.insert(0, which_revs[start_revision-2][1])
215
merge_sorted_revisions = merge_sort(
216
branch.repository.get_revision_graph(mainline_revs[-1]),
220
if direction == 'reverse':
222
elif direction == 'forward':
223
# forward means oldest first.
224
merge_sorted_revisions.reverse()
205
if getattr(lf, 'show_merge', None) is not None:
206
include_merges = True
226
raise ValueError('invalid direction %r' % direction)
228
revision_history = branch.revision_history()
230
# convert the revision history to a dictionary:
232
for index, rev_id in cut_revs:
233
rev_nos[rev_id] = index
235
revisions = branch.repository.get_revisions([r for s, r, m, e in
236
merge_sorted_revisions])
208
include_merges = False
209
view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
210
direction, include_merges=include_merges))
212
def iter_revisions():
213
# r = revision, n = revno, d = merge depth
214
revision_ids = [r for r, n, d in view_revisions]
215
zeros = set(r for r, n, d in view_revisions if d == 0)
217
repository = branch.repository
220
revisions = repository.get_revisions(revision_ids[:num])
221
if verbose or specific_fileid:
222
delta_revisions = [r for r in revisions if
223
r.revision_id in zeros]
224
deltas = repository.get_deltas_for_revisions(delta_revisions)
225
cur_deltas = dict(izip((r.revision_id for r in
226
delta_revisions), deltas))
227
for revision in revisions:
228
# The delta value will be None unless
229
# 1. verbose or specific_fileid is specified, and
230
# 2. the revision is a mainline revision
231
yield revision, cur_deltas.get(revision.revision_id)
232
revision_ids = revision_ids[num:]
238
235
# now we just print all the revisions
239
for ((sequence, rev_id, merge_depth, end_of_merge), rev) in \
240
zip(merge_sorted_revisions, revisions):
236
for ((rev_id, revno, merge_depth), (rev, delta)) in \
237
izip(view_revisions, iter_revisions()):
243
240
if not searchRE.search(rev.message):
256
251
# although we calculated it, throw it away without display
259
lf.show(rev_nos[rev_id], rev, delta)
260
elif hasattr(lf, 'show_merge'):
254
lf.show(revno, rev, delta)
261
256
lf.show_merge(rev, merge_depth)
264
def deltas_for_log_dummy(branch, which_revs):
265
"""Return all the revisions without intermediate deltas.
267
Useful for log commands that won't need the delta information.
270
for revno, revision_id in which_revs:
271
yield revno, branch.get_revision(revision_id), None
274
def deltas_for_log_reverse(branch, which_revs):
275
"""Compute deltas for display in latest-to-earliest order.
281
Sequence of (revno, revision_id) for the subset of history to examine
284
Sequence of (revno, rev, delta)
286
The delta is from the given revision to the next one in the
287
sequence, which makes sense if the log is being displayed from
290
last_revno = last_revision_id = last_tree = None
291
for revno, revision_id in which_revs:
292
this_tree = branch.revision_tree(revision_id)
293
this_revision = branch.get_revision(revision_id)
296
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
298
this_tree = EmptyTree(branch.get_root_id())
301
last_revision = this_revision
302
last_tree = this_tree
306
this_tree = EmptyTree(branch.get_root_id())
259
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
260
include_merges=True):
261
"""Produce an iterator of revisions to show
262
:return: an iterator of (revision_id, revno, merge_depth)
263
(if there is no revno for a revision, None is supplied)
265
if include_merges is False:
266
revision_ids = mainline_revs[1:]
267
if direction == 'reverse':
268
revision_ids.reverse()
269
for revision_id in revision_ids:
270
yield revision_id, rev_nos[revision_id], 0
272
merge_sorted_revisions = merge_sort(
273
branch.repository.get_revision_graph(mainline_revs[-1]),
277
if direction == 'forward':
278
# forward means oldest first.
279
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
280
elif direction != 'reverse':
281
raise ValueError('invalid direction %r' % direction)
283
revision_history = branch.revision_history()
285
for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
286
yield rev_id, rev_nos.get(rev_id), merge_depth
289
def reverse_by_depth(merge_sorted_revisions, _depth=0):
290
"""Reverse revisions by depth.
292
Revisions with a different depth are sorted as a group with the previous
293
revision of that depth. There may be no topological justification for this,
294
but it looks much nicer.
297
for val in merge_sorted_revisions:
299
zd_revisions.append([val])
308
this_revno = last_revno - 1
309
this_revision_id = branch.revision_history()[this_revno]
310
this_tree = branch.revision_tree(this_revision_id)
311
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
314
def deltas_for_log_forward(branch, which_revs):
315
"""Compute deltas for display in forward log.
317
Given a sequence of (revno, revision_id) pairs, return
320
The delta is from the given revision to the next one in the
321
sequence, which makes sense if the log is being displayed from
324
last_revno = last_revision_id = last_tree = None
325
prev_tree = EmptyTree(branch.get_root_id())
327
for revno, revision_id in which_revs:
328
this_tree = branch.revision_tree(revision_id)
329
this_revision = branch.get_revision(revision_id)
333
last_tree = EmptyTree(branch.get_root_id())
335
last_revno = revno - 1
336
last_revision_id = branch.revision_history()[last_revno]
337
last_tree = branch.revision_tree(last_revision_id)
339
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
342
last_revision = this_revision
343
last_tree = this_tree
301
assert val[2] > _depth
302
zd_revisions[-1].append(val)
303
for revisions in zd_revisions:
304
if len(revisions) > 1:
305
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
306
zd_revisions.reverse()
308
for chunk in zd_revisions:
346
313
class LogFormatter(object):
added
removed
bzrlib/log.py
