141
171
If not None, only show revisions <= end_revision
174
If not None, only show revisions with matching commit messages
177
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
181
if getattr(lf, 'begin_log', None):
184
_show_log(branch, lf, specific_fileid, verbose, direction,
185
start_revision, end_revision, search, limit)
187
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)
208
generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
209
allow_single_merge_revision = getattr(lf,
210
'supports_single_merge_revision', False)
211
view_revisions = calculate_view_revisions(branch, start_revision,
212
end_revision, direction,
214
generate_merge_revisions,
215
allow_single_merge_revision)
155
216
if search is not None:
157
217
searchRE = re.compile(search, re.IGNORECASE)
161
which_revs = _enumerate_history(branch)
222
generate_tags = getattr(lf, 'supports_tags', False)
224
if branch.supports_tags():
225
rev_tag_dict = branch.tags.get_reverse_tag_dict()
227
generate_delta = verbose and getattr(lf, 'supports_delta', False)
229
# now we just print all the revisions
231
for (rev_id, revno, merge_depth), rev, delta in _iter_revisions(
232
branch.repository, view_revisions, generate_delta):
234
if not searchRE.search(rev.message):
237
lr = LogRevision(rev, revno, merge_depth, delta,
238
rev_tag_dict.get(rev_id))
242
if log_count >= limit:
246
def calculate_view_revisions(branch, start_revision, end_revision, direction,
247
specific_fileid, generate_merge_revisions,
248
allow_single_merge_revision):
249
if (not generate_merge_revisions and start_revision is end_revision is
250
None and direction == 'reverse' and specific_fileid is None):
251
return _linear_view_revisions(branch)
253
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
254
_get_mainline_revs(branch, start_revision, end_revision)
255
if not mainline_revs:
258
if direction == 'reverse':
259
start_rev_id, end_rev_id = end_rev_id, start_rev_id
261
generate_single_revision = False
262
if ((not generate_merge_revisions)
263
and ((start_rev_id and (start_rev_id not in rev_nos))
264
or (end_rev_id and (end_rev_id not in rev_nos)))):
265
generate_single_revision = ((start_rev_id == end_rev_id)
266
and allow_single_merge_revision)
267
if not generate_single_revision:
268
raise BzrCommandError('Selected log formatter only supports '
269
'mainline revisions.')
270
generate_merge_revisions = generate_single_revision
271
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
272
direction, include_merges=generate_merge_revisions)
273
view_revisions = _filter_revision_range(list(view_revs_iter),
276
if view_revisions and generate_single_revision:
277
view_revisions = view_revisions[0:1]
279
view_revisions = _filter_revisions_touching_file_id(branch,
284
# rebase merge_depth - unless there are no revisions or
285
# either the first or last revision have merge_depth = 0.
286
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
287
min_depth = min([d for r,n,d in view_revisions])
289
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
290
return view_revisions
293
def _linear_view_revisions(branch):
294
start_revno, start_revision_id = branch.last_revision_info()
295
repo = branch.repository
296
revision_ids = repo.iter_reverse_revision_history(start_revision_id)
297
for num, revision_id in enumerate(revision_ids):
298
yield revision_id, str(start_revno - num), 0
301
def _iter_revisions(repository, view_revisions, generate_delta):
303
view_revisions = iter(view_revisions)
305
cur_view_revisions = [d for x, d in zip(range(num), view_revisions)]
306
if len(cur_view_revisions) == 0:
309
# r = revision, n = revno, d = merge depth
310
revision_ids = [r for (r, n, d) in cur_view_revisions]
311
revisions = repository.get_revisions(revision_ids)
313
deltas = repository.get_deltas_for_revisions(revisions)
314
cur_deltas = dict(izip((r.revision_id for r in revisions),
316
for view_data, revision in izip(cur_view_revisions, revisions):
317
yield view_data, revision, cur_deltas.get(revision.revision_id)
318
num = min(int(num * 1.5), 200)
321
def _get_mainline_revs(branch, start_revision, end_revision):
322
"""Get the mainline revisions from the branch.
324
Generates the list of mainline revisions for the branch.
326
:param branch: The branch containing the revisions.
328
:param start_revision: The first revision to be logged.
329
For backwards compatibility this may be a mainline integer revno,
330
but for merge revision support a RevisionInfo is expected.
332
:param end_revision: The last revision to be logged.
333
For backwards compatibility this may be a mainline integer revno,
334
but for merge revision support a RevisionInfo is expected.
336
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
338
branch_revno, branch_last_revision = branch.last_revision_info()
339
if branch_revno == 0:
340
return None, None, None, None
342
# For mainline generation, map start_revision and end_revision to
343
# mainline revnos. If the revision is not on the mainline choose the
344
# appropriate extreme of the mainline instead - the extra will be
346
# Also map the revisions to rev_ids, to be used in the later filtering
163
349
if start_revision is None:
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
352
if isinstance(start_revision, RevisionInfo):
353
start_rev_id = start_revision.rev_id
354
start_revno = start_revision.revno or 1
356
branch.check_real_revno(start_revision)
357
start_revno = start_revision
168
360
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)
173
# 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':
361
end_revno = branch_revno
363
if isinstance(end_revision, RevisionInfo):
364
end_rev_id = end_revision.rev_id
365
end_revno = end_revision.revno or branch_revno
367
branch.check_real_revno(end_revision)
368
end_revno = end_revision
370
if ((start_rev_id == NULL_REVISION)
371
or (end_rev_id == NULL_REVISION)):
372
raise BzrCommandError('Logging revision 0 is invalid.')
373
if start_revno > end_revno:
374
raise BzrCommandError("Start revision must be older than "
377
if end_revno < start_revno:
378
return None, None, None, None
379
cur_revno = branch_revno
382
for revision_id in branch.repository.iter_reverse_revision_history(
383
branch_last_revision):
384
if cur_revno < start_revno:
385
# We have gone far enough, but we always add 1 more revision
386
rev_nos[revision_id] = cur_revno
387
mainline_revs.append(revision_id)
389
if cur_revno <= end_revno:
390
rev_nos[revision_id] = cur_revno
391
mainline_revs.append(revision_id)
394
# We walked off the edge of all revisions, so we add a 'None' marker
395
mainline_revs.append(None)
397
mainline_revs.reverse()
399
# override the mainline to look like the revision history.
400
return mainline_revs, rev_nos, start_rev_id, end_rev_id
403
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
404
"""Filter view_revisions based on revision ranges.
406
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
407
tuples to be filtered.
409
:param start_rev_id: If not NONE specifies the first revision to be logged.
410
If NONE then all revisions up to the end_rev_id are logged.
412
:param end_rev_id: If not NONE specifies the last revision to be logged.
413
If NONE then all revisions up to the end of the log are logged.
415
:return: The filtered view_revisions.
417
if start_rev_id or end_rev_id:
418
revision_ids = [r for r, n, d in view_revisions]
420
start_index = revision_ids.index(start_rev_id)
423
if start_rev_id == end_rev_id:
424
end_index = start_index
427
end_index = revision_ids.index(end_rev_id)
429
end_index = len(view_revisions) - 1
430
# To include the revisions merged into the last revision,
431
# extend end_rev_id down to, but not including, the next rev
432
# with the same or lesser merge_depth
433
end_merge_depth = view_revisions[end_index][2]
435
for index in xrange(end_index+1, len(view_revisions)+1):
436
if view_revisions[index][2] <= end_merge_depth:
437
end_index = index - 1
440
# if the search falls off the end then log to the end as well
441
end_index = len(view_revisions) - 1
442
view_revisions = view_revisions[start_index:end_index+1]
443
return view_revisions
446
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
448
"""Return the list of revision ids which touch a given file id.
450
The function filters view_revisions and returns a subset.
451
This includes the revisions which directly change the file id,
452
and the revisions which merge these changes. So if the
460
And 'C' changes a file, then both C and D will be returned.
462
This will also can be restricted based on a subset of the mainline.
464
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
466
# find all the revisions that change the specific file
467
# build the ancestry of each revision in the graph
468
# - only listing the ancestors that change the specific file.
469
graph = branch.repository.get_graph()
470
# This asks for all mainline revisions, which means we only have to spider
471
# sideways, rather than depth history. That said, its still size-of-history
472
# and should be addressed.
473
# mainline_revisions always includes an extra revision at the beginning, so
475
parent_map = dict(((key, value) for key, value in
476
graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
477
sorted_rev_list = topo_sort(parent_map.items())
478
text_keys = [(file_id, rev_id) for rev_id in sorted_rev_list]
479
modified_text_versions = branch.repository.texts.get_parent_map(text_keys)
481
for rev in sorted_rev_list:
482
text_key = (file_id, rev)
483
parents = parent_map[rev]
484
if text_key not in modified_text_versions and len(parents) == 1:
485
# We will not be adding anything new, so just use a reference to
486
# the parent ancestry.
487
rev_ancestry = ancestry[parents[0]]
490
if text_key in modified_text_versions:
491
rev_ancestry.add(rev)
492
for parent in parents:
493
if parent not in ancestry:
494
# parent is a Ghost, which won't be present in
495
# sorted_rev_list, but we may access it later, so create an
497
ancestry[parent] = set()
498
rev_ancestry = rev_ancestry.union(ancestry[parent])
499
ancestry[rev] = rev_ancestry
501
def is_merging_rev(r):
502
parents = parent_map[r]
504
leftparent = parents[0]
505
for rightparent in parents[1:]:
506
if not ancestry[leftparent].issuperset(
507
ancestry[rightparent]):
511
# filter from the view the revisions that did not change or merge
513
return [(r, n, d) for r, n, d in view_revs_iter
514
if (file_id, r) in modified_text_versions or is_merging_rev(r)]
517
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
518
include_merges=True):
519
"""Produce an iterator of revisions to show
520
:return: an iterator of (revision_id, revno, merge_depth)
521
(if there is no revno for a revision, None is supplied)
523
if include_merges is False:
524
revision_ids = mainline_revs[1:]
525
if direction == 'reverse':
526
revision_ids.reverse()
527
for revision_id in revision_ids:
528
yield revision_id, str(rev_nos[revision_id]), 0
530
graph = branch.repository.get_graph()
531
# This asks for all mainline revisions, which means we only have to spider
532
# sideways, rather than depth history. That said, its still size-of-history
533
# and should be addressed.
534
# mainline_revisions always includes an extra revision at the beginning, so
536
parent_map = dict(((key, value) for key, value in
537
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
538
# filter out ghosts; merge_sort errors on ghosts.
539
rev_graph = _strip_NULL_ghosts(parent_map)
540
merge_sorted_revisions = merge_sort(
546
if direction == 'forward':
547
# forward means oldest first.
548
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
549
elif direction != 'reverse':
181
550
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())
552
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
553
yield rev_id, '.'.join(map(str, revno)), merge_depth
556
def reverse_by_depth(merge_sorted_revisions, _depth=0):
557
"""Reverse revisions by depth.
559
Revisions with a different depth are sorted as a group with the previous
560
revision of that depth. There may be no topological justification for this,
561
but it looks much nicer.
564
for val in merge_sorted_revisions:
566
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
568
zd_revisions[-1].append(val)
569
for revisions in zd_revisions:
570
if len(revisions) > 1:
571
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
572
zd_revisions.reverse()
574
for chunk in zd_revisions:
579
class LogRevision(object):
580
"""A revision to be logged (by LogFormatter.log_revision).
582
A simple wrapper for the attributes of a revision to be logged.
583
The attributes may or may not be populated, as determined by the
584
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
587
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
591
self.merge_depth = merge_depth
287
596
class LogFormatter(object):
288
"""Abstract class to display log messages."""
597
"""Abstract class to display log messages.
599
At a minimum, a derived class must implement the log_revision method.
601
If the LogFormatter needs to be informed of the beginning or end of
602
a log it should implement the begin_log and/or end_log hook methods.
604
A LogFormatter should define the following supports_XXX flags
605
to indicate which LogRevision attributes it supports:
607
- supports_delta must be True if this log formatter supports delta.
608
Otherwise the delta attribute may not be populated.
609
- supports_merge_revisions must be True if this log formatter supports
610
merge revisions. If not, and if supports_single_merge_revisions is
611
also not True, then only mainline revisions will be passed to the
613
- supports_single_merge_revision must be True if this log formatter
614
supports logging only a single merge revision. This flag is
615
only relevant if supports_merge_revisions is not True.
616
- supports_tags must be True if this log formatter supports tags.
617
Otherwise the tags attribute may not be populated.
289
620
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
621
self.to_file = to_file
291
622
self.show_ids = show_ids
292
623
self.show_timezone = show_timezone
295
def show(self, revno, rev, delta):
296
raise NotImplementedError('not implemented in abstract base')
625
# TODO: uncomment this block after show() has been removed.
626
# Until then defining log_revision would prevent _show_log calling show()
627
# in legacy formatters.
628
# def log_revision(self, revision):
631
# :param revision: The LogRevision to be logged.
633
# raise NotImplementedError('not implemented in abstract base')
635
def short_committer(self, rev):
636
name, address = config.parse_username(rev.committer)
641
def short_author(self, rev):
642
name, address = config.parse_username(rev.get_apparent_author())
303
648
class LongLogFormatter(LogFormatter):
304
def show(self, revno, rev, delta):
305
from osutils import format_date
650
supports_merge_revisions = True
651
supports_delta = True
654
def log_revision(self, revision):
655
"""Log a revision, either merged or not."""
656
indent = ' ' * revision.merge_depth
307
657
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
658
to_file.write(indent + '-' * 60 + '\n')
659
if revision.revno is not None:
660
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
662
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
311
663
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,
664
to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
666
for parent_id in revision.rev.parent_ids:
667
to_file.write(indent + 'parent: %s\n' % (parent_id,))
669
author = revision.rev.properties.get('author', None)
670
if author is not None:
671
to_file.write(indent + 'author: %s\n' % (author,))
672
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
674
branch_nick = revision.rev.properties.get('branch-nick', None)
675
if branch_nick is not None:
676
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
678
date_str = format_date(revision.rev.timestamp,
679
revision.rev.timezone or 0,
317
680
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
681
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
320
print >>to_file, 'message:'
322
print >>to_file, ' (no message)'
683
to_file.write(indent + 'message:\n')
684
if not revision.rev.message:
685
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)
687
message = revision.rev.message.rstrip('\r\n')
688
for l in message.split('\n'):
689
to_file.write(indent + ' %s\n' % (l,))
690
if revision.delta is not None:
691
revision.delta.show(to_file, self.show_ids, indent=indent)
332
694
class ShortLogFormatter(LogFormatter):
333
def show(self, revno, rev, delta):
334
from bzrlib.osutils import format_date
696
supports_delta = True
697
supports_single_merge_revision = True
699
def log_revision(self, revision):
336
700
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
if len(revision.rev.parent_ids) > 1:
703
is_merge = ' [merge]'
704
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
705
self.short_author(revision.rev),
706
format_date(revision.rev.timestamp,
707
revision.rev.timezone or 0,
708
self.show_timezone, date_fmt="%Y-%m-%d",
341
711
if self.show_ids:
342
print >>to_file, ' revision-id:', rev.revision_id
344
print >>to_file, ' (no message)'
712
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
713
if not revision.rev.message:
714
to_file.write(' (no message)\n')
346
for l in rev.message.split('\n'):
347
print >>to_file, ' ' + l
716
message = revision.rev.message.rstrip('\r\n')
717
for l in message.split('\n'):
718
to_file.write(' %s\n' % (l,))
349
720
# TODO: Why not show the modified files in a shorter form as
350
721
# well? rewrap them single lines of appropriate length
352
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
358
'short': ShortLogFormatter,
722
if revision.delta is not None:
723
revision.delta.show(to_file, self.show_ids)
727
class LineLogFormatter(LogFormatter):
729
supports_single_merge_revision = True
731
def __init__(self, *args, **kwargs):
732
super(LineLogFormatter, self).__init__(*args, **kwargs)
733
self._max_chars = terminal_width() - 1
735
def truncate(self, str, max_len):
736
if len(str) <= max_len:
738
return str[:max_len-3]+'...'
740
def date_string(self, rev):
741
return format_date(rev.timestamp, rev.timezone or 0,
742
self.show_timezone, date_fmt="%Y-%m-%d",
745
def message(self, rev):
747
return '(no message)'
751
def log_revision(self, revision):
752
self.to_file.write(self.log_string(revision.revno, revision.rev,
754
self.to_file.write('\n')
756
def log_string(self, revno, rev, max_chars):
757
"""Format log info into one string. Truncate tail of string
758
:param revno: revision number (int) or None.
759
Revision numbers counts from 1.
760
:param rev: revision info object
761
:param max_chars: maximum length of resulting string
762
:return: formatted truncated string
766
# show revno only when is not None
767
out.append("%s:" % revno)
768
out.append(self.truncate(self.short_author(rev), 20))
769
out.append(self.date_string(rev))
770
out.append(rev.get_summary())
771
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
774
def line_log(rev, max_chars):
775
lf = LineLogFormatter(None)
776
return lf.log_string(None, rev, max_chars)
779
class LogFormatterRegistry(registry.Registry):
780
"""Registry for log formatters"""
782
def make_formatter(self, name, *args, **kwargs):
783
"""Construct a formatter from arguments.
785
:param name: Name of the formatter to construct. 'short', 'long' and
788
return self.get(name)(*args, **kwargs)
790
def get_default(self, branch):
791
return self.get(branch.get_config().log_format())
794
log_formatter_registry = LogFormatterRegistry()
797
log_formatter_registry.register('short', ShortLogFormatter,
798
'Moderately short log format')
799
log_formatter_registry.register('long', LongLogFormatter,
800
'Detailed log format')
801
log_formatter_registry.register('line', LineLogFormatter,
802
'Log format with one line per revision')
805
def register_formatter(name, formatter):
806
log_formatter_registry.register(name, formatter)
362
809
def log_formatter(name, *args, **kwargs):
363
from bzrlib.errors import BzrCommandError
810
"""Construct a formatter from arguments.
812
name -- Name of the formatter to construct; currently 'long', 'short' and
813
'line' are supported.
366
return FORMATTERS[name](*args, **kwargs)
816
return log_formatter_registry.make_formatter(name, *args, **kwargs)
368
818
raise BzrCommandError("unknown log formatter: %r" % name)
370
821
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
822
# deprecated; for compatibility
372
823
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
824
lf.show(revno, rev, delta)
827
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
829
"""Show the change in revision history comparing the old revision history to the new one.
831
:param branch: The branch where the revisions exist
832
:param old_rh: The old revision history
833
:param new_rh: The new revision history
834
:param to_file: A file to write the results to. If None, stdout will be used
837
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
839
lf = log_formatter(log_format,
842
show_timezone='original')
844
# This is the first index which is different between
847
for i in xrange(max(len(new_rh),
851
or new_rh[i] != old_rh[i]):
856
to_file.write('Nothing seems to have changed\n')
858
## TODO: It might be nice to do something like show_log
859
## and show the merged entries. But since this is the
860
## removed revisions, it shouldn't be as important
861
if base_idx < len(old_rh):
862
to_file.write('*'*60)
863
to_file.write('\nRemoved Revisions:\n')
864
for i in range(base_idx, len(old_rh)):
865
rev = branch.repository.get_revision(old_rh[i])
866
lr = LogRevision(rev, i+1, 0, None)
868
to_file.write('*'*60)
869
to_file.write('\n\n')
870
if base_idx < len(new_rh):
871
to_file.write('Added Revisions:\n')
877
start_revision=base_idx+1,
878
end_revision=len(new_rh),
added
removed
bzrlib/log.py
