141
172
If not None, only show revisions <= end_revision
175
If not None, only show revisions with matching commit messages
178
If not None or 0, only show limit revisions
143
from bzrlib.osutils import format_date
144
from bzrlib.errors import BzrCheckError
145
from bzrlib.textui import show_status
147
from warnings import warn
182
if getattr(lf, 'begin_log', None):
185
_show_log(branch, lf, specific_fileid, verbose, direction,
186
start_revision, end_revision, search, limit)
188
if getattr(lf, 'end_log', None):
193
def _show_log(branch,
195
specific_fileid=None,
202
"""Worker function for show_log - see show_log."""
149
203
if not isinstance(lf, LogFormatter):
150
204
warn("not a LogFormatter instance: %r" % lf)
152
206
if specific_fileid:
153
mutter('get log for file_id %r' % specific_fileid)
207
mutter('get log for file_id %r', specific_fileid)
155
209
if search is not None:
157
210
searchRE = re.compile(search, re.IGNORECASE)
214
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
215
_get_mainline_revs(branch, start_revision, end_revision)
216
if not mainline_revs:
219
if direction == 'reverse':
220
start_rev_id, end_rev_id = end_rev_id, start_rev_id
222
legacy_lf = getattr(lf, 'log_revision', None) is None
224
# pre-0.17 formatters use show for mainline revisions.
225
# how should we show merged revisions ?
226
# pre-0.11 api: show_merge
227
# 0.11-0.16 api: show_merge_revno
228
show_merge_revno = getattr(lf, 'show_merge_revno', None)
229
show_merge = getattr(lf, 'show_merge', None)
230
if show_merge is None and show_merge_revno is None:
231
# no merged-revno support
232
generate_merge_revisions = False
234
generate_merge_revisions = True
235
# tell developers to update their code
236
symbol_versioning.warn('LogFormatters should provide log_revision '
237
'instead of show and show_merge_revno since bzr 0.17.',
238
DeprecationWarning, stacklevel=3)
240
generate_merge_revisions = getattr(lf, 'supports_merge_revisions',
242
generate_single_revision = False
243
if ((not generate_merge_revisions)
244
and ((start_rev_id and (start_rev_id not in rev_nos))
245
or (end_rev_id and (end_rev_id not in rev_nos)))):
246
generate_single_revision = ((start_rev_id == end_rev_id)
247
and getattr(lf, 'supports_single_merge_revision', False))
248
if not generate_single_revision:
249
raise errors.BzrCommandError('Selected log formatter only supports '
250
'mainline revisions.')
251
generate_merge_revisions = generate_single_revision
252
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
253
direction, include_merges=generate_merge_revisions)
254
view_revisions = _filter_revision_range(list(view_revs_iter),
257
if view_revisions and generate_single_revision:
258
view_revisions = view_revisions[0:1]
260
view_revisions = _filter_revisions_touching_file_id(branch,
265
# rebase merge_depth - unless there are no revisions or
266
# either the first or last revision have merge_depth = 0.
267
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
268
min_depth = min([d for r,n,d in view_revisions])
270
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
273
generate_tags = getattr(lf, 'supports_tags', False)
275
if branch.supports_tags():
276
rev_tag_dict = branch.tags.get_reverse_tag_dict()
278
generate_delta = verbose and getattr(lf, 'supports_delta', False)
280
def iter_revisions():
281
# r = revision, n = revno, d = merge depth
282
revision_ids = [r for r, n, d in view_revisions]
284
repository = branch.repository
287
revisions = repository.get_revisions(revision_ids[:num])
289
deltas = repository.get_deltas_for_revisions(revisions)
290
cur_deltas = dict(izip((r.revision_id for r in revisions),
292
for revision in revisions:
293
yield revision, cur_deltas.get(revision.revision_id)
294
revision_ids = revision_ids[num:]
295
num = min(int(num * 1.5), 200)
297
# now we just print all the revisions
299
for ((rev_id, revno, merge_depth), (rev, delta)) in \
300
izip(view_revisions, iter_revisions()):
303
if not searchRE.search(rev.message):
307
lr = LogRevision(rev, revno, merge_depth, delta,
308
rev_tag_dict.get(rev_id))
311
# support for legacy (pre-0.17) LogFormatters
314
lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
316
lf.show(revno, rev, delta)
318
if show_merge_revno is None:
319
lf.show_merge(rev, merge_depth)
322
lf.show_merge_revno(rev, merge_depth, revno,
323
rev_tag_dict.get(rev_id))
325
lf.show_merge_revno(rev, merge_depth, revno)
328
if log_count >= limit:
332
def _get_mainline_revs(branch, start_revision, end_revision):
333
"""Get the mainline revisions from the branch.
335
Generates the list of mainline revisions for the branch.
337
:param branch: The branch containing the revisions.
339
:param start_revision: The first revision to be logged.
340
For backwards compatibility this may be a mainline integer revno,
341
but for merge revision support a RevisionInfo is expected.
343
:param end_revision: The last revision to be logged.
344
For backwards compatibility this may be a mainline integer revno,
345
but for merge revision support a RevisionInfo is expected.
347
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
161
349
which_revs = _enumerate_history(branch)
351
return None, None, None, None
353
# For mainline generation, map start_revision and end_revision to
354
# mainline revnos. If the revision is not on the mainline choose the
355
# appropriate extreme of the mainline instead - the extra will be
357
# Also map the revisions to rev_ids, to be used in the later filtering
163
360
if start_revision is None:
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
363
if isinstance(start_revision, revisionspec.RevisionInfo):
364
start_rev_id = start_revision.rev_id
365
start_revno = start_revision.revno or 1
367
branch.check_real_revno(start_revision)
368
start_revno = start_revision
168
371
if end_revision is None:
169
end_revision = len(which_revs)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
372
end_revno = len(which_revs)
374
if isinstance(end_revision, revisionspec.RevisionInfo):
375
end_rev_id = end_revision.rev_id
376
end_revno = end_revision.revno or len(which_revs)
378
branch.check_real_revno(end_revision)
379
end_revno = end_revision
381
if ((start_rev_id == revision.NULL_REVISION)
382
or (end_rev_id == revision.NULL_REVISION)):
383
raise errors.BzrCommandError('Logging revision 0 is invalid.')
384
if start_revno > end_revno:
385
raise errors.BzrCommandError("Start revision must be older than "
173
388
# list indexes are 0-based; revisions are 1-based
174
cut_revs = which_revs[(start_revision-1):(end_revision)]
176
if direction == 'reverse':
178
elif direction == 'forward':
389
cut_revs = which_revs[(start_revno-1):(end_revno)]
391
return None, None, None, None
393
# convert the revision history to a dictionary:
394
rev_nos = dict((k, v) for v, k in cut_revs)
396
# override the mainline to look like the revision history.
397
mainline_revs = [revision_id for index, revision_id in cut_revs]
398
if cut_revs[0][0] == 1:
399
mainline_revs.insert(0, None)
401
mainline_revs.insert(0, which_revs[start_revno-2][1])
402
return mainline_revs, rev_nos, start_rev_id, end_rev_id
405
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
406
"""Filter view_revisions based on revision ranges.
408
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
409
tuples to be filtered.
411
:param start_rev_id: If not NONE specifies the first revision to be logged.
412
If NONE then all revisions up to the end_rev_id are logged.
414
:param end_rev_id: If not NONE specifies the last revision to be logged.
415
If NONE then all revisions up to the end of the log are logged.
417
:return: The filtered view_revisions.
419
if start_rev_id or end_rev_id:
420
revision_ids = [r for r, n, d in view_revisions]
422
start_index = revision_ids.index(start_rev_id)
425
if start_rev_id == end_rev_id:
426
end_index = start_index
429
end_index = revision_ids.index(end_rev_id)
431
end_index = len(view_revisions) - 1
432
# To include the revisions merged into the last revision,
433
# extend end_rev_id down to, but not including, the next rev
434
# with the same or lesser merge_depth
435
end_merge_depth = view_revisions[end_index][2]
437
for index in xrange(end_index+1, len(view_revisions)+1):
438
if view_revisions[index][2] <= end_merge_depth:
439
end_index = index - 1
442
# if the search falls off the end then log to the end as well
443
end_index = len(view_revisions) - 1
444
view_revisions = view_revisions[start_index:end_index+1]
445
return view_revisions
448
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
450
"""Return the list of revision ids which touch a given file id.
452
The function filters view_revisions and returns a subset.
453
This includes the revisions which directly change the file id,
454
and the revisions which merge these changes. So if the
462
And 'C' changes a file, then both C and D will be returned.
464
This will also can be restricted based on a subset of the mainline.
466
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
468
# find all the revisions that change the specific file
469
file_weave = branch.repository.weave_store.get_weave(file_id,
470
branch.repository.get_transaction())
471
weave_modifed_revisions = set(file_weave.versions())
472
# build the ancestry of each revision in the graph
473
# - only listing the ancestors that change the specific file.
474
rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
475
sorted_rev_list = tsort.topo_sort(rev_graph)
477
for rev in sorted_rev_list:
478
parents = rev_graph[rev]
479
if rev not in weave_modifed_revisions and len(parents) == 1:
480
# We will not be adding anything new, so just use a reference to
481
# the parent ancestry.
482
rev_ancestry = ancestry[parents[0]]
485
if rev in weave_modifed_revisions:
486
rev_ancestry.add(rev)
487
for parent in parents:
488
rev_ancestry = rev_ancestry.union(ancestry[parent])
489
ancestry[rev] = rev_ancestry
491
def is_merging_rev(r):
492
parents = rev_graph[r]
494
leftparent = parents[0]
495
for rightparent in parents[1:]:
496
if not ancestry[leftparent].issuperset(
497
ancestry[rightparent]):
501
# filter from the view the revisions that did not change or merge
503
return [(r, n, d) for r, n, d in view_revs_iter
504
if r in weave_modifed_revisions or is_merging_rev(r)]
507
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
508
include_merges=True):
509
"""Produce an iterator of revisions to show
510
:return: an iterator of (revision_id, revno, merge_depth)
511
(if there is no revno for a revision, None is supplied)
513
if include_merges is False:
514
revision_ids = mainline_revs[1:]
515
if direction == 'reverse':
516
revision_ids.reverse()
517
for revision_id in revision_ids:
518
yield revision_id, str(rev_nos[revision_id]), 0
520
merge_sorted_revisions = tsort.merge_sort(
521
branch.repository.get_revision_graph(mainline_revs[-1]),
526
if direction == 'forward':
527
# forward means oldest first.
528
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
529
elif direction != 'reverse':
181
530
raise ValueError('invalid direction %r' % direction)
183
for revno, rev_id in cut_revs:
184
if verbose or specific_fileid:
185
delta = branch.get_revision_delta(revno)
188
if not delta.touches_file_id(specific_fileid):
192
# although we calculated it, throw it away without display
195
rev = branch.get_revision(rev_id)
198
if not searchRE.search(rev.message):
201
lf.show(revno, rev, delta)
205
def deltas_for_log_dummy(branch, which_revs):
206
"""Return all the revisions without intermediate deltas.
208
Useful for log commands that won't need the delta information.
211
for revno, revision_id in which_revs:
212
yield revno, branch.get_revision(revision_id), None
215
def deltas_for_log_reverse(branch, which_revs):
216
"""Compute deltas for display in latest-to-earliest order.
222
Sequence of (revno, revision_id) for the subset of history to examine
225
Sequence of (revno, rev, delta)
227
The delta is from the given revision to the next one in the
228
sequence, which makes sense if the log is being displayed from
231
last_revno = last_revision_id = last_tree = None
232
for revno, revision_id in which_revs:
233
this_tree = branch.revision_tree(revision_id)
234
this_revision = branch.get_revision(revision_id)
237
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
239
this_tree = EmptyTree(branch.get_root_id())
242
last_revision = this_revision
243
last_tree = this_tree
247
this_tree = EmptyTree(branch.get_root_id())
532
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
533
yield rev_id, '.'.join(map(str, revno)), merge_depth
536
def reverse_by_depth(merge_sorted_revisions, _depth=0):
537
"""Reverse revisions by depth.
539
Revisions with a different depth are sorted as a group with the previous
540
revision of that depth. There may be no topological justification for this,
541
but it looks much nicer.
544
for val in merge_sorted_revisions:
546
zd_revisions.append([val])
249
this_revno = last_revno - 1
250
this_revision_id = branch.revision_history()[this_revno]
251
this_tree = branch.revision_tree(this_revision_id)
252
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
255
def deltas_for_log_forward(branch, which_revs):
256
"""Compute deltas for display in forward log.
258
Given a sequence of (revno, revision_id) pairs, return
261
The delta is from the given revision to the next one in the
262
sequence, which makes sense if the log is being displayed from
548
assert val[2] > _depth
549
zd_revisions[-1].append(val)
550
for revisions in zd_revisions:
551
if len(revisions) > 1:
552
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
553
zd_revisions.reverse()
555
for chunk in zd_revisions:
560
class LogRevision(object):
561
"""A revision to be logged (by LogFormatter.log_revision).
563
A simple wrapper for the attributes of a revision to be logged.
564
The attributes may or may not be populated, as determined by the
565
logging options and the log formatter capabilities.
265
last_revno = last_revision_id = last_tree = None
266
prev_tree = EmptyTree(branch.get_root_id())
268
for revno, revision_id in which_revs:
269
this_tree = branch.revision_tree(revision_id)
270
this_revision = branch.get_revision(revision_id)
274
last_tree = EmptyTree(branch.get_root_id())
276
last_revno = revno - 1
277
last_revision_id = branch.revision_history()[last_revno]
278
last_tree = branch.revision_tree(last_revision_id)
280
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
283
last_revision = this_revision
284
last_tree = this_tree
568
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
572
self.merge_depth = merge_depth
287
577
class LogFormatter(object):
288
"""Abstract class to display log messages."""
578
"""Abstract class to display log messages.
580
At a minimum, a derived class must implement the log_revision method.
582
If the LogFormatter needs to be informed of the beginning or end of
583
a log it should implement the begin_log and/or end_log hook methods.
585
A LogFormatter should define the following supports_XXX flags
586
to indicate which LogRevision attributes it supports:
588
- supports_delta must be True if this log formatter supports delta.
589
Otherwise the delta attribute may not be populated.
590
- supports_merge_revisions must be True if this log formatter supports
591
merge revisions. If not, and if supports_single_merge_revisions is
592
also not True, then only mainline revisions will be passed to the
594
- supports_single_merge_revision must be True if this log formatter
595
supports logging only a single merge revision. This flag is
596
only relevant if supports_merge_revisions is not True.
597
- supports_tags must be True if this log formatter supports tags.
598
Otherwise the tags attribute may not be populated.
289
601
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
602
self.to_file = to_file
291
603
self.show_ids = show_ids
292
604
self.show_timezone = show_timezone
606
# TODO: uncomment this block after show() has been removed.
607
# Until then defining log_revision would prevent _show_log calling show()
608
# in legacy formatters.
609
# def log_revision(self, revision):
612
# :param revision: The LogRevision to be logged.
614
# raise NotImplementedError('not implemented in abstract base')
616
@deprecated_method(zero_seventeen)
295
617
def show(self, revno, rev, delta):
296
618
raise NotImplementedError('not implemented in abstract base')
620
def short_committer(self, rev):
621
name, address = config.parse_username(rev.committer)
626
def short_author(self, rev):
627
name, address = config.parse_username(rev.get_apparent_author())
303
633
class LongLogFormatter(LogFormatter):
304
def show(self, revno, rev, delta):
305
from osutils import format_date
635
supports_merge_revisions = True
636
supports_delta = True
639
@deprecated_method(zero_seventeen)
640
def show(self, revno, rev, delta, tags=None):
641
lr = LogRevision(rev, revno, 0, delta, tags)
642
return self.log_revision(lr)
644
@deprecated_method(zero_seventeen)
645
def show_merge_revno(self, rev, merge_depth, revno, tags=None):
646
"""Show a merged revision rev, with merge_depth and a revno."""
647
lr = LogRevision(rev, revno, merge_depth, tags=tags)
648
return self.log_revision(lr)
650
def log_revision(self, revision):
651
"""Log a revision, either merged or not."""
652
indent = ' ' * revision.merge_depth
307
653
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
654
to_file.write(indent + '-' * 60 + '\n')
655
if revision.revno is not None:
656
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
658
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
311
659
if self.show_ids:
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
315
date_str = format_date(rev.timestamp,
660
to_file.write(indent + 'revision-id:' + revision.rev.revision_id)
662
for parent_id in revision.rev.parent_ids:
663
to_file.write(indent + 'parent: %s\n' % (parent_id,))
665
author = revision.rev.properties.get('author', None)
666
if author is not None:
667
to_file.write(indent + 'author: %s\n' % (author,))
668
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
670
branch_nick = revision.rev.properties.get('branch-nick', None)
671
if branch_nick is not None:
672
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
674
date_str = format_date(revision.rev.timestamp,
675
revision.rev.timezone or 0,
317
676
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
677
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
320
print >>to_file, 'message:'
322
print >>to_file, ' (no message)'
679
to_file.write(indent + 'message:\n')
680
if not revision.rev.message:
681
to_file.write(indent + ' (no message)\n')
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
328
delta.show(to_file, self.show_ids)
683
message = revision.rev.message.rstrip('\r\n')
684
for l in message.split('\n'):
685
to_file.write(indent + ' %s\n' % (l,))
686
if revision.delta is not None:
687
revision.delta.show(to_file, self.show_ids, indent=indent)
332
690
class ShortLogFormatter(LogFormatter):
692
supports_delta = True
693
supports_single_merge_revision = True
695
@deprecated_method(zero_seventeen)
333
696
def show(self, revno, rev, delta):
334
from bzrlib.osutils import format_date
697
lr = LogRevision(rev, revno, 0, delta)
698
return self.log_revision(lr)
700
def log_revision(self, revision):
336
701
to_file = self.to_file
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
339
format_date(rev.timestamp, rev.timezone or 0,
702
date_str = format_date(revision.rev.timestamp,
703
revision.rev.timezone or 0,
706
if len(revision.rev.parent_ids) > 1:
707
is_merge = ' [merge]'
708
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
709
self.short_author(revision.rev),
710
format_date(revision.rev.timestamp,
711
revision.rev.timezone or 0,
712
self.show_timezone, date_fmt="%Y-%m-%d",
341
715
if self.show_ids:
342
print >>to_file, ' revision-id:', rev.revision_id
344
print >>to_file, ' (no message)'
716
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
717
if not revision.rev.message:
718
to_file.write(' (no message)\n')
346
for l in rev.message.split('\n'):
347
print >>to_file, ' ' + l
720
message = revision.rev.message.rstrip('\r\n')
721
for l in message.split('\n'):
722
to_file.write(' %s\n' % (l,))
349
724
# TODO: Why not show the modified files in a shorter form as
350
725
# well? rewrap them single lines of appropriate length
352
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
358
'short': ShortLogFormatter,
726
if revision.delta is not None:
727
revision.delta.show(to_file, self.show_ids)
731
class LineLogFormatter(LogFormatter):
733
supports_single_merge_revision = True
735
def __init__(self, *args, **kwargs):
736
super(LineLogFormatter, self).__init__(*args, **kwargs)
737
self._max_chars = terminal_width() - 1
739
def truncate(self, str, max_len):
740
if len(str) <= max_len:
742
return str[:max_len-3]+'...'
744
def date_string(self, rev):
745
return format_date(rev.timestamp, rev.timezone or 0,
746
self.show_timezone, date_fmt="%Y-%m-%d",
749
def message(self, rev):
751
return '(no message)'
755
@deprecated_method(zero_seventeen)
756
def show(self, revno, rev, delta):
757
self.to_file.write(self.log_string(revno, rev, terminal_width()-1))
758
self.to_file.write('\n')
760
def log_revision(self, revision):
761
self.to_file.write(self.log_string(revision.revno, revision.rev,
763
self.to_file.write('\n')
765
def log_string(self, revno, rev, max_chars):
766
"""Format log info into one string. Truncate tail of string
767
:param revno: revision number (int) or None.
768
Revision numbers counts from 1.
769
:param rev: revision info object
770
:param max_chars: maximum length of resulting string
771
:return: formatted truncated string
775
# show revno only when is not None
776
out.append("%s:" % revno)
777
out.append(self.truncate(self.short_author(rev), 20))
778
out.append(self.date_string(rev))
779
out.append(rev.get_summary())
780
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
783
def line_log(rev, max_chars):
784
lf = LineLogFormatter(None)
785
return lf.log_string(None, rev, max_chars)
788
class LogFormatterRegistry(registry.Registry):
789
"""Registry for log formatters"""
791
def make_formatter(self, name, *args, **kwargs):
792
"""Construct a formatter from arguments.
794
:param name: Name of the formatter to construct. 'short', 'long' and
797
return self.get(name)(*args, **kwargs)
799
def get_default(self, branch):
800
return self.get(branch.get_config().log_format())
803
log_formatter_registry = LogFormatterRegistry()
806
log_formatter_registry.register('short', ShortLogFormatter,
807
'Moderately short log format')
808
log_formatter_registry.register('long', LongLogFormatter,
809
'Detailed log format')
810
log_formatter_registry.register('line', LineLogFormatter,
811
'Log format with one line per revision')
814
def register_formatter(name, formatter):
815
log_formatter_registry.register(name, formatter)
362
818
def log_formatter(name, *args, **kwargs):
363
from bzrlib.errors import BzrCommandError
819
"""Construct a formatter from arguments.
821
name -- Name of the formatter to construct; currently 'long', 'short' and
822
'line' are supported.
366
return FORMATTERS[name](*args, **kwargs)
368
raise BzrCommandError("unknown log formatter: %r" % name)
825
return log_formatter_registry.make_formatter(name, *args, **kwargs)
827
raise errors.BzrCommandError("unknown log formatter: %r" % name)
370
830
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
831
# deprecated; for compatibility
372
832
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
833
lf.show(revno, rev, delta)
836
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
838
"""Show the change in revision history comparing the old revision history to the new one.
840
:param branch: The branch where the revisions exist
841
:param old_rh: The old revision history
842
:param new_rh: The new revision history
843
:param to_file: A file to write the results to. If None, stdout will be used
846
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
848
lf = log_formatter(log_format,
851
show_timezone='original')
853
# This is the first index which is different between
856
for i in xrange(max(len(new_rh),
860
or new_rh[i] != old_rh[i]):
865
to_file.write('Nothing seems to have changed\n')
867
## TODO: It might be nice to do something like show_log
868
## and show the merged entries. But since this is the
869
## removed revisions, it shouldn't be as important
870
if base_idx < len(old_rh):
871
to_file.write('*'*60)
872
to_file.write('\nRemoved Revisions:\n')
873
for i in range(base_idx, len(old_rh)):
874
rev = branch.repository.get_revision(old_rh[i])
875
lr = LogRevision(rev, i+1, 0, None)
877
to_file.write('*'*60)
878
to_file.write('\n\n')
879
if base_idx < len(new_rh):
880
to_file.write('Added Revisions:\n')
886
start_revision=base_idx+1,
887
end_revision=len(new_rh),
added
removed
bzrlib/log.py
