141
170
If not None, only show revisions <= end_revision
173
If not None, only show revisions with matching commit messages
176
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
180
if getattr(lf, 'begin_log', None):
183
_show_log(branch, lf, specific_fileid, verbose, direction,
184
start_revision, end_revision, search, limit)
186
if getattr(lf, 'end_log', None):
192
def _show_log(branch,
194
specific_fileid=None,
201
"""Worker function for show_log - see show_log."""
149
202
if not isinstance(lf, LogFormatter):
150
203
warn("not a LogFormatter instance: %r" % lf)
152
205
if specific_fileid:
153
mutter('get log for file_id %r' % specific_fileid)
206
mutter('get log for file_id %r', specific_fileid)
207
generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
208
allow_single_merge_revision = getattr(lf,
209
'supports_single_merge_revision', False)
210
view_revisions = calculate_view_revisions(branch, start_revision,
211
end_revision, direction,
213
generate_merge_revisions,
214
allow_single_merge_revision)
155
215
if search is not None:
157
216
searchRE = re.compile(search, re.IGNORECASE)
221
generate_tags = getattr(lf, 'supports_tags', False)
223
if branch.supports_tags():
224
rev_tag_dict = branch.tags.get_reverse_tag_dict()
226
generate_delta = verbose and getattr(lf, 'supports_delta', False)
228
# now we just print all the revisions
230
for (rev_id, revno, merge_depth), rev, delta in _iter_revisions(
231
branch.repository, view_revisions, generate_delta):
233
if not searchRE.search(rev.message):
236
lr = LogRevision(rev, revno, merge_depth, delta,
237
rev_tag_dict.get(rev_id))
241
if log_count >= limit:
245
def calculate_view_revisions(branch, start_revision, end_revision, direction,
246
specific_fileid, generate_merge_revisions,
247
allow_single_merge_revision):
248
if (not generate_merge_revisions and start_revision is end_revision is
249
None and direction == 'reverse' and specific_fileid is None):
250
return _linear_view_revisions(branch)
252
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
253
_get_mainline_revs(branch, start_revision, end_revision)
254
if not mainline_revs:
257
if direction == 'reverse':
258
start_rev_id, end_rev_id = end_rev_id, start_rev_id
260
generate_single_revision = False
261
if ((not generate_merge_revisions)
262
and ((start_rev_id and (start_rev_id not in rev_nos))
263
or (end_rev_id and (end_rev_id not in rev_nos)))):
264
generate_single_revision = ((start_rev_id == end_rev_id)
265
and allow_single_merge_revision)
266
if not generate_single_revision:
267
raise BzrCommandError('Selected log formatter only supports '
268
'mainline revisions.')
269
generate_merge_revisions = generate_single_revision
270
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
271
direction, include_merges=generate_merge_revisions)
272
view_revisions = _filter_revision_range(list(view_revs_iter),
275
if view_revisions and generate_single_revision:
276
view_revisions = view_revisions[0:1]
278
view_revisions = _filter_revisions_touching_file_id(branch,
283
# rebase merge_depth - unless there are no revisions or
284
# either the first or last revision have merge_depth = 0.
285
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
286
min_depth = min([d for r,n,d in view_revisions])
288
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
289
return view_revisions
292
def _linear_view_revisions(branch):
293
start_revno, start_revision_id = branch.last_revision_info()
294
repo = branch.repository
295
revision_ids = repo.iter_reverse_revision_history(start_revision_id)
296
for num, revision_id in enumerate(revision_ids):
297
yield revision_id, str(start_revno - num), 0
300
def _iter_revisions(repository, view_revisions, generate_delta):
302
view_revisions = iter(view_revisions)
304
cur_view_revisions = [d for x, d in zip(range(num), view_revisions)]
305
if len(cur_view_revisions) == 0:
308
# r = revision, n = revno, d = merge depth
309
revision_ids = [r for (r, n, d) in cur_view_revisions]
310
revisions = repository.get_revisions(revision_ids)
312
deltas = repository.get_deltas_for_revisions(revisions)
313
cur_deltas = dict(izip((r.revision_id for r in revisions),
315
for view_data, revision in izip(cur_view_revisions, revisions):
316
yield view_data, revision, cur_deltas.get(revision.revision_id)
317
num = min(int(num * 1.5), 200)
320
def _get_mainline_revs(branch, start_revision, end_revision):
321
"""Get the mainline revisions from the branch.
323
Generates the list of mainline revisions for the branch.
325
:param branch: The branch containing the revisions.
327
:param start_revision: The first revision to be logged.
328
For backwards compatibility this may be a mainline integer revno,
329
but for merge revision support a RevisionInfo is expected.
331
:param end_revision: The last revision to be logged.
332
For backwards compatibility this may be a mainline integer revno,
333
but for merge revision support a RevisionInfo is expected.
335
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
161
337
which_revs = _enumerate_history(branch)
339
return None, None, None, None
341
# For mainline generation, map start_revision and end_revision to
342
# mainline revnos. If the revision is not on the mainline choose the
343
# appropriate extreme of the mainline instead - the extra will be
345
# Also map the revisions to rev_ids, to be used in the later filtering
163
348
if start_revision is None:
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
351
if isinstance(start_revision,RevisionInfo):
352
start_rev_id = start_revision.rev_id
353
start_revno = start_revision.revno or 1
355
branch.check_real_revno(start_revision)
356
start_revno = start_revision
168
359
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)
360
end_revno = len(which_revs)
362
if isinstance(end_revision,RevisionInfo):
363
end_rev_id = end_revision.rev_id
364
end_revno = end_revision.revno or len(which_revs)
366
branch.check_real_revno(end_revision)
367
end_revno = end_revision
369
if ((start_rev_id == NULL_REVISION)
370
or (end_rev_id == NULL_REVISION)):
371
raise BzrCommandError('Logging revision 0 is invalid.')
372
if start_revno > end_revno:
373
raise BzrCommandError("Start revision must be older than "
173
376
# 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':
377
cut_revs = which_revs[(start_revno-1):(end_revno)]
379
return None, None, None, None
381
# convert the revision history to a dictionary:
382
rev_nos = dict((k, v) for v, k in cut_revs)
384
# override the mainline to look like the revision history.
385
mainline_revs = [revision_id for index, revision_id in cut_revs]
386
if cut_revs[0][0] == 1:
387
mainline_revs.insert(0, None)
389
mainline_revs.insert(0, which_revs[start_revno-2][1])
390
return mainline_revs, rev_nos, start_rev_id, end_rev_id
393
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
394
"""Filter view_revisions based on revision ranges.
396
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
397
tuples to be filtered.
399
:param start_rev_id: If not NONE specifies the first revision to be logged.
400
If NONE then all revisions up to the end_rev_id are logged.
402
:param end_rev_id: If not NONE specifies the last revision to be logged.
403
If NONE then all revisions up to the end of the log are logged.
405
:return: The filtered view_revisions.
407
if start_rev_id or end_rev_id:
408
revision_ids = [r for r, n, d in view_revisions]
410
start_index = revision_ids.index(start_rev_id)
413
if start_rev_id == end_rev_id:
414
end_index = start_index
417
end_index = revision_ids.index(end_rev_id)
419
end_index = len(view_revisions) - 1
420
# To include the revisions merged into the last revision,
421
# extend end_rev_id down to, but not including, the next rev
422
# with the same or lesser merge_depth
423
end_merge_depth = view_revisions[end_index][2]
425
for index in xrange(end_index+1, len(view_revisions)+1):
426
if view_revisions[index][2] <= end_merge_depth:
427
end_index = index - 1
430
# if the search falls off the end then log to the end as well
431
end_index = len(view_revisions) - 1
432
view_revisions = view_revisions[start_index:end_index+1]
433
return view_revisions
436
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
438
"""Return the list of revision ids which touch a given file id.
440
The function filters view_revisions and returns a subset.
441
This includes the revisions which directly change the file id,
442
and the revisions which merge these changes. So if the
450
And 'C' changes a file, then both C and D will be returned.
452
This will also can be restricted based on a subset of the mainline.
454
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
456
# find all the revisions that change the specific file
457
file_weave = branch.repository.weave_store.get_weave(file_id,
458
branch.repository.get_transaction())
459
weave_modifed_revisions = set(file_weave.versions())
460
# build the ancestry of each revision in the graph
461
# - only listing the ancestors that change the specific file.
462
graph = branch.repository.get_graph()
463
# This asks for all mainline revisions, which means we only have to spider
464
# sideways, rather than depth history. That said, its still size-of-history
465
# and should be addressed.
466
search = graph._make_breadth_first_searcher(mainline_revisions)
467
transitive_ids = set()
468
map(transitive_ids.update, list(search))
469
parent_map = graph.get_parent_map(transitive_ids)
470
sorted_rev_list = topo_sort(parent_map.items())
472
for rev in sorted_rev_list:
473
parents = parent_map[rev]
474
if rev not in weave_modifed_revisions and len(parents) == 1:
475
# We will not be adding anything new, so just use a reference to
476
# the parent ancestry.
477
rev_ancestry = ancestry[parents[0]]
480
if rev in weave_modifed_revisions:
481
rev_ancestry.add(rev)
482
for parent in parents:
483
rev_ancestry = rev_ancestry.union(ancestry[parent])
484
ancestry[rev] = rev_ancestry
486
def is_merging_rev(r):
487
parents = parent_map[r]
489
leftparent = parents[0]
490
for rightparent in parents[1:]:
491
if not ancestry[leftparent].issuperset(
492
ancestry[rightparent]):
496
# filter from the view the revisions that did not change or merge
498
return [(r, n, d) for r, n, d in view_revs_iter
499
if r in weave_modifed_revisions or is_merging_rev(r)]
502
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
503
include_merges=True):
504
"""Produce an iterator of revisions to show
505
:return: an iterator of (revision_id, revno, merge_depth)
506
(if there is no revno for a revision, None is supplied)
508
if include_merges is False:
509
revision_ids = mainline_revs[1:]
510
if direction == 'reverse':
511
revision_ids.reverse()
512
for revision_id in revision_ids:
513
yield revision_id, str(rev_nos[revision_id]), 0
515
graph = branch.repository.get_graph()
516
# This asks for all mainline revisions, which means we only have to spider
517
# sideways, rather than depth history. That said, its still size-of-history
518
# and should be addressed.
519
search = graph._make_breadth_first_searcher(mainline_revs)
520
transitive_ids = set()
521
map(transitive_ids.update, list(search))
522
parent_map = graph.get_parent_map(transitive_ids)
523
# filter out ghosts; merge_sort errors on ghosts.
525
# Filter ghosts, and null:
526
if NULL_REVISION in parent_map:
527
del parent_map[NULL_REVISION]
528
for key, parents in parent_map.iteritems():
529
rev_graph[key] = tuple(parent for parent in parents if parent in
531
merge_sorted_revisions = merge_sort(
537
if direction == 'forward':
538
# forward means oldest first.
539
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
540
elif direction != 'reverse':
181
541
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())
543
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
544
yield rev_id, '.'.join(map(str, revno)), merge_depth
547
def reverse_by_depth(merge_sorted_revisions, _depth=0):
548
"""Reverse revisions by depth.
550
Revisions with a different depth are sorted as a group with the previous
551
revision of that depth. There may be no topological justification for this,
552
but it looks much nicer.
555
for val in merge_sorted_revisions:
557
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
559
assert val[2] > _depth
560
zd_revisions[-1].append(val)
561
for revisions in zd_revisions:
562
if len(revisions) > 1:
563
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
564
zd_revisions.reverse()
566
for chunk in zd_revisions:
571
class LogRevision(object):
572
"""A revision to be logged (by LogFormatter.log_revision).
574
A simple wrapper for the attributes of a revision to be logged.
575
The attributes may or may not be populated, as determined by the
576
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
579
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
583
self.merge_depth = merge_depth
287
588
class LogFormatter(object):
288
"""Abstract class to display log messages."""
589
"""Abstract class to display log messages.
591
At a minimum, a derived class must implement the log_revision method.
593
If the LogFormatter needs to be informed of the beginning or end of
594
a log it should implement the begin_log and/or end_log hook methods.
596
A LogFormatter should define the following supports_XXX flags
597
to indicate which LogRevision attributes it supports:
599
- supports_delta must be True if this log formatter supports delta.
600
Otherwise the delta attribute may not be populated.
601
- supports_merge_revisions must be True if this log formatter supports
602
merge revisions. If not, and if supports_single_merge_revisions is
603
also not True, then only mainline revisions will be passed to the
605
- supports_single_merge_revision must be True if this log formatter
606
supports logging only a single merge revision. This flag is
607
only relevant if supports_merge_revisions is not True.
608
- supports_tags must be True if this log formatter supports tags.
609
Otherwise the tags attribute may not be populated.
289
612
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
613
self.to_file = to_file
291
614
self.show_ids = show_ids
292
615
self.show_timezone = show_timezone
295
def show(self, revno, rev, delta):
296
raise NotImplementedError('not implemented in abstract base')
617
# TODO: uncomment this block after show() has been removed.
618
# Until then defining log_revision would prevent _show_log calling show()
619
# in legacy formatters.
620
# def log_revision(self, revision):
623
# :param revision: The LogRevision to be logged.
625
# raise NotImplementedError('not implemented in abstract base')
627
def short_committer(self, rev):
628
name, address = config.parse_username(rev.committer)
633
def short_author(self, rev):
634
name, address = config.parse_username(rev.get_apparent_author())
303
640
class LongLogFormatter(LogFormatter):
304
def show(self, revno, rev, delta):
305
from osutils import format_date
642
supports_merge_revisions = True
643
supports_delta = True
646
def log_revision(self, revision):
647
"""Log a revision, either merged or not."""
648
indent = ' ' * revision.merge_depth
307
649
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
650
to_file.write(indent + '-' * 60 + '\n')
651
if revision.revno is not None:
652
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
654
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
311
655
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,
656
to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
658
for parent_id in revision.rev.parent_ids:
659
to_file.write(indent + 'parent: %s\n' % (parent_id,))
661
author = revision.rev.properties.get('author', None)
662
if author is not None:
663
to_file.write(indent + 'author: %s\n' % (author,))
664
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
666
branch_nick = revision.rev.properties.get('branch-nick', None)
667
if branch_nick is not None:
668
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
670
date_str = format_date(revision.rev.timestamp,
671
revision.rev.timezone or 0,
317
672
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
673
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
320
print >>to_file, 'message:'
322
print >>to_file, ' (no message)'
675
to_file.write(indent + 'message:\n')
676
if not revision.rev.message:
677
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)
679
message = revision.rev.message.rstrip('\r\n')
680
for l in message.split('\n'):
681
to_file.write(indent + ' %s\n' % (l,))
682
if revision.delta is not None:
683
revision.delta.show(to_file, self.show_ids, indent=indent)
332
686
class ShortLogFormatter(LogFormatter):
333
def show(self, revno, rev, delta):
334
from bzrlib.osutils import format_date
688
supports_delta = True
689
supports_single_merge_revision = True
691
def log_revision(self, revision):
336
692
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,
693
date_str = format_date(revision.rev.timestamp,
694
revision.rev.timezone or 0,
697
if len(revision.rev.parent_ids) > 1:
698
is_merge = ' [merge]'
699
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
700
self.short_author(revision.rev),
701
format_date(revision.rev.timestamp,
702
revision.rev.timezone or 0,
703
self.show_timezone, date_fmt="%Y-%m-%d",
341
706
if self.show_ids:
342
print >>to_file, ' revision-id:', rev.revision_id
344
print >>to_file, ' (no message)'
707
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
708
if not revision.rev.message:
709
to_file.write(' (no message)\n')
346
for l in rev.message.split('\n'):
347
print >>to_file, ' ' + l
711
message = revision.rev.message.rstrip('\r\n')
712
for l in message.split('\n'):
713
to_file.write(' %s\n' % (l,))
349
715
# TODO: Why not show the modified files in a shorter form as
350
716
# well? rewrap them single lines of appropriate length
352
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
358
'short': ShortLogFormatter,
717
if revision.delta is not None:
718
revision.delta.show(to_file, self.show_ids)
722
class LineLogFormatter(LogFormatter):
724
supports_single_merge_revision = True
726
def __init__(self, *args, **kwargs):
727
super(LineLogFormatter, self).__init__(*args, **kwargs)
728
self._max_chars = terminal_width() - 1
730
def truncate(self, str, max_len):
731
if len(str) <= max_len:
733
return str[:max_len-3]+'...'
735
def date_string(self, rev):
736
return format_date(rev.timestamp, rev.timezone or 0,
737
self.show_timezone, date_fmt="%Y-%m-%d",
740
def message(self, rev):
742
return '(no message)'
746
def log_revision(self, revision):
747
self.to_file.write(self.log_string(revision.revno, revision.rev,
749
self.to_file.write('\n')
751
def log_string(self, revno, rev, max_chars):
752
"""Format log info into one string. Truncate tail of string
753
:param revno: revision number (int) or None.
754
Revision numbers counts from 1.
755
:param rev: revision info object
756
:param max_chars: maximum length of resulting string
757
:return: formatted truncated string
761
# show revno only when is not None
762
out.append("%s:" % revno)
763
out.append(self.truncate(self.short_author(rev), 20))
764
out.append(self.date_string(rev))
765
out.append(rev.get_summary())
766
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
769
def line_log(rev, max_chars):
770
lf = LineLogFormatter(None)
771
return lf.log_string(None, rev, max_chars)
774
class LogFormatterRegistry(registry.Registry):
775
"""Registry for log formatters"""
777
def make_formatter(self, name, *args, **kwargs):
778
"""Construct a formatter from arguments.
780
:param name: Name of the formatter to construct. 'short', 'long' and
783
return self.get(name)(*args, **kwargs)
785
def get_default(self, branch):
786
return self.get(branch.get_config().log_format())
789
log_formatter_registry = LogFormatterRegistry()
792
log_formatter_registry.register('short', ShortLogFormatter,
793
'Moderately short log format')
794
log_formatter_registry.register('long', LongLogFormatter,
795
'Detailed log format')
796
log_formatter_registry.register('line', LineLogFormatter,
797
'Log format with one line per revision')
800
def register_formatter(name, formatter):
801
log_formatter_registry.register(name, formatter)
362
804
def log_formatter(name, *args, **kwargs):
363
from bzrlib.errors import BzrCommandError
805
"""Construct a formatter from arguments.
807
name -- Name of the formatter to construct; currently 'long', 'short' and
808
'line' are supported.
366
return FORMATTERS[name](*args, **kwargs)
811
return log_formatter_registry.make_formatter(name, *args, **kwargs)
368
813
raise BzrCommandError("unknown log formatter: %r" % name)
370
816
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
817
# deprecated; for compatibility
372
818
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
819
lf.show(revno, rev, delta)
822
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
824
"""Show the change in revision history comparing the old revision history to the new one.
826
:param branch: The branch where the revisions exist
827
:param old_rh: The old revision history
828
:param new_rh: The new revision history
829
:param to_file: A file to write the results to. If None, stdout will be used
832
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
834
lf = log_formatter(log_format,
837
show_timezone='original')
839
# This is the first index which is different between
842
for i in xrange(max(len(new_rh),
846
or new_rh[i] != old_rh[i]):
851
to_file.write('Nothing seems to have changed\n')
853
## TODO: It might be nice to do something like show_log
854
## and show the merged entries. But since this is the
855
## removed revisions, it shouldn't be as important
856
if base_idx < len(old_rh):
857
to_file.write('*'*60)
858
to_file.write('\nRemoved Revisions:\n')
859
for i in range(base_idx, len(old_rh)):
860
rev = branch.repository.get_revision(old_rh[i])
861
lr = LogRevision(rev, i+1, 0, None)
863
to_file.write('*'*60)
864
to_file.write('\n\n')
865
if base_idx < len(new_rh):
866
to_file.write('Added Revisions:\n')
872
start_revision=base_idx+1,
873
end_revision=len(new_rh),
added
removed
bzrlib/log.py
