141
173
If not None, only show revisions <= end_revision
176
If not None, only show revisions with matching commit messages
179
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
183
if getattr(lf, 'begin_log', None):
186
_show_log(branch, lf, specific_fileid, verbose, direction,
187
start_revision, end_revision, search, limit)
189
if getattr(lf, 'end_log', None):
194
def _show_log(branch,
196
specific_fileid=None,
203
"""Worker function for show_log - see show_log."""
149
204
if not isinstance(lf, LogFormatter):
150
205
warn("not a LogFormatter instance: %r" % lf)
152
207
if specific_fileid:
153
mutter('get log for file_id %r' % specific_fileid)
208
mutter('get log for file_id %r', specific_fileid)
155
210
if search is not None:
157
211
searchRE = re.compile(search, re.IGNORECASE)
215
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
216
_get_mainline_revs(branch, start_revision, end_revision)
217
if not mainline_revs:
220
if direction == 'reverse':
221
start_rev_id, end_rev_id = end_rev_id, start_rev_id
223
legacy_lf = getattr(lf, 'log_revision', None) is None
225
# pre-0.17 formatters use show for mainline revisions.
226
# how should we show merged revisions ?
227
# pre-0.11 api: show_merge
228
# 0.11-0.16 api: show_merge_revno
229
show_merge_revno = getattr(lf, 'show_merge_revno', None)
230
show_merge = getattr(lf, 'show_merge', None)
231
if show_merge is None and show_merge_revno is None:
232
# no merged-revno support
233
generate_merge_revisions = False
235
generate_merge_revisions = True
236
# tell developers to update their code
237
symbol_versioning.warn('LogFormatters should provide log_revision '
238
'instead of show and show_merge_revno since bzr 0.17.',
239
DeprecationWarning, stacklevel=3)
241
generate_merge_revisions = getattr(lf, 'supports_merge_revisions',
243
generate_single_revision = False
244
if ((not generate_merge_revisions)
245
and ((start_rev_id and (start_rev_id not in rev_nos))
246
or (end_rev_id and (end_rev_id not in rev_nos)))):
247
generate_single_revision = ((start_rev_id == end_rev_id)
248
and getattr(lf, 'supports_single_merge_revision', False))
249
if not generate_single_revision:
250
raise BzrCommandError('Selected log formatter only supports '
251
'mainline revisions.')
252
generate_merge_revisions = generate_single_revision
253
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
254
direction, include_merges=generate_merge_revisions)
255
view_revisions = _filter_revision_range(list(view_revs_iter),
258
if view_revisions and generate_single_revision:
259
view_revisions = view_revisions[0:1]
261
view_revisions = _filter_revisions_touching_file_id(branch,
266
# rebase merge_depth - unless there are no revisions or
267
# either the first or last revision have merge_depth = 0.
268
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
269
min_depth = min([d for r,n,d in view_revisions])
271
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
274
generate_tags = getattr(lf, 'supports_tags', False)
276
if branch.supports_tags():
277
rev_tag_dict = branch.tags.get_reverse_tag_dict()
279
generate_delta = verbose and getattr(lf, 'supports_delta', False)
281
def iter_revisions():
282
# r = revision, n = revno, d = merge depth
283
revision_ids = [r for r, n, d in view_revisions]
285
repository = branch.repository
288
revisions = repository.get_revisions(revision_ids[:num])
290
deltas = repository.get_deltas_for_revisions(revisions)
291
cur_deltas = dict(izip((r.revision_id for r in revisions),
293
for revision in revisions:
294
yield revision, cur_deltas.get(revision.revision_id)
295
revision_ids = revision_ids[num:]
296
num = min(int(num * 1.5), 200)
298
# now we just print all the revisions
300
for ((rev_id, revno, merge_depth), (rev, delta)) in \
301
izip(view_revisions, iter_revisions()):
304
if not searchRE.search(rev.message):
308
lr = LogRevision(rev, revno, merge_depth, delta,
309
rev_tag_dict.get(rev_id))
312
# support for legacy (pre-0.17) LogFormatters
315
lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
317
lf.show(revno, rev, delta)
319
if show_merge_revno is None:
320
lf.show_merge(rev, merge_depth)
323
lf.show_merge_revno(rev, merge_depth, revno,
324
rev_tag_dict.get(rev_id))
326
lf.show_merge_revno(rev, merge_depth, revno)
329
if log_count >= limit:
333
def _get_mainline_revs(branch, start_revision, end_revision):
334
"""Get the mainline revisions from the branch.
336
Generates the list of mainline revisions for the branch.
338
:param branch: The branch containing the revisions.
340
:param start_revision: The first revision to be logged.
341
For backwards compatibility this may be a mainline integer revno,
342
but for merge revision support a RevisionInfo is expected.
344
:param end_revision: The last revision to be logged.
345
For backwards compatibility this may be a mainline integer revno,
346
but for merge revision support a RevisionInfo is expected.
348
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
161
350
which_revs = _enumerate_history(branch)
352
return None, None, None, None
354
# For mainline generation, map start_revision and end_revision to
355
# mainline revnos. If the revision is not on the mainline choose the
356
# appropriate extreme of the mainline instead - the extra will be
358
# Also map the revisions to rev_ids, to be used in the later filtering
163
361
if start_revision is None:
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
364
if isinstance(start_revision,RevisionInfo):
365
start_rev_id = start_revision.rev_id
366
start_revno = start_revision.revno or 1
368
branch.check_real_revno(start_revision)
369
start_revno = start_revision
168
372
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)
373
end_revno = len(which_revs)
375
if isinstance(end_revision,RevisionInfo):
376
end_rev_id = end_revision.rev_id
377
end_revno = end_revision.revno or len(which_revs)
379
branch.check_real_revno(end_revision)
380
end_revno = end_revision
382
if ((start_rev_id == NULL_REVISION)
383
or (end_rev_id == NULL_REVISION)):
384
raise BzrCommandError('Logging revision 0 is invalid.')
385
if start_revno > end_revno:
386
raise BzrCommandError("Start revision must be older than "
173
389
# 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':
390
cut_revs = which_revs[(start_revno-1):(end_revno)]
392
return None, None, None, None
394
# convert the revision history to a dictionary:
395
rev_nos = dict((k, v) for v, k in cut_revs)
397
# override the mainline to look like the revision history.
398
mainline_revs = [revision_id for index, revision_id in cut_revs]
399
if cut_revs[0][0] == 1:
400
mainline_revs.insert(0, None)
402
mainline_revs.insert(0, which_revs[start_revno-2][1])
403
return mainline_revs, rev_nos, start_rev_id, end_rev_id
406
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
407
"""Filter view_revisions based on revision ranges.
409
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
410
tuples to be filtered.
412
:param start_rev_id: If not NONE specifies the first revision to be logged.
413
If NONE then all revisions up to the end_rev_id are logged.
415
:param end_rev_id: If not NONE specifies the last revision to be logged.
416
If NONE then all revisions up to the end of the log are logged.
418
:return: The filtered view_revisions.
420
if start_rev_id or end_rev_id:
421
revision_ids = [r for r, n, d in view_revisions]
423
start_index = revision_ids.index(start_rev_id)
426
if start_rev_id == end_rev_id:
427
end_index = start_index
430
end_index = revision_ids.index(end_rev_id)
432
end_index = len(view_revisions) - 1
433
# To include the revisions merged into the last revision,
434
# extend end_rev_id down to, but not including, the next rev
435
# with the same or lesser merge_depth
436
end_merge_depth = view_revisions[end_index][2]
438
for index in xrange(end_index+1, len(view_revisions)+1):
439
if view_revisions[index][2] <= end_merge_depth:
440
end_index = index - 1
443
# if the search falls off the end then log to the end as well
444
end_index = len(view_revisions) - 1
445
view_revisions = view_revisions[start_index:end_index+1]
446
return view_revisions
449
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
451
"""Return the list of revision ids which touch a given file id.
453
The function filters view_revisions and returns a subset.
454
This includes the revisions which directly change the file id,
455
and the revisions which merge these changes. So if the
463
And 'C' changes a file, then both C and D will be returned.
465
This will also can be restricted based on a subset of the mainline.
467
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
469
# find all the revisions that change the specific file
470
file_weave = branch.repository.weave_store.get_weave(file_id,
471
branch.repository.get_transaction())
472
weave_modifed_revisions = set(file_weave.versions())
473
# build the ancestry of each revision in the graph
474
# - only listing the ancestors that change the specific file.
475
rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
476
sorted_rev_list = topo_sort(rev_graph)
478
for rev in sorted_rev_list:
479
parents = rev_graph[rev]
480
if rev not in weave_modifed_revisions and len(parents) == 1:
481
# We will not be adding anything new, so just use a reference to
482
# the parent ancestry.
483
rev_ancestry = ancestry[parents[0]]
486
if rev in weave_modifed_revisions:
487
rev_ancestry.add(rev)
488
for parent in parents:
489
rev_ancestry = rev_ancestry.union(ancestry[parent])
490
ancestry[rev] = rev_ancestry
492
def is_merging_rev(r):
493
parents = rev_graph[r]
495
leftparent = parents[0]
496
for rightparent in parents[1:]:
497
if not ancestry[leftparent].issuperset(
498
ancestry[rightparent]):
502
# filter from the view the revisions that did not change or merge
504
return [(r, n, d) for r, n, d in view_revs_iter
505
if r in weave_modifed_revisions or is_merging_rev(r)]
508
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
509
include_merges=True):
510
"""Produce an iterator of revisions to show
511
:return: an iterator of (revision_id, revno, merge_depth)
512
(if there is no revno for a revision, None is supplied)
514
if include_merges is False:
515
revision_ids = mainline_revs[1:]
516
if direction == 'reverse':
517
revision_ids.reverse()
518
for revision_id in revision_ids:
519
yield revision_id, str(rev_nos[revision_id]), 0
521
merge_sorted_revisions = merge_sort(
522
branch.repository.get_revision_graph(mainline_revs[-1]),
527
if direction == 'forward':
528
# forward means oldest first.
529
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
530
elif direction != 'reverse':
181
531
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())
533
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
534
yield rev_id, '.'.join(map(str, revno)), merge_depth
537
def reverse_by_depth(merge_sorted_revisions, _depth=0):
538
"""Reverse revisions by depth.
540
Revisions with a different depth are sorted as a group with the previous
541
revision of that depth. There may be no topological justification for this,
542
but it looks much nicer.
545
for val in merge_sorted_revisions:
547
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
549
assert val[2] > _depth
550
zd_revisions[-1].append(val)
551
for revisions in zd_revisions:
552
if len(revisions) > 1:
553
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
554
zd_revisions.reverse()
556
for chunk in zd_revisions:
561
class LogRevision(object):
562
"""A revision to be logged (by LogFormatter.log_revision).
564
A simple wrapper for the attributes of a revision to be logged.
565
The attributes may or may not be populated, as determined by the
566
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
569
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
573
self.merge_depth = merge_depth
287
578
class LogFormatter(object):
288
"""Abstract class to display log messages."""
579
"""Abstract class to display log messages.
581
At a minimum, a derived class must implement the log_revision method.
583
If the LogFormatter needs to be informed of the beginning or end of
584
a log it should implement the begin_log and/or end_log hook methods.
586
A LogFormatter should define the following supports_XXX flags
587
to indicate which LogRevision attributes it supports:
589
- supports_delta must be True if this log formatter supports delta.
590
Otherwise the delta attribute may not be populated.
591
- supports_merge_revisions must be True if this log formatter supports
592
merge revisions. If not, and if supports_single_merge_revisions is
593
also not True, then only mainline revisions will be passed to the
595
- supports_single_merge_revision must be True if this log formatter
596
supports logging only a single merge revision. This flag is
597
only relevant if supports_merge_revisions is not True.
598
- supports_tags must be True if this log formatter supports tags.
599
Otherwise the tags attribute may not be populated.
289
602
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
603
self.to_file = to_file
291
604
self.show_ids = show_ids
292
605
self.show_timezone = show_timezone
607
# TODO: uncomment this block after show() has been removed.
608
# Until then defining log_revision would prevent _show_log calling show()
609
# in legacy formatters.
610
# def log_revision(self, revision):
613
# :param revision: The LogRevision to be logged.
615
# raise NotImplementedError('not implemented in abstract base')
617
@deprecated_method(zero_seventeen)
295
618
def show(self, revno, rev, delta):
296
619
raise NotImplementedError('not implemented in abstract base')
621
def short_committer(self, rev):
622
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
624
def short_author(self, rev):
625
return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
303
628
class LongLogFormatter(LogFormatter):
304
def show(self, revno, rev, delta):
305
from osutils import format_date
630
supports_merge_revisions = True
631
supports_delta = True
634
@deprecated_method(zero_seventeen)
635
def show(self, revno, rev, delta, tags=None):
636
lr = LogRevision(rev, revno, 0, delta, tags)
637
return self.log_revision(lr)
639
@deprecated_method(zero_seventeen)
640
def show_merge_revno(self, rev, merge_depth, revno, tags=None):
641
"""Show a merged revision rev, with merge_depth and a revno."""
642
lr = LogRevision(rev, revno, merge_depth, tags=tags)
643
return self.log_revision(lr)
645
def log_revision(self, revision):
646
"""Log a revision, either merged or not."""
647
indent = ' ' * revision.merge_depth
307
648
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
649
to_file.write(indent + '-' * 60 + '\n')
650
if revision.revno is not None:
651
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
653
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
311
654
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,
655
to_file.write(indent + 'revision-id:' + revision.rev.revision_id)
657
for parent_id in revision.rev.parent_ids:
658
to_file.write(indent + 'parent: %s\n' % (parent_id,))
660
author = revision.rev.properties.get('author', None)
661
if author is not None:
662
to_file.write(indent + 'author: %s\n' % (author,))
663
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
665
branch_nick = revision.rev.properties.get('branch-nick', None)
666
if branch_nick is not None:
667
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
669
date_str = format_date(revision.rev.timestamp,
670
revision.rev.timezone or 0,
317
671
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
672
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
320
print >>to_file, 'message:'
322
print >>to_file, ' (no message)'
674
to_file.write(indent + 'message:\n')
675
if not revision.rev.message:
676
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)
678
message = revision.rev.message.rstrip('\r\n')
679
for l in message.split('\n'):
680
to_file.write(indent + ' %s\n' % (l,))
681
if revision.delta is not None:
682
revision.delta.show(to_file, self.show_ids, indent=indent)
332
685
class ShortLogFormatter(LogFormatter):
687
supports_delta = True
688
supports_single_merge_revision = True
690
@deprecated_method(zero_seventeen)
333
691
def show(self, revno, rev, delta):
334
from bzrlib.osutils import format_date
692
lr = LogRevision(rev, revno, 0, delta)
693
return self.log_revision(lr)
695
def log_revision(self, revision):
336
696
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,
697
date_str = format_date(revision.rev.timestamp,
698
revision.rev.timezone or 0,
701
if len(revision.rev.parent_ids) > 1:
702
is_merge = ' [merge]'
703
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
704
self.short_author(revision.rev),
705
format_date(revision.rev.timestamp,
706
revision.rev.timezone or 0,
707
self.show_timezone, date_fmt="%Y-%m-%d",
341
710
if self.show_ids:
342
print >>to_file, ' revision-id:', rev.revision_id
344
print >>to_file, ' (no message)'
711
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
712
if not revision.rev.message:
713
to_file.write(' (no message)\n')
346
for l in rev.message.split('\n'):
347
print >>to_file, ' ' + l
715
message = revision.rev.message.rstrip('\r\n')
716
for l in message.split('\n'):
717
to_file.write(' %s\n' % (l,))
349
719
# TODO: Why not show the modified files in a shorter form as
350
720
# well? rewrap them single lines of appropriate length
352
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
358
'short': ShortLogFormatter,
721
if revision.delta is not None:
722
revision.delta.show(to_file, self.show_ids)
726
class LineLogFormatter(LogFormatter):
728
supports_single_merge_revision = True
730
def __init__(self, *args, **kwargs):
731
super(LineLogFormatter, self).__init__(*args, **kwargs)
732
self._max_chars = terminal_width() - 1
734
def truncate(self, str, max_len):
735
if len(str) <= max_len:
737
return str[:max_len-3]+'...'
739
def date_string(self, rev):
740
return format_date(rev.timestamp, rev.timezone or 0,
741
self.show_timezone, date_fmt="%Y-%m-%d",
744
def message(self, rev):
746
return '(no message)'
750
@deprecated_method(zero_seventeen)
751
def show(self, revno, rev, delta):
752
self.to_file.write(self.log_string(revno, rev, terminal_width()-1))
753
self.to_file.write('\n')
755
def log_revision(self, revision):
756
self.to_file.write(self.log_string(revision.revno, revision.rev,
758
self.to_file.write('\n')
760
def log_string(self, revno, rev, max_chars):
761
"""Format log info into one string. Truncate tail of string
762
:param revno: revision number (int) or None.
763
Revision numbers counts from 1.
764
:param rev: revision info object
765
:param max_chars: maximum length of resulting string
766
:return: formatted truncated string
770
# show revno only when is not None
771
out.append("%s:" % revno)
772
out.append(self.truncate(self.short_author(rev), 20))
773
out.append(self.date_string(rev))
774
out.append(rev.get_summary())
775
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
778
def line_log(rev, max_chars):
779
lf = LineLogFormatter(None)
780
return lf.log_string(None, rev, max_chars)
783
class LogFormatterRegistry(registry.Registry):
784
"""Registry for log formatters"""
786
def make_formatter(self, name, *args, **kwargs):
787
"""Construct a formatter from arguments.
789
:param name: Name of the formatter to construct. 'short', 'long' and
792
return self.get(name)(*args, **kwargs)
794
def get_default(self, branch):
795
return self.get(branch.get_config().log_format())
798
log_formatter_registry = LogFormatterRegistry()
801
log_formatter_registry.register('short', ShortLogFormatter,
802
'Moderately short log format')
803
log_formatter_registry.register('long', LongLogFormatter,
804
'Detailed log format')
805
log_formatter_registry.register('line', LineLogFormatter,
806
'Log format with one line per revision')
809
def register_formatter(name, formatter):
810
log_formatter_registry.register(name, formatter)
362
813
def log_formatter(name, *args, **kwargs):
363
from bzrlib.errors import BzrCommandError
814
"""Construct a formatter from arguments.
816
name -- Name of the formatter to construct; currently 'long', 'short' and
817
'line' are supported.
366
return FORMATTERS[name](*args, **kwargs)
820
return log_formatter_registry.make_formatter(name, *args, **kwargs)
368
822
raise BzrCommandError("unknown log formatter: %r" % name)
370
825
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
826
# deprecated; for compatibility
372
827
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
828
lf.show(revno, rev, delta)
831
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
833
"""Show the change in revision history comparing the old revision history to the new one.
835
:param branch: The branch where the revisions exist
836
:param old_rh: The old revision history
837
:param new_rh: The new revision history
838
:param to_file: A file to write the results to. If None, stdout will be used
841
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
843
lf = log_formatter(log_format,
846
show_timezone='original')
848
# This is the first index which is different between
851
for i in xrange(max(len(new_rh),
855
or new_rh[i] != old_rh[i]):
860
to_file.write('Nothing seems to have changed\n')
862
## TODO: It might be nice to do something like show_log
863
## and show the merged entries. But since this is the
864
## removed revisions, it shouldn't be as important
865
if base_idx < len(old_rh):
866
to_file.write('*'*60)
867
to_file.write('\nRemoved Revisions:\n')
868
for i in range(base_idx, len(old_rh)):
869
rev = branch.repository.get_revision(old_rh[i])
870
lr = LogRevision(rev, i+1, 0, None)
872
to_file.write('*'*60)
873
to_file.write('\n\n')
874
if base_idx < len(new_rh):
875
to_file.write('Added Revisions:\n')
881
start_revision=base_idx+1,
882
end_revision=len(new_rh),
added
removed
bzrlib/log.py
