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)
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.
161
338
which_revs = _enumerate_history(branch)
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)
361
end_revno = len(which_revs)
363
if isinstance(end_revision,RevisionInfo):
364
end_rev_id = end_revision.rev_id
365
end_revno = end_revision.revno or len(which_revs)
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 "
173
377
# 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':
378
cut_revs = which_revs[(start_revno-1):(end_revno)]
380
return None, None, None, None
382
# convert the revision history to a dictionary:
383
rev_nos = dict((k, v) for v, k in cut_revs)
385
# override the mainline to look like the revision history.
386
mainline_revs = [revision_id for index, revision_id in cut_revs]
387
if cut_revs[0][0] == 1:
388
mainline_revs.insert(0, None)
390
mainline_revs.insert(0, which_revs[start_revno-2][1])
391
return mainline_revs, rev_nos, start_rev_id, end_rev_id
394
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
395
"""Filter view_revisions based on revision ranges.
397
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
398
tuples to be filtered.
400
:param start_rev_id: If not NONE specifies the first revision to be logged.
401
If NONE then all revisions up to the end_rev_id are logged.
403
:param end_rev_id: If not NONE specifies the last revision to be logged.
404
If NONE then all revisions up to the end of the log are logged.
406
:return: The filtered view_revisions.
408
if start_rev_id or end_rev_id:
409
revision_ids = [r for r, n, d in view_revisions]
411
start_index = revision_ids.index(start_rev_id)
414
if start_rev_id == end_rev_id:
415
end_index = start_index
418
end_index = revision_ids.index(end_rev_id)
420
end_index = len(view_revisions) - 1
421
# To include the revisions merged into the last revision,
422
# extend end_rev_id down to, but not including, the next rev
423
# with the same or lesser merge_depth
424
end_merge_depth = view_revisions[end_index][2]
426
for index in xrange(end_index+1, len(view_revisions)+1):
427
if view_revisions[index][2] <= end_merge_depth:
428
end_index = index - 1
431
# if the search falls off the end then log to the end as well
432
end_index = len(view_revisions) - 1
433
view_revisions = view_revisions[start_index:end_index+1]
434
return view_revisions
437
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
439
"""Return the list of revision ids which touch a given file id.
441
The function filters view_revisions and returns a subset.
442
This includes the revisions which directly change the file id,
443
and the revisions which merge these changes. So if the
451
And 'C' changes a file, then both C and D will be returned.
453
This will also can be restricted based on a subset of the mainline.
455
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
457
# find all the revisions that change the specific file
458
file_weave = branch.repository.weave_store.get_weave(file_id,
459
branch.repository.get_transaction())
460
weave_modifed_revisions = set(file_weave.versions())
461
# build the ancestry of each revision in the graph
462
# - only listing the ancestors that change the specific file.
463
graph = branch.repository.get_graph()
464
# This asks for all mainline revisions, which means we only have to spider
465
# sideways, rather than depth history. That said, its still size-of-history
466
# and should be addressed.
467
# mainline_revisions always includes an extra revision at the beginning, so
469
parent_map = dict(((key, value) for key, value in
470
graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
471
sorted_rev_list = topo_sort(parent_map.items())
473
for rev in sorted_rev_list:
474
parents = parent_map[rev]
475
if rev not in weave_modifed_revisions and len(parents) == 1:
476
# We will not be adding anything new, so just use a reference to
477
# the parent ancestry.
478
rev_ancestry = ancestry[parents[0]]
481
if rev in weave_modifed_revisions:
482
rev_ancestry.add(rev)
483
for parent in parents:
484
if parent not in ancestry:
485
# parent is a Ghost, which won't be present in
486
# sorted_rev_list, but we may access it later, so create an
488
ancestry[parent] = set()
489
rev_ancestry = rev_ancestry.union(ancestry[parent])
490
ancestry[rev] = rev_ancestry
492
def is_merging_rev(r):
493
parents = parent_map[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
graph = branch.repository.get_graph()
522
# This asks for all mainline revisions, which means we only have to spider
523
# sideways, rather than depth history. That said, its still size-of-history
524
# and should be addressed.
525
parent_map = dict(((key, value) for key, value in
526
graph.iter_ancestry(mainline_revs) if value is not None))
527
# filter out ghosts; merge_sort errors on ghosts.
528
rev_graph = _strip_NULL_ghosts(parent_map)
529
merge_sorted_revisions = merge_sort(
535
if direction == 'forward':
536
# forward means oldest first.
537
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
538
elif direction != 'reverse':
181
539
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())
541
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
542
yield rev_id, '.'.join(map(str, revno)), merge_depth
545
def reverse_by_depth(merge_sorted_revisions, _depth=0):
546
"""Reverse revisions by depth.
548
Revisions with a different depth are sorted as a group with the previous
549
revision of that depth. There may be no topological justification for this,
550
but it looks much nicer.
553
for val in merge_sorted_revisions:
555
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
557
assert val[2] > _depth
558
zd_revisions[-1].append(val)
559
for revisions in zd_revisions:
560
if len(revisions) > 1:
561
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
562
zd_revisions.reverse()
564
for chunk in zd_revisions:
569
class LogRevision(object):
570
"""A revision to be logged (by LogFormatter.log_revision).
572
A simple wrapper for the attributes of a revision to be logged.
573
The attributes may or may not be populated, as determined by the
574
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
577
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
581
self.merge_depth = merge_depth
287
586
class LogFormatter(object):
288
"""Abstract class to display log messages."""
587
"""Abstract class to display log messages.
589
At a minimum, a derived class must implement the log_revision method.
591
If the LogFormatter needs to be informed of the beginning or end of
592
a log it should implement the begin_log and/or end_log hook methods.
594
A LogFormatter should define the following supports_XXX flags
595
to indicate which LogRevision attributes it supports:
597
- supports_delta must be True if this log formatter supports delta.
598
Otherwise the delta attribute may not be populated.
599
- supports_merge_revisions must be True if this log formatter supports
600
merge revisions. If not, and if supports_single_merge_revisions is
601
also not True, then only mainline revisions will be passed to the
603
- supports_single_merge_revision must be True if this log formatter
604
supports logging only a single merge revision. This flag is
605
only relevant if supports_merge_revisions is not True.
606
- supports_tags must be True if this log formatter supports tags.
607
Otherwise the tags attribute may not be populated.
289
610
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
611
self.to_file = to_file
291
612
self.show_ids = show_ids
292
613
self.show_timezone = show_timezone
295
def show(self, revno, rev, delta):
296
raise NotImplementedError('not implemented in abstract base')
615
# TODO: uncomment this block after show() has been removed.
616
# Until then defining log_revision would prevent _show_log calling show()
617
# in legacy formatters.
618
# def log_revision(self, revision):
621
# :param revision: The LogRevision to be logged.
623
# raise NotImplementedError('not implemented in abstract base')
625
def short_committer(self, rev):
626
name, address = config.parse_username(rev.committer)
631
def short_author(self, rev):
632
name, address = config.parse_username(rev.get_apparent_author())
303
638
class LongLogFormatter(LogFormatter):
304
def show(self, revno, rev, delta):
305
from osutils import format_date
640
supports_merge_revisions = True
641
supports_delta = True
644
def log_revision(self, revision):
645
"""Log a revision, either merged or not."""
646
indent = ' ' * revision.merge_depth
307
647
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
648
to_file.write(indent + '-' * 60 + '\n')
649
if revision.revno is not None:
650
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
652
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
311
653
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,
654
to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
656
for parent_id in revision.rev.parent_ids:
657
to_file.write(indent + 'parent: %s\n' % (parent_id,))
659
author = revision.rev.properties.get('author', None)
660
if author is not None:
661
to_file.write(indent + 'author: %s\n' % (author,))
662
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
664
branch_nick = revision.rev.properties.get('branch-nick', None)
665
if branch_nick is not None:
666
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
668
date_str = format_date(revision.rev.timestamp,
669
revision.rev.timezone or 0,
317
670
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
671
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
320
print >>to_file, 'message:'
322
print >>to_file, ' (no message)'
673
to_file.write(indent + 'message:\n')
674
if not revision.rev.message:
675
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)
677
message = revision.rev.message.rstrip('\r\n')
678
for l in message.split('\n'):
679
to_file.write(indent + ' %s\n' % (l,))
680
if revision.delta is not None:
681
revision.delta.show(to_file, self.show_ids, indent=indent)
332
684
class ShortLogFormatter(LogFormatter):
333
def show(self, revno, rev, delta):
334
from bzrlib.osutils import format_date
686
supports_delta = True
687
supports_single_merge_revision = True
689
def log_revision(self, revision):
336
690
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,
691
date_str = format_date(revision.rev.timestamp,
692
revision.rev.timezone or 0,
695
if len(revision.rev.parent_ids) > 1:
696
is_merge = ' [merge]'
697
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
698
self.short_author(revision.rev),
699
format_date(revision.rev.timestamp,
700
revision.rev.timezone or 0,
701
self.show_timezone, date_fmt="%Y-%m-%d",
341
704
if self.show_ids:
342
print >>to_file, ' revision-id:', rev.revision_id
344
print >>to_file, ' (no message)'
705
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
706
if not revision.rev.message:
707
to_file.write(' (no message)\n')
346
for l in rev.message.split('\n'):
347
print >>to_file, ' ' + l
709
message = revision.rev.message.rstrip('\r\n')
710
for l in message.split('\n'):
711
to_file.write(' %s\n' % (l,))
349
713
# TODO: Why not show the modified files in a shorter form as
350
714
# well? rewrap them single lines of appropriate length
352
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
358
'short': ShortLogFormatter,
715
if revision.delta is not None:
716
revision.delta.show(to_file, self.show_ids)
720
class LineLogFormatter(LogFormatter):
722
supports_single_merge_revision = True
724
def __init__(self, *args, **kwargs):
725
super(LineLogFormatter, self).__init__(*args, **kwargs)
726
self._max_chars = terminal_width() - 1
728
def truncate(self, str, max_len):
729
if len(str) <= max_len:
731
return str[:max_len-3]+'...'
733
def date_string(self, rev):
734
return format_date(rev.timestamp, rev.timezone or 0,
735
self.show_timezone, date_fmt="%Y-%m-%d",
738
def message(self, rev):
740
return '(no message)'
744
def log_revision(self, revision):
745
self.to_file.write(self.log_string(revision.revno, revision.rev,
747
self.to_file.write('\n')
749
def log_string(self, revno, rev, max_chars):
750
"""Format log info into one string. Truncate tail of string
751
:param revno: revision number (int) or None.
752
Revision numbers counts from 1.
753
:param rev: revision info object
754
:param max_chars: maximum length of resulting string
755
:return: formatted truncated string
759
# show revno only when is not None
760
out.append("%s:" % revno)
761
out.append(self.truncate(self.short_author(rev), 20))
762
out.append(self.date_string(rev))
763
out.append(rev.get_summary())
764
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
767
def line_log(rev, max_chars):
768
lf = LineLogFormatter(None)
769
return lf.log_string(None, rev, max_chars)
772
class LogFormatterRegistry(registry.Registry):
773
"""Registry for log formatters"""
775
def make_formatter(self, name, *args, **kwargs):
776
"""Construct a formatter from arguments.
778
:param name: Name of the formatter to construct. 'short', 'long' and
781
return self.get(name)(*args, **kwargs)
783
def get_default(self, branch):
784
return self.get(branch.get_config().log_format())
787
log_formatter_registry = LogFormatterRegistry()
790
log_formatter_registry.register('short', ShortLogFormatter,
791
'Moderately short log format')
792
log_formatter_registry.register('long', LongLogFormatter,
793
'Detailed log format')
794
log_formatter_registry.register('line', LineLogFormatter,
795
'Log format with one line per revision')
798
def register_formatter(name, formatter):
799
log_formatter_registry.register(name, formatter)
362
802
def log_formatter(name, *args, **kwargs):
363
from bzrlib.errors import BzrCommandError
803
"""Construct a formatter from arguments.
805
name -- Name of the formatter to construct; currently 'long', 'short' and
806
'line' are supported.
366
return FORMATTERS[name](*args, **kwargs)
809
return log_formatter_registry.make_formatter(name, *args, **kwargs)
368
811
raise BzrCommandError("unknown log formatter: %r" % name)
370
814
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
815
# deprecated; for compatibility
372
816
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
817
lf.show(revno, rev, delta)
820
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
822
"""Show the change in revision history comparing the old revision history to the new one.
824
:param branch: The branch where the revisions exist
825
:param old_rh: The old revision history
826
:param new_rh: The new revision history
827
:param to_file: A file to write the results to. If None, stdout will be used
830
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
832
lf = log_formatter(log_format,
835
show_timezone='original')
837
# This is the first index which is different between
840
for i in xrange(max(len(new_rh),
844
or new_rh[i] != old_rh[i]):
849
to_file.write('Nothing seems to have changed\n')
851
## TODO: It might be nice to do something like show_log
852
## and show the merged entries. But since this is the
853
## removed revisions, it shouldn't be as important
854
if base_idx < len(old_rh):
855
to_file.write('*'*60)
856
to_file.write('\nRemoved Revisions:\n')
857
for i in range(base_idx, len(old_rh)):
858
rev = branch.repository.get_revision(old_rh[i])
859
lr = LogRevision(rev, i+1, 0, None)
861
to_file.write('*'*60)
862
to_file.write('\n\n')
863
if base_idx < len(new_rh):
864
to_file.write('Added Revisions:\n')
870
start_revision=base_idx+1,
871
end_revision=len(new_rh),
added
removed
bzrlib/log.py
