204
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
205
_get_mainline_revs(branch, start_revision, end_revision)
206
if not mainline_revs:
209
if direction == 'reverse':
210
start_rev_id, end_rev_id = end_rev_id, start_rev_id
212
legacy_lf = getattr(lf, 'log_revision', None) is None
214
# pre-0.17 formatters use show for mainline revisions.
215
# how should we show merged revisions ?
216
# pre-0.11 api: show_merge
217
# 0.11-0.16 api: show_merge_revno
218
show_merge_revno = getattr(lf, 'show_merge_revno', None)
219
show_merge = getattr(lf, 'show_merge', None)
220
if show_merge is None and show_merge_revno is None:
221
# no merged-revno support
222
generate_merge_revisions = False
224
generate_merge_revisions = True
225
# tell developers to update their code
226
symbol_versioning.warn('LogFormatters should provide log_revision '
227
'instead of show and show_merge_revno since bzr 0.17.',
228
DeprecationWarning, stacklevel=3)
230
generate_merge_revisions = getattr(lf, 'supports_merge_revisions',
232
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
233
direction, include_merges=generate_merge_revisions)
234
view_revisions = _filter_revision_range(list(view_revs_iter),
238
view_revisions = _filter_revisions_touching_file_id(branch,
243
# rebase merge_depth - unless there are no revisions or
244
# either the first or last revision have merge_depth = 0.
245
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
246
min_depth = min([d for r,n,d in view_revisions])
248
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
251
generate_tags = getattr(lf, 'supports_tags', False)
253
if branch.supports_tags():
254
rev_tag_dict = branch.tags.get_reverse_tag_dict()
256
generate_delta = verbose and getattr(lf, 'supports_delta', False)
258
def iter_revisions():
259
# r = revision, n = revno, d = merge depth
260
revision_ids = [r for r, n, d in view_revisions]
262
repository = branch.repository
265
revisions = repository.get_revisions(revision_ids[:num])
267
deltas = repository.get_deltas_for_revisions(revisions)
268
cur_deltas = dict(izip((r.revision_id for r in revisions),
270
for revision in revisions:
271
yield revision, cur_deltas.get(revision.revision_id)
272
revision_ids = revision_ids[num:]
273
num = min(int(num * 1.5), 200)
275
# now we just print all the revisions
277
for ((rev_id, revno, merge_depth), (rev, delta)) in \
278
izip(view_revisions, iter_revisions()):
281
if not searchRE.search(rev.message):
285
lr = LogRevision(rev, revno, merge_depth, delta,
286
rev_tag_dict.get(rev_id))
289
# support for legacy (pre-0.17) LogFormatters
292
lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
294
lf.show(revno, rev, delta)
296
if show_merge_revno is None:
297
lf.show_merge(rev, merge_depth)
300
lf.show_merge_revno(rev, merge_depth, revno,
301
rev_tag_dict.get(rev_id))
303
lf.show_merge_revno(rev, merge_depth, revno)
306
if log_count >= limit:
310
def _get_mainline_revs(branch, start_revision, end_revision):
311
"""Get the mainline revisions from the branch.
313
Generates the list of mainline revisions for the branch.
315
:param branch: The branch containing the revisions.
317
:param start_revision: The first revision to be logged.
318
For backwards compatibility this may be a mainline integer revno,
319
but for merge revision support a RevisionInfo is expected.
321
:param end_revision: The last revision to be logged.
322
For backwards compatibility this may be a mainline integer revno,
323
but for merge revision support a RevisionInfo is expected.
325
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
192
327
which_revs = _enumerate_history(branch)
329
return None, None, None, None
331
# For mainline generation, map start_revision and end_revision to
332
# mainline revnos. If the revision is not on the mainline choose the
333
# appropriate extreme of the mainline instead - the extra will be
335
# Also map the revisions to rev_ids, to be used in the later filtering
194
338
if start_revision is None:
197
branch.check_real_revno(start_revision)
341
if isinstance(start_revision,RevisionInfo):
342
start_rev_id = start_revision.rev_id
343
start_revno = start_revision.revno or 1
345
branch.check_real_revno(start_revision)
346
start_revno = start_revision
199
349
if end_revision is None:
200
end_revision = len(which_revs)
350
end_revno = len(which_revs)
202
branch.check_real_revno(end_revision)
352
if isinstance(end_revision,RevisionInfo):
353
end_rev_id = end_revision.rev_id
354
end_revno = end_revision.revno or len(which_revs)
356
branch.check_real_revno(end_revision)
357
end_revno = end_revision
359
if start_revno > end_revno:
360
from bzrlib.errors import BzrCommandError
361
raise BzrCommandError("Start revision must be older than "
204
364
# list indexes are 0-based; revisions are 1-based
205
cut_revs = which_revs[(start_revision-1):(end_revision)]
365
cut_revs = which_revs[(start_revno-1):(end_revno)]
367
return None, None, None, None
369
# convert the revision history to a dictionary:
370
rev_nos = dict((k, v) for v, k in cut_revs)
208
372
# override the mainline to look like the revision history.
209
373
mainline_revs = [revision_id for index, revision_id in cut_revs]
210
374
if cut_revs[0][0] == 1:
211
375
mainline_revs.insert(0, None)
213
mainline_revs.insert(0, which_revs[start_revision-2][1])
377
mainline_revs.insert(0, which_revs[start_revno-2][1])
378
return mainline_revs, rev_nos, start_rev_id, end_rev_id
381
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
382
"""Filter view_revisions based on revision ranges.
384
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
385
tuples to be filtered.
387
:param start_rev_id: If not NONE specifies the first revision to be logged.
388
If NONE then all revisions up to the end_rev_id are logged.
390
:param end_rev_id: If not NONE specifies the last revision to be logged.
391
If NONE then all revisions up to the end of the log are logged.
393
:return: The filtered view_revisions.
395
if start_rev_id or end_rev_id:
396
revision_ids = [r for r, n, d in view_revisions]
398
start_index = revision_ids.index(start_rev_id)
401
if start_rev_id == end_rev_id:
402
end_index = start_index
405
end_index = revision_ids.index(end_rev_id)
407
end_index = len(view_revisions) - 1
408
# To include the revisions merged into the last revision,
409
# extend end_rev_id down to, but not including, the next rev
410
# with the same or lesser merge_depth
411
end_merge_depth = view_revisions[end_index][2]
413
for index in xrange(end_index+1, len(view_revisions)+1):
414
if view_revisions[index][2] <= end_merge_depth:
415
end_index = index - 1
418
# if the search falls off the end then log to the end as well
419
end_index = len(view_revisions) - 1
420
view_revisions = view_revisions[start_index:end_index+1]
421
return view_revisions
424
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
426
"""Return the list of revision ids which touch a given file id.
428
The function filters view_revisions and returns a subset.
429
This includes the revisions which directly change the file id,
430
and the revisions which merge these changes. So if the
438
And 'C' changes a file, then both C and D will be returned.
440
This will also can be restricted based on a subset of the mainline.
442
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
444
# find all the revisions that change the specific file
445
file_weave = branch.repository.weave_store.get_weave(file_id,
446
branch.repository.get_transaction())
447
weave_modifed_revisions = set(file_weave.versions())
448
# build the ancestry of each revision in the graph
449
# - only listing the ancestors that change the specific file.
450
rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
451
sorted_rev_list = topo_sort(rev_graph)
453
for rev in sorted_rev_list:
454
parents = rev_graph[rev]
455
if rev not in weave_modifed_revisions and len(parents) == 1:
456
# We will not be adding anything new, so just use a reference to
457
# the parent ancestry.
458
rev_ancestry = ancestry[parents[0]]
461
if rev in weave_modifed_revisions:
462
rev_ancestry.add(rev)
463
for parent in parents:
464
rev_ancestry = rev_ancestry.union(ancestry[parent])
465
ancestry[rev] = rev_ancestry
467
def is_merging_rev(r):
468
parents = rev_graph[r]
470
leftparent = parents[0]
471
for rightparent in parents[1:]:
472
if not ancestry[leftparent].issuperset(
473
ancestry[rightparent]):
477
# filter from the view the revisions that did not change or merge
479
return [(r, n, d) for r, n, d in view_revs_iter
480
if r in weave_modifed_revisions or is_merging_rev(r)]
483
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
484
include_merges=True):
485
"""Produce an iterator of revisions to show
486
:return: an iterator of (revision_id, revno, merge_depth)
487
(if there is no revno for a revision, None is supplied)
489
if include_merges is False:
490
revision_ids = mainline_revs[1:]
491
if direction == 'reverse':
492
revision_ids.reverse()
493
for revision_id in revision_ids:
494
yield revision_id, str(rev_nos[revision_id]), 0
215
496
merge_sorted_revisions = merge_sort(
216
497
branch.repository.get_revision_graph(mainline_revs[-1]),
217
498
mainline_revs[-1],
220
if direction == 'reverse':
222
elif direction == 'forward':
502
if direction == 'forward':
223
503
# forward means oldest first.
224
merge_sorted_revisions.reverse()
504
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
505
elif direction != 'reverse':
226
506
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
# now we just print all the revisions
236
for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
237
rev = branch.repository.get_revision(rev_id)
240
if not searchRE.search(rev.message):
244
# a mainline revision.
245
if verbose or specific_fileid:
246
delta = _get_revision_delta(branch, rev_nos[rev_id])
249
if not delta.touches_file_id(specific_fileid):
253
# although we calculated it, throw it away without display
256
lf.show(rev_nos[rev_id], rev, delta)
257
elif hasattr(lf, 'show_merge'):
258
lf.show_merge(rev, merge_depth)
261
def deltas_for_log_dummy(branch, which_revs):
262
"""Return all the revisions without intermediate deltas.
264
Useful for log commands that won't need the delta information.
267
for revno, revision_id in which_revs:
268
yield revno, branch.get_revision(revision_id), None
271
def deltas_for_log_reverse(branch, which_revs):
272
"""Compute deltas for display in latest-to-earliest order.
278
Sequence of (revno, revision_id) for the subset of history to examine
281
Sequence of (revno, rev, delta)
283
The delta is from the given revision to the next one in the
284
sequence, which makes sense if the log is being displayed from
287
last_revno = last_revision_id = last_tree = None
288
for revno, revision_id in which_revs:
289
this_tree = branch.revision_tree(revision_id)
290
this_revision = branch.get_revision(revision_id)
293
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
295
this_tree = EmptyTree(branch.get_root_id())
298
last_revision = this_revision
299
last_tree = this_tree
303
this_tree = EmptyTree(branch.get_root_id())
508
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
509
yield rev_id, '.'.join(map(str, revno)), merge_depth
512
def reverse_by_depth(merge_sorted_revisions, _depth=0):
513
"""Reverse revisions by depth.
515
Revisions with a different depth are sorted as a group with the previous
516
revision of that depth. There may be no topological justification for this,
517
but it looks much nicer.
520
for val in merge_sorted_revisions:
522
zd_revisions.append([val])
305
this_revno = last_revno - 1
306
this_revision_id = branch.revision_history()[this_revno]
307
this_tree = branch.revision_tree(this_revision_id)
308
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
311
def deltas_for_log_forward(branch, which_revs):
312
"""Compute deltas for display in forward log.
314
Given a sequence of (revno, revision_id) pairs, return
317
The delta is from the given revision to the next one in the
318
sequence, which makes sense if the log is being displayed from
524
assert val[2] > _depth
525
zd_revisions[-1].append(val)
526
for revisions in zd_revisions:
527
if len(revisions) > 1:
528
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
529
zd_revisions.reverse()
531
for chunk in zd_revisions:
536
class LogRevision(object):
537
"""A revision to be logged (by LogFormatter.log_revision).
539
A simple wrapper for the attributes of a revision to be logged.
540
The attributes may or may not be populated, as determined by the
541
logging options and the log formatter capabilities.
321
last_revno = last_revision_id = last_tree = None
322
prev_tree = EmptyTree(branch.get_root_id())
324
for revno, revision_id in which_revs:
325
this_tree = branch.revision_tree(revision_id)
326
this_revision = branch.get_revision(revision_id)
330
last_tree = EmptyTree(branch.get_root_id())
332
last_revno = revno - 1
333
last_revision_id = branch.revision_history()[last_revno]
334
last_tree = branch.revision_tree(last_revision_id)
336
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
339
last_revision = this_revision
340
last_tree = this_tree
544
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
548
self.merge_depth = merge_depth
343
553
class LogFormatter(object):
344
"""Abstract class to display log messages."""
554
"""Abstract class to display log messages.
556
At a minimum, a derived class must implement the log_revision method.
558
If the LogFormatter needs to be informed of the beginning or end of
559
a log it should implement the begin_log and/or end_log hook methods.
561
A LogFormatter should define the following supports_XXX flags
562
to indicate which LogRevision attributes it supports:
564
- supports_delta must be True if this log formatter supports delta.
565
Otherwise the delta attribute may not be populated.
566
- supports_merge_revisions must be True if this log formatter supports
567
merge revisions. If not, only mainline revisions (those
568
with merge_depth == 0) will be passed to the formatter.
569
- supports_tags must be True if this log formatter supports tags.
570
Otherwise the tags attribute may not be populated.
345
573
def __init__(self, to_file, show_ids=False, show_timezone='original'):
346
574
self.to_file = to_file
347
575
self.show_ids = show_ids
348
576
self.show_timezone = show_timezone
578
# TODO: uncomment this block after show() has been removed.
579
# Until then defining log_revision would prevent _show_log calling show()
580
# in legacy formatters.
581
# def log_revision(self, revision):
584
# :param revision: The LogRevision to be logged.
586
# raise NotImplementedError('not implemented in abstract base')
588
@deprecated_method(zero_seventeen)
351
589
def show(self, revno, rev, delta):
352
590
raise NotImplementedError('not implemented in abstract base')
354
592
def short_committer(self, rev):
355
593
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
595
def short_author(self, rev):
596
return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
358
599
class LongLogFormatter(LogFormatter):
359
def show(self, revno, rev, delta):
360
return self._show_helper(revno=revno, rev=rev, delta=delta)
362
def show_merge(self, rev, merge_depth):
363
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
365
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
366
"""Show a revision, either merged or not."""
601
supports_merge_revisions = True
602
supports_delta = True
605
@deprecated_method(zero_seventeen)
606
def show(self, revno, rev, delta, tags=None):
607
lr = LogRevision(rev, revno, 0, delta, tags)
608
return self.log_revision(lr)
610
@deprecated_method(zero_seventeen)
611
def show_merge_revno(self, rev, merge_depth, revno, tags=None):
612
"""Show a merged revision rev, with merge_depth and a revno."""
613
lr = LogRevision(rev, revno, merge_depth, tags=tags)
614
return self.log_revision(lr)
616
def log_revision(self, revision):
617
"""Log a revision, either merged or not."""
367
618
from bzrlib.osutils import format_date
619
indent = ' ' * revision.merge_depth
368
620
to_file = self.to_file
369
print >>to_file, indent+'-' * 60
370
if revno is not None:
371
print >>to_file, 'revno:', revno
373
print >>to_file, indent+'merged:', rev.revision_id
375
print >>to_file, indent+'revision-id:', rev.revision_id
621
print >>to_file, indent + '-' * 60
622
if revision.revno is not None:
623
print >>to_file, indent + 'revno:', revision.revno
625
print >>to_file, indent + 'tags: %s' % (', '.join(revision.tags))
376
626
if self.show_ids:
377
for parent_id in rev.parent_ids:
378
print >>to_file, indent+'parent:', parent_id
379
print >>to_file, indent+'committer:', rev.committer
381
print >>to_file, indent+'branch nick: %s' % \
382
rev.properties['branch-nick']
385
date_str = format_date(rev.timestamp,
627
print >>to_file, indent + 'revision-id:', revision.rev.revision_id
628
for parent_id in revision.rev.parent_ids:
629
print >>to_file, indent + 'parent:', parent_id
631
author = revision.rev.properties.get('author', None)
632
if author is not None:
633
print >>to_file, indent + 'author:', author
634
print >>to_file, indent + 'committer:', revision.rev.committer
636
branch_nick = revision.rev.properties.get('branch-nick', None)
637
if branch_nick is not None:
638
print >>to_file, indent + 'branch nick:', branch_nick
640
date_str = format_date(revision.rev.timestamp,
641
revision.rev.timezone or 0,
387
642
self.show_timezone)
388
print >>to_file, indent+'timestamp: %s' % date_str
643
print >>to_file, indent + 'timestamp: %s' % date_str
390
print >>to_file, indent+'message:'
392
print >>to_file, indent+' (no message)'
645
print >>to_file, indent + 'message:'
646
if not revision.rev.message:
647
print >>to_file, indent + ' (no message)'
394
message = rev.message.rstrip('\r\n')
649
message = revision.rev.message.rstrip('\r\n')
395
650
for l in message.split('\n'):
396
print >>to_file, indent+' ' + l
398
delta.show(to_file, self.show_ids)
651
print >>to_file, indent + ' ' + l
652
if revision.delta is not None:
653
revision.delta.show(to_file, self.show_ids, indent=indent)
401
656
class ShortLogFormatter(LogFormatter):
658
supports_delta = True
660
@deprecated_method(zero_seventeen)
402
661
def show(self, revno, rev, delta):
662
lr = LogRevision(rev, revno, 0, delta)
663
return self.log_revision(lr)
665
def log_revision(self, revision):
403
666
from bzrlib.osutils import format_date
405
668
to_file = self.to_file
406
date_str = format_date(rev.timestamp, rev.timezone or 0,
408
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
409
format_date(rev.timestamp, rev.timezone or 0,
669
date_str = format_date(revision.rev.timestamp,
670
revision.rev.timezone or 0,
673
if len(revision.rev.parent_ids) > 1:
674
is_merge = ' [merge]'
675
print >>to_file, "%5s %s\t%s%s" % (revision.revno,
676
self.short_author(revision.rev),
677
format_date(revision.rev.timestamp,
678
revision.rev.timezone or 0,
410
679
self.show_timezone, date_fmt="%Y-%m-%d",
412
682
if self.show_ids:
413
print >>to_file, ' revision-id:', rev.revision_id
683
print >>to_file, ' revision-id:', revision.rev.revision_id
684
if not revision.rev.message:
415
685
print >>to_file, ' (no message)'
417
message = rev.message.rstrip('\r\n')
687
message = revision.rev.message.rstrip('\r\n')
418
688
for l in message.split('\n'):
419
689
print >>to_file, ' ' + l
421
691
# TODO: Why not show the modified files in a shorter form as
422
692
# well? rewrap them single lines of appropriate length
424
delta.show(to_file, self.show_ids)
693
if revision.delta is not None:
694
revision.delta.show(to_file, self.show_ids)
425
695
print >>to_file, ''
427
698
class LineLogFormatter(LogFormatter):
700
def __init__(self, *args, **kwargs):
701
from bzrlib.osutils import terminal_width
702
super(LineLogFormatter, self).__init__(*args, **kwargs)
703
self._max_chars = terminal_width() - 1
428
705
def truncate(self, str, max_len):
429
706
if len(str) <= max_len:
added
removed
bzrlib/log.py
