207
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
208
_get_mainline_revs(branch, start_revision, end_revision)
209
if not mainline_revs:
212
if direction == 'reverse':
213
start_rev_id, end_rev_id = end_rev_id, start_rev_id
215
legacy_lf = getattr(lf, 'log_revision', None) is None
217
# pre-0.17 formatters use show for mainline revisions.
218
# how should we show merged revisions ?
219
# pre-0.11 api: show_merge
220
# 0.11-0.16 api: show_merge_revno
221
show_merge_revno = getattr(lf, 'show_merge_revno', None)
222
show_merge = getattr(lf, 'show_merge', None)
223
if show_merge is None and show_merge_revno is None:
224
# no merged-revno support
225
generate_merge_revisions = False
227
generate_merge_revisions = True
228
# tell developers to update their code
229
symbol_versioning.warn('LogFormatters should provide log_revision '
230
'instead of show and show_merge_revno since bzr 0.17.',
231
DeprecationWarning, stacklevel=3)
233
generate_merge_revisions = getattr(lf, 'supports_merge_revisions',
235
if ((not generate_merge_revisions)
236
and ((start_rev_id and (start_rev_id not in rev_nos))
237
or (end_rev_id and (end_rev_id not in rev_nos)))):
238
from bzrlib.errors import BzrCommandError
239
raise BzrCommandError('Selected log formatter only supports '
240
'mainline revisions.')
241
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
242
direction, include_merges=generate_merge_revisions)
243
view_revisions = _filter_revision_range(list(view_revs_iter),
247
view_revisions = _filter_revisions_touching_file_id(branch,
252
# rebase merge_depth - unless there are no revisions or
253
# either the first or last revision have merge_depth = 0.
254
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
255
min_depth = min([d for r,n,d in view_revisions])
257
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
260
generate_tags = getattr(lf, 'supports_tags', False)
262
if branch.supports_tags():
263
rev_tag_dict = branch.tags.get_reverse_tag_dict()
265
generate_delta = verbose and getattr(lf, 'supports_delta', False)
267
def iter_revisions():
268
# r = revision, n = revno, d = merge depth
269
revision_ids = [r for r, n, d in view_revisions]
271
repository = branch.repository
274
revisions = repository.get_revisions(revision_ids[:num])
276
deltas = repository.get_deltas_for_revisions(revisions)
277
cur_deltas = dict(izip((r.revision_id for r in revisions),
279
for revision in revisions:
280
yield revision, cur_deltas.get(revision.revision_id)
281
revision_ids = revision_ids[num:]
282
num = min(int(num * 1.5), 200)
284
# now we just print all the revisions
286
for ((rev_id, revno, merge_depth), (rev, delta)) in \
287
izip(view_revisions, iter_revisions()):
290
if not searchRE.search(rev.message):
294
lr = LogRevision(rev, revno, merge_depth, delta,
295
rev_tag_dict.get(rev_id))
298
# support for legacy (pre-0.17) LogFormatters
301
lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
303
lf.show(revno, rev, delta)
305
if show_merge_revno is None:
306
lf.show_merge(rev, merge_depth)
309
lf.show_merge_revno(rev, merge_depth, revno,
310
rev_tag_dict.get(rev_id))
312
lf.show_merge_revno(rev, merge_depth, revno)
315
if log_count >= limit:
319
def _get_mainline_revs(branch, start_revision, end_revision):
320
"""Get the mainline revisions from the branch.
322
Generates the list of mainline revisions for the branch.
324
:param branch: The branch containing the revisions.
326
:param start_revision: The first revision to be logged.
327
For backwards compatibility this may be a mainline integer revno,
328
but for merge revision support a RevisionInfo is expected.
330
:param end_revision: The last revision to be logged.
331
For backwards compatibility this may be a mainline integer revno,
332
but for merge revision support a RevisionInfo is expected.
334
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
191
336
which_revs = _enumerate_history(branch)
338
return None, None, None, None
340
# For mainline generation, map start_revision and end_revision to
341
# mainline revnos. If the revision is not on the mainline choose the
342
# appropriate extreme of the mainline instead - the extra will be
344
# Also map the revisions to rev_ids, to be used in the later filtering
193
347
if start_revision is None:
196
branch.check_real_revno(start_revision)
350
if isinstance(start_revision,RevisionInfo):
351
start_rev_id = start_revision.rev_id
352
start_revno = start_revision.revno or 1
354
branch.check_real_revno(start_revision)
355
start_revno = start_revision
198
358
if end_revision is None:
199
end_revision = len(which_revs)
359
end_revno = len(which_revs)
201
branch.check_real_revno(end_revision)
361
if isinstance(end_revision,RevisionInfo):
362
end_rev_id = end_revision.rev_id
363
end_revno = end_revision.revno or len(which_revs)
365
branch.check_real_revno(end_revision)
366
end_revno = end_revision
368
if ((start_rev_id == NULL_REVISION)
369
or (end_rev_id == NULL_REVISION)):
370
from bzrlib.errors import BzrCommandError
371
raise BzrCommandError('Logging revision 0 is invalid.')
372
if start_revno > end_revno:
373
from bzrlib.errors import BzrCommandError
374
raise BzrCommandError("Start revision must be older than "
203
377
# list indexes are 0-based; revisions are 1-based
204
cut_revs = which_revs[(start_revision-1):(end_revision)]
206
if direction == 'reverse':
208
elif direction == 'forward':
378
cut_revs = which_revs[(start_revno-1):(end_revno)]
380
return None, None, None, None
382
# convert the revision history to a dictionary:
383
rev_nos = dict((k, v) for v, k in cut_revs)
385
# override the mainline to look like the revision history.
386
mainline_revs = [revision_id for index, revision_id in cut_revs]
387
if cut_revs[0][0] == 1:
388
mainline_revs.insert(0, None)
390
mainline_revs.insert(0, which_revs[start_revno-2][1])
391
return mainline_revs, rev_nos, start_rev_id, end_rev_id
394
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
395
"""Filter view_revisions based on revision ranges.
397
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
398
tuples to be filtered.
400
:param start_rev_id: If not NONE specifies the first revision to be logged.
401
If NONE then all revisions up to the end_rev_id are logged.
403
:param end_rev_id: If not NONE specifies the last revision to be logged.
404
If NONE then all revisions up to the end of the log are logged.
406
:return: The filtered view_revisions.
408
if start_rev_id or end_rev_id:
409
revision_ids = [r for r, n, d in view_revisions]
411
start_index = revision_ids.index(start_rev_id)
414
if start_rev_id == end_rev_id:
415
end_index = start_index
418
end_index = revision_ids.index(end_rev_id)
420
end_index = len(view_revisions) - 1
421
# To include the revisions merged into the last revision,
422
# extend end_rev_id down to, but not including, the next rev
423
# with the same or lesser merge_depth
424
end_merge_depth = view_revisions[end_index][2]
426
for index in xrange(end_index+1, len(view_revisions)+1):
427
if view_revisions[index][2] <= end_merge_depth:
428
end_index = index - 1
431
# if the search falls off the end then log to the end as well
432
end_index = len(view_revisions) - 1
433
view_revisions = view_revisions[start_index:end_index+1]
434
return view_revisions
437
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
439
"""Return the list of revision ids which touch a given file id.
441
The function filters view_revisions and returns a subset.
442
This includes the revisions which directly change the file id,
443
and the revisions which merge these changes. So if the
451
And 'C' changes a file, then both C and D will be returned.
453
This will also can be restricted based on a subset of the mainline.
455
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
457
# find all the revisions that change the specific file
458
file_weave = branch.repository.weave_store.get_weave(file_id,
459
branch.repository.get_transaction())
460
weave_modifed_revisions = set(file_weave.versions())
461
# build the ancestry of each revision in the graph
462
# - only listing the ancestors that change the specific file.
463
rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
464
sorted_rev_list = topo_sort(rev_graph)
466
for rev in sorted_rev_list:
467
parents = rev_graph[rev]
468
if rev not in weave_modifed_revisions and len(parents) == 1:
469
# We will not be adding anything new, so just use a reference to
470
# the parent ancestry.
471
rev_ancestry = ancestry[parents[0]]
474
if rev in weave_modifed_revisions:
475
rev_ancestry.add(rev)
476
for parent in parents:
477
rev_ancestry = rev_ancestry.union(ancestry[parent])
478
ancestry[rev] = rev_ancestry
480
def is_merging_rev(r):
481
parents = rev_graph[r]
483
leftparent = parents[0]
484
for rightparent in parents[1:]:
485
if not ancestry[leftparent].issuperset(
486
ancestry[rightparent]):
490
# filter from the view the revisions that did not change or merge
492
return [(r, n, d) for r, n, d in view_revs_iter
493
if r in weave_modifed_revisions or is_merging_rev(r)]
496
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
497
include_merges=True):
498
"""Produce an iterator of revisions to show
499
:return: an iterator of (revision_id, revno, merge_depth)
500
(if there is no revno for a revision, None is supplied)
502
if include_merges is False:
503
revision_ids = mainline_revs[1:]
504
if direction == 'reverse':
505
revision_ids.reverse()
506
for revision_id in revision_ids:
507
yield revision_id, str(rev_nos[revision_id]), 0
509
merge_sorted_revisions = merge_sort(
510
branch.repository.get_revision_graph(mainline_revs[-1]),
515
if direction == 'forward':
516
# forward means oldest first.
517
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
518
elif direction != 'reverse':
211
519
raise ValueError('invalid direction %r' % direction)
213
revision_history = branch.revision_history()
214
for revno, rev_id in cut_revs:
215
if verbose or specific_fileid:
216
delta = _get_revision_delta(branch, revno)
219
if not delta.touches_file_id(specific_fileid):
223
# although we calculated it, throw it away without display
226
rev = branch.get_revision(rev_id)
229
if not searchRE.search(rev.message):
232
lf.show(revno, rev, delta)
233
if hasattr(lf, 'show_merge'):
237
# revno is 1 based, so -2 to get back 1 less.
238
excludes = set(branch.get_ancestry(revision_history[revno - 2]))
239
pending = list(rev.parent_ids)
241
rev_id = pending.pop()
242
if rev_id in excludes:
244
# prevent showing merged revs twice if they multi-path.
247
rev = branch.get_revision(rev_id)
248
except errors.NoSuchRevision:
250
pending.extend(rev.parent_ids)
254
def deltas_for_log_dummy(branch, which_revs):
255
"""Return all the revisions without intermediate deltas.
257
Useful for log commands that won't need the delta information.
260
for revno, revision_id in which_revs:
261
yield revno, branch.get_revision(revision_id), None
264
def deltas_for_log_reverse(branch, which_revs):
265
"""Compute deltas for display in latest-to-earliest order.
271
Sequence of (revno, revision_id) for the subset of history to examine
274
Sequence of (revno, rev, delta)
276
The delta is from the given revision to the next one in the
277
sequence, which makes sense if the log is being displayed from
280
last_revno = last_revision_id = last_tree = None
281
for revno, revision_id in which_revs:
282
this_tree = branch.revision_tree(revision_id)
283
this_revision = branch.get_revision(revision_id)
286
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
288
this_tree = EmptyTree(branch.get_root_id())
291
last_revision = this_revision
292
last_tree = this_tree
296
this_tree = EmptyTree(branch.get_root_id())
521
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
522
yield rev_id, '.'.join(map(str, revno)), merge_depth
525
def reverse_by_depth(merge_sorted_revisions, _depth=0):
526
"""Reverse revisions by depth.
528
Revisions with a different depth are sorted as a group with the previous
529
revision of that depth. There may be no topological justification for this,
530
but it looks much nicer.
533
for val in merge_sorted_revisions:
535
zd_revisions.append([val])
298
this_revno = last_revno - 1
299
this_revision_id = branch.revision_history()[this_revno]
300
this_tree = branch.revision_tree(this_revision_id)
301
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
304
def deltas_for_log_forward(branch, which_revs):
305
"""Compute deltas for display in forward log.
307
Given a sequence of (revno, revision_id) pairs, return
310
The delta is from the given revision to the next one in the
311
sequence, which makes sense if the log is being displayed from
537
assert val[2] > _depth
538
zd_revisions[-1].append(val)
539
for revisions in zd_revisions:
540
if len(revisions) > 1:
541
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
542
zd_revisions.reverse()
544
for chunk in zd_revisions:
549
class LogRevision(object):
550
"""A revision to be logged (by LogFormatter.log_revision).
552
A simple wrapper for the attributes of a revision to be logged.
553
The attributes may or may not be populated, as determined by the
554
logging options and the log formatter capabilities.
314
last_revno = last_revision_id = last_tree = None
315
prev_tree = EmptyTree(branch.get_root_id())
317
for revno, revision_id in which_revs:
318
this_tree = branch.revision_tree(revision_id)
319
this_revision = branch.get_revision(revision_id)
323
last_tree = EmptyTree(branch.get_root_id())
325
last_revno = revno - 1
326
last_revision_id = branch.revision_history()[last_revno]
327
last_tree = branch.revision_tree(last_revision_id)
329
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
332
last_revision = this_revision
333
last_tree = this_tree
557
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
561
self.merge_depth = merge_depth
336
566
class LogFormatter(object):
337
"""Abstract class to display log messages."""
567
"""Abstract class to display log messages.
569
At a minimum, a derived class must implement the log_revision method.
571
If the LogFormatter needs to be informed of the beginning or end of
572
a log it should implement the begin_log and/or end_log hook methods.
574
A LogFormatter should define the following supports_XXX flags
575
to indicate which LogRevision attributes it supports:
577
- supports_delta must be True if this log formatter supports delta.
578
Otherwise the delta attribute may not be populated.
579
- supports_merge_revisions must be True if this log formatter supports
580
merge revisions. If not, only mainline revisions (those
581
with merge_depth == 0) will be passed to the formatter.
582
- supports_tags must be True if this log formatter supports tags.
583
Otherwise the tags attribute may not be populated.
338
586
def __init__(self, to_file, show_ids=False, show_timezone='original'):
339
587
self.to_file = to_file
340
588
self.show_ids = show_ids
341
589
self.show_timezone = show_timezone
591
# TODO: uncomment this block after show() has been removed.
592
# Until then defining log_revision would prevent _show_log calling show()
593
# in legacy formatters.
594
# def log_revision(self, revision):
597
# :param revision: The LogRevision to be logged.
599
# raise NotImplementedError('not implemented in abstract base')
601
@deprecated_method(zero_seventeen)
344
602
def show(self, revno, rev, delta):
345
603
raise NotImplementedError('not implemented in abstract base')
347
605
def short_committer(self, rev):
348
606
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
608
def short_author(self, rev):
609
return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
351
612
class LongLogFormatter(LogFormatter):
352
def show(self, revno, rev, delta):
353
return self._show_helper(revno=revno, rev=rev, delta=delta)
355
def show_merge(self, rev):
356
return self._show_helper(rev=rev, indent=' ', merged=True, delta=None)
358
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
359
"""Show a revision, either merged or not."""
614
supports_merge_revisions = True
615
supports_delta = True
618
@deprecated_method(zero_seventeen)
619
def show(self, revno, rev, delta, tags=None):
620
lr = LogRevision(rev, revno, 0, delta, tags)
621
return self.log_revision(lr)
623
@deprecated_method(zero_seventeen)
624
def show_merge_revno(self, rev, merge_depth, revno, tags=None):
625
"""Show a merged revision rev, with merge_depth and a revno."""
626
lr = LogRevision(rev, revno, merge_depth, tags=tags)
627
return self.log_revision(lr)
629
def log_revision(self, revision):
630
"""Log a revision, either merged or not."""
360
631
from bzrlib.osutils import format_date
632
indent = ' ' * revision.merge_depth
361
633
to_file = self.to_file
362
print >>to_file, indent+'-' * 60
363
if revno is not None:
364
print >>to_file, 'revno:', revno
366
print >>to_file, indent+'merged:', rev.revision_id
368
print >>to_file, indent+'revision-id:', rev.revision_id
634
to_file.write(indent + '-' * 60 + '\n')
635
if revision.revno is not None:
636
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
638
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
369
639
if self.show_ids:
370
for parent_id in rev.parent_ids:
371
print >>to_file, indent+'parent:', parent_id
372
print >>to_file, indent+'committer:', rev.committer
374
print >>to_file, indent+'branch nick: %s' % \
375
rev.properties['branch-nick']
378
date_str = format_date(rev.timestamp,
640
to_file.write(indent + 'revision-id:' + revision.rev.revision_id)
642
for parent_id in revision.rev.parent_ids:
643
to_file.write(indent + 'parent: %s\n' % (parent_id,))
645
author = revision.rev.properties.get('author', None)
646
if author is not None:
647
to_file.write(indent + 'author: %s\n' % (author,))
648
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
650
branch_nick = revision.rev.properties.get('branch-nick', None)
651
if branch_nick is not None:
652
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
654
date_str = format_date(revision.rev.timestamp,
655
revision.rev.timezone or 0,
380
656
self.show_timezone)
381
print >>to_file, indent+'timestamp: %s' % date_str
657
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
383
print >>to_file, indent+'message:'
385
print >>to_file, indent+' (no message)'
659
to_file.write(indent + 'message:\n')
660
if not revision.rev.message:
661
to_file.write(indent + ' (no message)\n')
387
message = rev.message.rstrip('\r\n')
663
message = revision.rev.message.rstrip('\r\n')
388
664
for l in message.split('\n'):
389
print >>to_file, indent+' ' + l
391
delta.show(to_file, self.show_ids)
665
to_file.write(indent + ' %s\n' % (l,))
666
if revision.delta is not None:
667
revision.delta.show(to_file, self.show_ids, indent=indent)
394
670
class ShortLogFormatter(LogFormatter):
672
supports_delta = True
674
@deprecated_method(zero_seventeen)
395
675
def show(self, revno, rev, delta):
676
lr = LogRevision(rev, revno, 0, delta)
677
return self.log_revision(lr)
679
def log_revision(self, revision):
396
680
from bzrlib.osutils import format_date
398
682
to_file = self.to_file
399
date_str = format_date(rev.timestamp, rev.timezone or 0,
401
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
402
format_date(rev.timestamp, rev.timezone or 0,
683
date_str = format_date(revision.rev.timestamp,
684
revision.rev.timezone or 0,
687
if len(revision.rev.parent_ids) > 1:
688
is_merge = ' [merge]'
689
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
690
self.short_author(revision.rev),
691
format_date(revision.rev.timestamp,
692
revision.rev.timezone or 0,
403
693
self.show_timezone, date_fmt="%Y-%m-%d",
405
696
if self.show_ids:
406
print >>to_file, ' revision-id:', rev.revision_id
408
print >>to_file, ' (no message)'
697
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
698
if not revision.rev.message:
699
to_file.write(' (no message)\n')
410
message = rev.message.rstrip('\r\n')
701
message = revision.rev.message.rstrip('\r\n')
411
702
for l in message.split('\n'):
412
print >>to_file, ' ' + l
703
to_file.write(' %s\n' % (l,))
414
705
# TODO: Why not show the modified files in a shorter form as
415
706
# well? rewrap them single lines of appropriate length
417
delta.show(to_file, self.show_ids)
707
if revision.delta is not None:
708
revision.delta.show(to_file, self.show_ids)
420
712
class LineLogFormatter(LogFormatter):
714
def __init__(self, *args, **kwargs):
715
from bzrlib.osutils import terminal_width
716
super(LineLogFormatter, self).__init__(*args, **kwargs)
717
self._max_chars = terminal_width() - 1
421
719
def truncate(self, str, max_len):
422
720
if len(str) <= max_len:
added
removed
bzrlib/log.py
