140
168
If not None, only show revisions <= end_revision
171
If not None, only show revisions with matching commit messages
174
If not None or 0, only show limit revisions
142
from bzrlib.osutils import format_date
143
from bzrlib.errors import BzrCheckError
144
from bzrlib.textui import show_status
146
from warnings import warn
178
if getattr(lf, 'begin_log', None):
181
_show_log(branch, lf, specific_fileid, verbose, direction,
182
start_revision, end_revision, search, limit)
184
if getattr(lf, 'end_log', None):
190
def _show_log(branch,
192
specific_fileid=None,
199
"""Worker function for show_log - see show_log."""
148
200
if not isinstance(lf, LogFormatter):
149
201
warn("not a LogFormatter instance: %r" % lf)
151
203
if specific_fileid:
152
mutter('get log for file_id %r' % specific_fileid)
204
trace.mutter('get log for file_id %r', specific_fileid)
205
generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
206
allow_single_merge_revision = getattr(lf,
207
'supports_single_merge_revision', False)
208
view_revisions = calculate_view_revisions(branch, start_revision,
209
end_revision, direction,
211
generate_merge_revisions,
212
allow_single_merge_revision)
154
213
if search is not None:
156
214
searchRE = re.compile(search, re.IGNORECASE)
160
which_revs = _enumerate_history(branch)
219
generate_tags = getattr(lf, 'supports_tags', False)
221
if branch.supports_tags():
222
rev_tag_dict = branch.tags.get_reverse_tag_dict()
224
generate_delta = verbose and getattr(lf, 'supports_delta', False)
226
# now we just print all the revisions
228
for (rev_id, revno, merge_depth), rev, delta in _iter_revisions(
229
branch.repository, view_revisions, generate_delta):
231
if not searchRE.search(rev.message):
234
lr = LogRevision(rev, revno, merge_depth, delta,
235
rev_tag_dict.get(rev_id))
239
if log_count >= limit:
243
def calculate_view_revisions(branch, start_revision, end_revision, direction,
244
specific_fileid, generate_merge_revisions,
245
allow_single_merge_revision):
246
if (not generate_merge_revisions and start_revision is end_revision is
247
None and direction == 'reverse' and specific_fileid is None):
248
return _linear_view_revisions(branch)
250
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
251
_get_mainline_revs(branch, start_revision, end_revision)
252
if not mainline_revs:
255
if direction == 'reverse':
256
start_rev_id, end_rev_id = end_rev_id, start_rev_id
258
generate_single_revision = False
259
if ((not generate_merge_revisions)
260
and ((start_rev_id and (start_rev_id not in rev_nos))
261
or (end_rev_id and (end_rev_id not in rev_nos)))):
262
generate_single_revision = ((start_rev_id == end_rev_id)
263
and allow_single_merge_revision)
264
if not generate_single_revision:
265
raise errors.BzrCommandError('Selected log formatter only supports'
266
' mainline revisions.')
267
generate_merge_revisions = generate_single_revision
268
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
269
direction, include_merges=generate_merge_revisions)
270
view_revisions = _filter_revision_range(list(view_revs_iter),
273
if view_revisions and generate_single_revision:
274
view_revisions = view_revisions[0:1]
276
view_revisions = _filter_revisions_touching_file_id(branch,
281
# rebase merge_depth - unless there are no revisions or
282
# either the first or last revision have merge_depth = 0.
283
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
284
min_depth = min([d for r,n,d in view_revisions])
286
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
287
return view_revisions
290
def _linear_view_revisions(branch):
291
start_revno, start_revision_id = branch.last_revision_info()
292
repo = branch.repository
293
revision_ids = repo.iter_reverse_revision_history(start_revision_id)
294
for num, revision_id in enumerate(revision_ids):
295
yield revision_id, str(start_revno - num), 0
298
def _iter_revisions(repository, view_revisions, generate_delta):
300
view_revisions = iter(view_revisions)
302
cur_view_revisions = [d for x, d in zip(range(num), view_revisions)]
303
if len(cur_view_revisions) == 0:
306
# r = revision, n = revno, d = merge depth
307
revision_ids = [r for (r, n, d) in cur_view_revisions]
308
revisions = repository.get_revisions(revision_ids)
310
deltas = repository.get_deltas_for_revisions(revisions)
311
cur_deltas = dict(izip((r.revision_id for r in revisions),
313
for view_data, revision in izip(cur_view_revisions, revisions):
314
yield view_data, revision, cur_deltas.get(revision.revision_id)
315
num = min(int(num * 1.5), 200)
318
def _get_mainline_revs(branch, start_revision, end_revision):
319
"""Get the mainline revisions from the branch.
321
Generates the list of mainline revisions for the branch.
323
:param branch: The branch containing the revisions.
325
:param start_revision: The first revision to be logged.
326
For backwards compatibility this may be a mainline integer revno,
327
but for merge revision support a RevisionInfo is expected.
329
:param end_revision: The last revision to be logged.
330
For backwards compatibility this may be a mainline integer revno,
331
but for merge revision support a RevisionInfo is expected.
333
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
335
branch_revno, branch_last_revision = branch.last_revision_info()
336
if branch_revno == 0:
337
return None, None, None, None
339
# For mainline generation, map start_revision and end_revision to
340
# mainline revnos. If the revision is not on the mainline choose the
341
# appropriate extreme of the mainline instead - the extra will be
343
# Also map the revisions to rev_ids, to be used in the later filtering
162
346
if start_revision is None:
165
branch.check_real_revno(start_revision)
349
if isinstance(start_revision, revisionspec.RevisionInfo):
350
start_rev_id = start_revision.rev_id
351
start_revno = start_revision.revno or 1
353
branch.check_real_revno(start_revision)
354
start_revno = start_revision
167
357
if end_revision is None:
168
end_revision = len(which_revs)
170
branch.check_real_revno(end_revision)
172
# list indexes are 0-based; revisions are 1-based
173
cut_revs = which_revs[(start_revision-1):(end_revision)]
175
if direction == 'reverse':
177
elif direction == 'forward':
358
end_revno = branch_revno
360
if isinstance(end_revision, revisionspec.RevisionInfo):
361
end_rev_id = end_revision.rev_id
362
end_revno = end_revision.revno or branch_revno
364
branch.check_real_revno(end_revision)
365
end_revno = end_revision
367
if ((start_rev_id == _mod_revision.NULL_REVISION)
368
or (end_rev_id == _mod_revision.NULL_REVISION)):
369
raise errors.BzrCommandError('Logging revision 0 is invalid.')
370
if start_revno > end_revno:
371
raise errors.BzrCommandError("Start revision must be older than "
374
if end_revno < start_revno:
375
return None, None, None, None
376
cur_revno = branch_revno
379
for revision_id in branch.repository.iter_reverse_revision_history(
380
branch_last_revision):
381
if cur_revno < start_revno:
382
# We have gone far enough, but we always add 1 more revision
383
rev_nos[revision_id] = cur_revno
384
mainline_revs.append(revision_id)
386
if cur_revno <= end_revno:
387
rev_nos[revision_id] = cur_revno
388
mainline_revs.append(revision_id)
391
# We walked off the edge of all revisions, so we add a 'None' marker
392
mainline_revs.append(None)
394
mainline_revs.reverse()
396
# override the mainline to look like the revision history.
397
return mainline_revs, rev_nos, start_rev_id, end_rev_id
400
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
401
"""Filter view_revisions based on revision ranges.
403
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
404
tuples to be filtered.
406
:param start_rev_id: If not NONE specifies the first revision to be logged.
407
If NONE then all revisions up to the end_rev_id are logged.
409
:param end_rev_id: If not NONE specifies the last revision to be logged.
410
If NONE then all revisions up to the end of the log are logged.
412
:return: The filtered view_revisions.
414
if start_rev_id or end_rev_id:
415
revision_ids = [r for r, n, d in view_revisions]
417
start_index = revision_ids.index(start_rev_id)
420
if start_rev_id == end_rev_id:
421
end_index = start_index
424
end_index = revision_ids.index(end_rev_id)
426
end_index = len(view_revisions) - 1
427
# To include the revisions merged into the last revision,
428
# extend end_rev_id down to, but not including, the next rev
429
# with the same or lesser merge_depth
430
end_merge_depth = view_revisions[end_index][2]
432
for index in xrange(end_index+1, len(view_revisions)+1):
433
if view_revisions[index][2] <= end_merge_depth:
434
end_index = index - 1
437
# if the search falls off the end then log to the end as well
438
end_index = len(view_revisions) - 1
439
view_revisions = view_revisions[start_index:end_index+1]
440
return view_revisions
443
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
445
"""Return the list of revision ids which touch a given file id.
447
The function filters view_revisions and returns a subset.
448
This includes the revisions which directly change the file id,
449
and the revisions which merge these changes. So if the
457
And 'C' changes a file, then both C and D will be returned.
459
This will also can be restricted based on a subset of the mainline.
461
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
463
# find all the revisions that change the specific file
464
# build the ancestry of each revision in the graph
465
# - only listing the ancestors that change the specific file.
466
graph = branch.repository.get_graph()
467
# This asks for all mainline revisions, which means we only have to spider
468
# sideways, rather than depth history. That said, its still size-of-history
469
# and should be addressed.
470
# mainline_revisions always includes an extra revision at the beginning, so
472
parent_map = dict(((key, value) for key, value in
473
graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
474
sorted_rev_list = tsort.topo_sort(parent_map.items())
475
text_keys = [(file_id, rev_id) for rev_id in sorted_rev_list]
476
modified_text_versions = branch.repository.texts.get_parent_map(text_keys)
478
for rev in sorted_rev_list:
479
text_key = (file_id, rev)
480
parents = parent_map[rev]
481
if text_key not in modified_text_versions and len(parents) == 1:
482
# We will not be adding anything new, so just use a reference to
483
# the parent ancestry.
484
rev_ancestry = ancestry[parents[0]]
487
if text_key in modified_text_versions:
488
rev_ancestry.add(rev)
489
for parent in parents:
490
if parent not in ancestry:
491
# parent is a Ghost, which won't be present in
492
# sorted_rev_list, but we may access it later, so create an
494
ancestry[parent] = set()
495
rev_ancestry = rev_ancestry.union(ancestry[parent])
496
ancestry[rev] = rev_ancestry
498
def is_merging_rev(r):
499
parents = parent_map[r]
501
leftparent = parents[0]
502
for rightparent in parents[1:]:
503
if not ancestry[leftparent].issuperset(
504
ancestry[rightparent]):
508
# filter from the view the revisions that did not change or merge
510
return [(r, n, d) for r, n, d in view_revs_iter
511
if (file_id, r) in modified_text_versions or is_merging_rev(r)]
514
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
515
include_merges=True):
516
"""Produce an iterator of revisions to show
517
:return: an iterator of (revision_id, revno, merge_depth)
518
(if there is no revno for a revision, None is supplied)
520
if include_merges is False:
521
revision_ids = mainline_revs[1:]
522
if direction == 'reverse':
523
revision_ids.reverse()
524
for revision_id in revision_ids:
525
yield revision_id, str(rev_nos[revision_id]), 0
527
graph = branch.repository.get_graph()
528
# This asks for all mainline revisions, which means we only have to spider
529
# sideways, rather than depth history. That said, its still size-of-history
530
# and should be addressed.
531
# mainline_revisions always includes an extra revision at the beginning, so
533
parent_map = dict(((key, value) for key, value in
534
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
535
# filter out ghosts; merge_sort errors on ghosts.
536
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
537
merge_sorted_revisions = tsort.merge_sort(
543
if direction == 'forward':
544
# forward means oldest first.
545
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
546
elif direction != 'reverse':
180
547
raise ValueError('invalid direction %r' % direction)
182
for revno, rev_id in cut_revs:
183
if verbose or specific_fileid:
184
delta = branch.get_revision_delta(revno)
187
if not delta.touches_file_id(specific_fileid):
191
# although we calculated it, throw it away without display
194
rev = branch.get_revision(rev_id)
197
if not searchRE.search(rev.message):
200
lf.show(revno, rev, delta)
204
def deltas_for_log_dummy(branch, which_revs):
205
"""Return all the revisions without intermediate deltas.
207
Useful for log commands that won't need the delta information.
210
for revno, revision_id in which_revs:
211
yield revno, branch.get_revision(revision_id), None
214
def deltas_for_log_reverse(branch, which_revs):
215
"""Compute deltas for display in latest-to-earliest order.
221
Sequence of (revno, revision_id) for the subset of history to examine
224
Sequence of (revno, rev, delta)
226
The delta is from the given revision to the next one in the
227
sequence, which makes sense if the log is being displayed from
230
last_revno = last_revision_id = last_tree = None
231
for revno, revision_id in which_revs:
232
this_tree = branch.revision_tree(revision_id)
233
this_revision = branch.get_revision(revision_id)
236
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
238
this_tree = EmptyTree(branch.get_root_id())
241
last_revision = this_revision
242
last_tree = this_tree
246
this_tree = EmptyTree(branch.get_root_id())
549
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
550
yield rev_id, '.'.join(map(str, revno)), merge_depth
553
def reverse_by_depth(merge_sorted_revisions, _depth=0):
554
"""Reverse revisions by depth.
556
Revisions with a different depth are sorted as a group with the previous
557
revision of that depth. There may be no topological justification for this,
558
but it looks much nicer.
561
for val in merge_sorted_revisions:
563
zd_revisions.append([val])
248
this_revno = last_revno - 1
249
this_revision_id = branch.revision_history()[this_revno]
250
this_tree = branch.revision_tree(this_revision_id)
251
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
254
def deltas_for_log_forward(branch, which_revs):
255
"""Compute deltas for display in forward log.
257
Given a sequence of (revno, revision_id) pairs, return
260
The delta is from the given revision to the next one in the
261
sequence, which makes sense if the log is being displayed from
565
zd_revisions[-1].append(val)
566
for revisions in zd_revisions:
567
if len(revisions) > 1:
568
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
569
zd_revisions.reverse()
571
for chunk in zd_revisions:
576
class LogRevision(object):
577
"""A revision to be logged (by LogFormatter.log_revision).
579
A simple wrapper for the attributes of a revision to be logged.
580
The attributes may or may not be populated, as determined by the
581
logging options and the log formatter capabilities.
264
last_revno = last_revision_id = last_tree = None
265
prev_tree = EmptyTree(branch.get_root_id())
267
for revno, revision_id in which_revs:
268
this_tree = branch.revision_tree(revision_id)
269
this_revision = branch.get_revision(revision_id)
273
last_tree = EmptyTree(branch.get_root_id())
275
last_revno = revno - 1
276
last_revision_id = branch.revision_history()[last_revno]
277
last_tree = branch.revision_tree(last_revision_id)
279
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
282
last_revision = this_revision
283
last_tree = this_tree
584
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
588
self.merge_depth = merge_depth
286
593
class LogFormatter(object):
287
"""Abstract class to display log messages."""
594
"""Abstract class to display log messages.
596
At a minimum, a derived class must implement the log_revision method.
598
If the LogFormatter needs to be informed of the beginning or end of
599
a log it should implement the begin_log and/or end_log hook methods.
601
A LogFormatter should define the following supports_XXX flags
602
to indicate which LogRevision attributes it supports:
604
- supports_delta must be True if this log formatter supports delta.
605
Otherwise the delta attribute may not be populated.
606
- supports_merge_revisions must be True if this log formatter supports
607
merge revisions. If not, and if supports_single_merge_revisions is
608
also not True, then only mainline revisions will be passed to the
610
- supports_single_merge_revision must be True if this log formatter
611
supports logging only a single merge revision. This flag is
612
only relevant if supports_merge_revisions is not True.
613
- supports_tags must be True if this log formatter supports tags.
614
Otherwise the tags attribute may not be populated.
616
Plugins can register functions to show custom revision properties using
617
the properties_handler_registry. The registered function
618
must respect the following interface description:
619
def my_show_properties(properties_dict):
620
# code that returns a dict {'name':'value'} of the properties
288
624
def __init__(self, to_file, show_ids=False, show_timezone='original'):
289
625
self.to_file = to_file
290
626
self.show_ids = show_ids
291
627
self.show_timezone = show_timezone
294
def show(self, revno, rev, delta):
295
raise NotImplementedError('not implemented in abstract base')
629
# TODO: uncomment this block after show() has been removed.
630
# Until then defining log_revision would prevent _show_log calling show()
631
# in legacy formatters.
632
# def log_revision(self, revision):
635
# :param revision: The LogRevision to be logged.
637
# raise NotImplementedError('not implemented in abstract base')
639
def short_committer(self, rev):
640
name, address = config.parse_username(rev.committer)
645
def short_author(self, rev):
646
name, address = config.parse_username(rev.get_apparent_author())
651
def show_properties(self, revision, indent):
652
"""Displays the custom properties returned by each registered handler.
654
If a registered handler raises an error it is propagated.
656
for key, handler in properties_handler_registry.iteritems():
657
for key, value in handler(revision).items():
658
self.to_file.write(indent + key + ': ' + value + '\n')
302
661
class LongLogFormatter(LogFormatter):
303
def show(self, revno, rev, delta):
304
from osutils import format_date
663
supports_merge_revisions = True
664
supports_delta = True
667
def log_revision(self, revision):
668
"""Log a revision, either merged or not."""
669
indent = ' ' * revision.merge_depth
306
670
to_file = self.to_file
308
print >>to_file, '-' * 60
309
print >>to_file, 'revno:', revno
671
to_file.write(indent + '-' * 60 + '\n')
672
if revision.revno is not None:
673
to_file.write(indent + 'revno: %s\n' % (revision.revno,))
675
to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
310
676
if self.show_ids:
311
print >>to_file, 'revision-id:', rev.revision_id
313
for parent in rev.parents:
314
print >>to_file, 'parent:', parent.revision_id
316
print >>to_file, 'committer:', rev.committer
318
date_str = format_date(rev.timestamp,
677
to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
679
for parent_id in revision.rev.parent_ids:
680
to_file.write(indent + 'parent: %s\n' % (parent_id,))
681
self.show_properties(revision.rev, indent)
683
author = revision.rev.properties.get('author', None)
684
if author is not None:
685
to_file.write(indent + 'author: %s\n' % (author,))
686
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))
688
branch_nick = revision.rev.properties.get('branch-nick', None)
689
if branch_nick is not None:
690
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
692
date_str = format_date(revision.rev.timestamp,
693
revision.rev.timezone or 0,
320
694
self.show_timezone)
321
print >>to_file, 'timestamp: %s' % date_str
695
to_file.write(indent + 'timestamp: %s\n' % (date_str,))
323
print >>to_file, 'message:'
325
print >>to_file, ' (no message)'
697
to_file.write(indent + 'message:\n')
698
if not revision.rev.message:
699
to_file.write(indent + ' (no message)\n')
327
for l in rev.message.split('\n'):
328
print >>to_file, ' ' + l
331
delta.show(to_file, self.show_ids)
701
message = revision.rev.message.rstrip('\r\n')
702
for l in message.split('\n'):
703
to_file.write(indent + ' %s\n' % (l,))
704
if revision.delta is not None:
705
revision.delta.show(to_file, self.show_ids, indent=indent)
335
708
class ShortLogFormatter(LogFormatter):
336
def show(self, revno, rev, delta):
337
from bzrlib.osutils import format_date
710
supports_delta = True
711
supports_single_merge_revision = True
713
def log_revision(self, revision):
339
714
to_file = self.to_file
341
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
342
format_date(rev.timestamp, rev.timezone or 0,
716
if len(revision.rev.parent_ids) > 1:
717
is_merge = ' [merge]'
718
to_file.write("%5s %s\t%s%s\n" % (revision.revno,
719
self.short_author(revision.rev),
720
format_date(revision.rev.timestamp,
721
revision.rev.timezone or 0,
722
self.show_timezone, date_fmt="%Y-%m-%d",
344
725
if self.show_ids:
345
print >>to_file, ' revision-id:', rev.revision_id
347
print >>to_file, ' (no message)'
726
to_file.write(' revision-id:%s\n' % (revision.rev.revision_id,))
727
if not revision.rev.message:
728
to_file.write(' (no message)\n')
349
for l in rev.message.split('\n'):
350
print >>to_file, ' ' + l
730
message = revision.rev.message.rstrip('\r\n')
731
for l in message.split('\n'):
732
to_file.write(' %s\n' % (l,))
352
734
# TODO: Why not show the modified files in a shorter form as
353
735
# well? rewrap them single lines of appropriate length
355
delta.show(to_file, self.show_ids)
360
FORMATTERS = {'long': LongLogFormatter,
361
'short': ShortLogFormatter,
736
if revision.delta is not None:
737
revision.delta.show(to_file, self.show_ids)
741
class LineLogFormatter(LogFormatter):
743
supports_single_merge_revision = True
745
def __init__(self, *args, **kwargs):
746
super(LineLogFormatter, self).__init__(*args, **kwargs)
747
self._max_chars = terminal_width() - 1
749
def truncate(self, str, max_len):
750
if len(str) <= max_len:
752
return str[:max_len-3]+'...'
754
def date_string(self, rev):
755
return format_date(rev.timestamp, rev.timezone or 0,
756
self.show_timezone, date_fmt="%Y-%m-%d",
759
def message(self, rev):
761
return '(no message)'
765
def log_revision(self, revision):
766
self.to_file.write(self.log_string(revision.revno, revision.rev,
768
self.to_file.write('\n')
770
def log_string(self, revno, rev, max_chars):
771
"""Format log info into one string. Truncate tail of string
772
:param revno: revision number (int) or None.
773
Revision numbers counts from 1.
774
:param rev: revision info object
775
:param max_chars: maximum length of resulting string
776
:return: formatted truncated string
780
# show revno only when is not None
781
out.append("%s:" % revno)
782
out.append(self.truncate(self.short_author(rev), 20))
783
out.append(self.date_string(rev))
784
out.append(rev.get_summary())
785
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
788
def line_log(rev, max_chars):
789
lf = LineLogFormatter(None)
790
return lf.log_string(None, rev, max_chars)
793
class LogFormatterRegistry(registry.Registry):
794
"""Registry for log formatters"""
796
def make_formatter(self, name, *args, **kwargs):
797
"""Construct a formatter from arguments.
799
:param name: Name of the formatter to construct. 'short', 'long' and
802
return self.get(name)(*args, **kwargs)
804
def get_default(self, branch):
805
return self.get(branch.get_config().log_format())
808
log_formatter_registry = LogFormatterRegistry()
811
log_formatter_registry.register('short', ShortLogFormatter,
812
'Moderately short log format')
813
log_formatter_registry.register('long', LongLogFormatter,
814
'Detailed log format')
815
log_formatter_registry.register('line', LineLogFormatter,
816
'Log format with one line per revision')
819
def register_formatter(name, formatter):
820
log_formatter_registry.register(name, formatter)
365
823
def log_formatter(name, *args, **kwargs):
366
from bzrlib.errors import BzrCommandError
824
"""Construct a formatter from arguments.
826
name -- Name of the formatter to construct; currently 'long', 'short' and
827
'line' are supported.
369
return FORMATTERS[name](*args, **kwargs)
371
raise BzrCommandError("unknown log formatter: %r" % name)
830
return log_formatter_registry.make_formatter(name, *args, **kwargs)
832
raise errors.BzrCommandError("unknown log formatter: %r" % name)
373
835
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
374
# deprecated; for compatability
836
# deprecated; for compatibility
375
837
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
376
838
lf.show(revno, rev, delta)
841
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
843
"""Show the change in revision history comparing the old revision history to the new one.
845
:param branch: The branch where the revisions exist
846
:param old_rh: The old revision history
847
:param new_rh: The new revision history
848
:param to_file: A file to write the results to. If None, stdout will be used
851
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
853
lf = log_formatter(log_format,
856
show_timezone='original')
858
# This is the first index which is different between
861
for i in xrange(max(len(new_rh),
865
or new_rh[i] != old_rh[i]):
870
to_file.write('Nothing seems to have changed\n')
872
## TODO: It might be nice to do something like show_log
873
## and show the merged entries. But since this is the
874
## removed revisions, it shouldn't be as important
875
if base_idx < len(old_rh):
876
to_file.write('*'*60)
877
to_file.write('\nRemoved Revisions:\n')
878
for i in range(base_idx, len(old_rh)):
879
rev = branch.repository.get_revision(old_rh[i])
880
lr = LogRevision(rev, i+1, 0, None)
882
to_file.write('*'*60)
883
to_file.write('\n\n')
884
if base_idx < len(new_rh):
885
to_file.write('Added Revisions:\n')
891
start_revision=base_idx+1,
892
end_revision=len(new_rh),
896
properties_handler_registry = registry.Registry()
added
removed
bzrlib/log.py
