47
49
all the changes since the previous revision that touched hello.c.
50
from __future__ import absolute_import
53
from cStringIO import StringIO
54
from itertools import (
56
60
from warnings import (
60
from .lazy_import import lazy_import
64
from bzrlib.lazy_import import lazy_import
61
65
lazy_import(globals(), """
73
repository as _mod_repository,
69
74
revision as _mod_revision,
71
from breezy.i18n import gettext, ngettext
80
from .osutils import (
84
from bzrlib.osutils import (
82
86
format_date_with_offset_in_original_timezone,
83
get_diff_header_encoding,
84
87
get_terminal_encoding,
91
from bzrlib.symbol_versioning import (
92
from .tree import find_previous_path
95
def find_touching_revisions(repository, last_revision, last_tree, last_path):
97
def find_touching_revisions(branch, file_id):
96
98
"""Yield a description of revisions which affect the file_id.
98
100
Each returned element is (revno, revision_id, description)
103
105
TODO: Perhaps some way to limit this to only particular revisions,
104
106
or to traverse a non-mainline set of revisions?
106
last_verifier = last_tree.get_file_verifier(last_path)
107
graph = repository.get_graph()
108
history = list(graph.iter_lefthand_ancestry(last_revision, []))
110
for revision_id in history:
111
this_tree = repository.revision_tree(revision_id)
112
this_path = find_previous_path(last_tree, this_tree, last_path)
111
for revision_id in branch.revision_history():
112
this_inv = branch.repository.get_inventory(revision_id)
113
if file_id in this_inv:
114
this_ie = this_inv[file_id]
115
this_path = this_inv.id2path(file_id)
117
this_ie = this_path = None
114
119
# now we know how it was last time, and how it is in this revision.
115
120
# are those two states effectively the same or not?
116
if this_path is not None and last_path is None:
117
yield revno, revision_id, "deleted " + this_path
118
this_verifier = this_tree.get_file_verifier(this_path)
119
elif this_path is None and last_path is not None:
120
yield revno, revision_id, "added " + last_path
122
if not this_ie and not last_ie:
123
# not present in either
125
elif this_ie and not last_ie:
126
yield revno, revision_id, "added " + this_path
127
elif not this_ie and last_ie:
129
yield revno, revision_id, "deleted " + last_path
121
130
elif this_path != last_path:
122
yield revno, revision_id, ("renamed %s => %s" % (this_path, last_path))
123
this_verifier = this_tree.get_file_verifier(this_path)
125
this_verifier = this_tree.get_file_verifier(this_path)
126
if (this_verifier != last_verifier):
127
yield revno, revision_id, "modified " + this_path
131
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
132
elif (this_ie.text_size != last_ie.text_size
133
or this_ie.text_sha1 != last_ie.text_sha1):
134
yield revno, revision_id, "modified " + this_path
129
last_verifier = this_verifier
130
137
last_path = this_path
131
last_tree = this_tree
132
if last_path is None:
141
def _enumerate_history(branch):
144
for rev_id in branch.revision_history():
145
rh.append((revno, rev_id))
137
150
def show_log(branch,
200
if isinstance(start_revision, int):
202
start_revision = revisionspec.RevisionInfo(branch, start_revision)
203
except errors.NoSuchRevision:
204
raise errors.InvalidRevisionNumber(start_revision)
206
if isinstance(end_revision, int):
208
end_revision = revisionspec.RevisionInfo(branch, end_revision)
209
except errors.NoSuchRevision:
210
raise errors.InvalidRevisionNumber(end_revision)
212
if end_revision is not None and end_revision.revno == 0:
213
raise errors.InvalidRevisionNumber(end_revision.revno)
215
209
# Build the request and execute it
216
210
rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
217
start_revision=start_revision, end_revision=end_revision,
218
limit=limit, message_search=search,
219
delta_type=delta_type, diff_type=diff_type)
211
start_revision=start_revision, end_revision=end_revision,
212
limit=limit, message_search=search,
213
delta_type=delta_type, diff_type=diff_type)
220
214
Logger(branch, rqst).show(lf)
223
# Note: This needs to be kept in sync with the defaults in
217
# Note: This needs to be kept this in sync with the defaults in
224
218
# make_log_request_dict() below
225
219
_DEFAULT_REQUEST_PARAMS = {
226
220
'direction': 'reverse',
228
222
'generate_tags': True,
229
223
'exclude_common_ancestry': False,
230
224
'_match_using_deltas': True,
234
228
def make_log_request_dict(direction='reverse', specific_fileids=None,
235
229
start_revision=None, end_revision=None, limit=None,
236
message_search=None, levels=None, generate_tags=True,
230
message_search=None, levels=1, generate_tags=True,
238
232
diff_type=None, _match_using_deltas=True,
239
exclude_common_ancestry=False, match=None,
240
signature=False, omit_merges=False,
233
exclude_common_ancestry=False,
242
235
"""Convenience function for making a logging request dictionary.
282
274
:param _match_using_deltas: a private parameter controlling the
283
275
algorithm used for matching specific_fileids. This parameter
284
may be removed in the future so breezy client code should NOT
276
may be removed in the future so bzrlib client code should NOT
287
279
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
288
280
range operator or as a graph difference.
290
:param signature: show digital signature information
292
:param match: Dictionary of list of search strings to use when filtering
293
revisions. Keys can be 'message', 'author', 'committer', 'bugs' or
294
the empty string to match any of the preceding properties.
296
:param omit_merges: If True, commits with more than one parent are
300
# Take care of old style message_search parameter
303
if 'message' in match:
304
match['message'].append(message_search)
306
match['message'] = [message_search]
308
match = {'message': [message_search]}
310
283
'direction': direction,
311
284
'specific_fileids': specific_fileids,
312
285
'start_revision': start_revision,
313
286
'end_revision': end_revision,
288
'message_search': message_search,
315
289
'levels': levels,
316
290
'generate_tags': generate_tags,
317
291
'delta_type': delta_type,
318
292
'diff_type': diff_type,
319
293
'exclude_common_ancestry': exclude_common_ancestry,
320
'signature': signature,
322
'omit_merges': omit_merges,
323
294
# Add 'private' attributes for features that may be deprecated
324
295
'_match_using_deltas': _match_using_deltas,
328
299
def _apply_log_request_defaults(rqst):
329
300
"""Apply default values to a request dictionary."""
330
result = _DEFAULT_REQUEST_PARAMS.copy()
301
result = _DEFAULT_REQUEST_PARAMS
332
303
result.update(rqst)
336
def format_signature_validity(rev_id, branch):
337
"""get the signature validity
339
:param rev_id: revision id to validate
340
:param branch: branch of revision
341
:return: human readable string to print to log
343
from breezy import gpg
345
gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
346
result = branch.repository.verify_revision_signature(rev_id, gpg_strategy)
347
if result[0] == gpg.SIGNATURE_VALID:
348
return u"valid signature from {0}".format(result[1])
349
if result[0] == gpg.SIGNATURE_KEY_MISSING:
350
return "unknown key {0}".format(result[1])
351
if result[0] == gpg.SIGNATURE_NOT_VALID:
352
return "invalid signature!"
353
if result[0] == gpg.SIGNATURE_NOT_SIGNED:
354
return "no signature"
357
307
class LogGenerator(object):
358
308
"""A generator of log revisions."""
401
354
# Tweak the LogRequest based on what the LogFormatter can handle.
402
355
# (There's no point generating stuff if the formatter can't display it.)
404
if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
405
# user didn't specify levels, use whatever the LF can handle:
406
rqst['levels'] = lf.get_levels()
357
rqst['levels'] = lf.get_levels()
408
358
if not getattr(lf, 'supports_tags', False):
409
359
rqst['generate_tags'] = False
410
360
if not getattr(lf, 'supports_delta', False):
411
361
rqst['delta_type'] = None
412
362
if not getattr(lf, 'supports_diff', False):
413
363
rqst['diff_type'] = None
414
if not getattr(lf, 'supports_signatures', False):
415
rqst['signature'] = False
417
365
# Find and print the interesting revisions
418
366
generator = self._generator_factory(self.branch, rqst)
420
for lr in generator.iter_log_revisions():
422
except errors.GhostRevisionUnusableHere:
423
raise errors.BzrCommandError(
424
gettext('Further revision history missing.'))
367
for lr in generator.iter_log_revisions():
427
371
def _generator_factory(self, branch, rqst):
428
372
"""Make the LogGenerator object to use.
430
374
Subclasses may wish to override this.
432
376
return _DefaultLogGenerator(branch, rqst)
456
400
levels = rqst.get('levels')
457
401
limit = rqst.get('limit')
458
402
diff_type = rqst.get('diff_type')
459
show_signature = rqst.get('signature')
460
omit_merges = rqst.get('omit_merges')
462
404
revision_iterator = self._create_log_revision_iterator()
463
405
for revs in revision_iterator:
464
406
for (rev_id, revno, merge_depth), rev, delta in revs:
465
407
# 0 levels means show everything; merge_depth counts from 0
466
if (levels != 0 and merge_depth is not None and
467
merge_depth >= levels):
469
if omit_merges and len(rev.parent_ids) > 1:
472
raise errors.GhostRevisionUnusableHere(rev_id)
408
if levels != 0 and merge_depth >= levels:
473
410
if diff_type is None:
476
413
diff = self._format_diff(rev, rev_id, diff_type)
478
signature = format_signature_validity(rev_id, self.branch)
482
rev, revno, merge_depth, delta,
483
self.rev_tag_dict.get(rev_id), diff, signature)
414
yield LogRevision(rev, revno, merge_depth, delta,
415
self.rev_tag_dict.get(rev_id), diff)
486
418
if log_count >= limit:
543
473
# Apply the other filters
544
474
return make_log_rev_iterator(self.branch, view_revisions,
545
rqst.get('delta_type'), rqst.get('match'),
546
file_ids=rqst.get('specific_fileids'),
547
direction=rqst.get('direction'))
475
rqst.get('delta_type'), rqst.get('message_search'),
476
file_ids=rqst.get('specific_fileids'),
477
direction=rqst.get('direction'))
549
479
def _log_revision_iterator_using_per_file_graph(self):
550
480
# Get the base revisions, filtering by the revision range.
558
488
if not isinstance(view_revisions, list):
559
489
view_revisions = list(view_revisions)
560
490
view_revisions = _filter_revisions_touching_file_id(self.branch,
561
rqst.get('specific_fileids')[
563
include_merges=rqst.get('levels') != 1)
491
rqst.get('specific_fileids')[0], view_revisions,
492
include_merges=rqst.get('levels') != 1)
564
493
return make_log_rev_iterator(self.branch, view_revisions,
565
rqst.get('delta_type'), rqst.get('match'))
494
rqst.get('delta_type'), rqst.get('message_search'))
568
497
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
576
505
a list of the same tuples.
578
507
if (exclude_common_ancestry and start_rev_id == end_rev_id):
579
raise errors.BzrCommandError(gettext(
580
'--exclude-common-ancestry requires two different revisions'))
508
raise errors.BzrCommandError(
509
'--exclude-common-ancestry requires two different revisions')
581
510
if direction not in ('reverse', 'forward'):
582
raise ValueError(gettext('invalid direction %r') % direction)
583
br_rev_id = branch.last_revision()
584
if br_rev_id == _mod_revision.NULL_REVISION:
511
raise ValueError('invalid direction %r' % direction)
512
br_revno, br_rev_id = branch.last_revision_info()
587
516
if (end_rev_id and start_rev_id == end_rev_id
588
517
and (not generate_merge_revisions
589
518
or not _has_merges(branch, end_rev_id))):
590
519
# If a single revision is requested, check we can handle it
591
return _generate_one_revision(branch, end_rev_id, br_rev_id,
593
if not generate_merge_revisions:
595
# If we only want to see linear revisions, we can iterate ...
596
iter_revs = _linear_view_revisions(
597
branch, start_rev_id, end_rev_id,
598
exclude_common_ancestry=exclude_common_ancestry)
599
# If a start limit was given and it's not obviously an
600
# ancestor of the end limit, check it before outputting anything
601
if (direction == 'forward'
602
or (start_rev_id and not _is_obvious_ancestor(
603
branch, start_rev_id, end_rev_id))):
604
iter_revs = list(iter_revs)
605
if direction == 'forward':
606
iter_revs = reversed(iter_revs)
608
except _StartNotLinearAncestor:
609
# Switch to the slower implementation that may be able to find a
610
# non-obvious ancestor out of the left-hand history.
612
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
613
direction, delayed_graph_generation,
614
exclude_common_ancestry)
615
if direction == 'forward':
616
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
520
iter_revs = _generate_one_revision(branch, end_rev_id, br_rev_id,
522
elif not generate_merge_revisions:
523
# If we only want to see linear revisions, we can iterate ...
524
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
526
if direction == 'forward':
527
iter_revs = reversed(iter_revs)
529
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
530
direction, delayed_graph_generation,
531
exclude_common_ancestry)
532
if direction == 'forward':
533
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
623
540
return [(br_rev_id, br_revno, 0)]
625
revno_str = _compute_revno_str(branch, rev_id)
542
revno = branch.revision_id_to_dotted_revno(rev_id)
543
revno_str = '.'.join(str(n) for n in revno)
626
544
return [(rev_id, revno_str, 0)]
547
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction):
548
result = _linear_view_revisions(branch, start_rev_id, end_rev_id)
549
# If a start limit was given and it's not obviously an
550
# ancestor of the end limit, check it before outputting anything
551
if direction == 'forward' or (start_rev_id
552
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
554
result = list(result)
555
except _StartNotLinearAncestor:
556
raise errors.BzrCommandError('Start revision not found in'
557
' left-hand history of end revision.')
629
561
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
630
562
delayed_graph_generation,
631
563
exclude_common_ancestry=False):
639
571
initial_revisions = []
640
572
if delayed_graph_generation:
642
for rev_id, revno, depth in _linear_view_revisions(
643
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
574
for rev_id, revno, depth in _linear_view_revisions(
575
branch, start_rev_id, end_rev_id):
644
576
if _has_merges(branch, rev_id):
645
577
# The end_rev_id can be nested down somewhere. We need an
646
578
# explicit ancestry check. There is an ambiguity here as we
678
610
# shown naturally, i.e. just like it is for linear logging. We can easily
679
611
# make forward the exact opposite display, but showing the merge revisions
680
612
# indented at the end seems slightly nicer in that case.
681
view_revisions = itertools.chain(iter(initial_revisions),
682
_graph_view_revisions(branch, start_rev_id, end_rev_id,
683
rebase_initial_depths=(
684
direction == 'reverse'),
685
exclude_common_ancestry=exclude_common_ancestry))
613
view_revisions = chain(iter(initial_revisions),
614
_graph_view_revisions(branch, start_rev_id, end_rev_id,
615
rebase_initial_depths=(direction == 'reverse'),
616
exclude_common_ancestry=exclude_common_ancestry))
686
617
return view_revisions
692
623
return len(parents) > 1
695
def _compute_revno_str(branch, rev_id):
696
"""Compute the revno string from a rev_id.
698
:return: The revno string, or None if the revision is not in the supplied
702
revno = branch.revision_id_to_dotted_revno(rev_id)
703
except errors.NoSuchRevision:
704
# The revision must be outside of this branch
707
return '.'.join(str(n) for n in revno)
710
626
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
711
627
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
712
628
if start_rev_id and end_rev_id:
714
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
715
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
716
except errors.NoSuchRevision:
717
# one or both is not in the branch; not obvious
629
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
630
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
719
631
if len(start_dotted) == 1 and len(end_dotted) == 1:
720
632
# both on mainline
721
633
return start_dotted[0] <= end_dotted[0]
722
634
elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
723
start_dotted[0:1] == end_dotted[0:1]):
635
start_dotted[0:1] == end_dotted[0:1]):
724
636
# both on same development line
725
637
return start_dotted[2] <= end_dotted[2]
734
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
735
exclude_common_ancestry=False):
646
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
736
647
"""Calculate a sequence of revisions to view, newest to oldest.
738
649
:param start_rev_id: the lower revision-id
739
650
:param end_rev_id: the upper revision-id
740
:param exclude_common_ancestry: Whether the start_rev_id should be part of
741
the iterated revisions.
742
651
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
743
dotted_revno will be None for ghosts
744
652
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
745
is not found walking the left-hand history
653
is not found walking the left-hand history
655
br_revno, br_rev_id = branch.last_revision_info()
747
656
repo = branch.repository
748
graph = repo.get_graph()
749
657
if start_rev_id is None and end_rev_id is None:
751
br_revno, br_rev_id = branch.last_revision_info()
752
except errors.GhostRevisionsHaveNoRevno:
753
br_rev_id = branch.last_revision()
757
graph_iter = graph.iter_lefthand_ancestry(br_rev_id,
758
(_mod_revision.NULL_REVISION,))
761
revision_id = next(graph_iter)
762
except errors.RevisionNotPresent as e:
764
yield e.revision_id, None, None
766
except StopIteration:
769
yield revision_id, str(cur_revno) if cur_revno is not None else None, 0
770
if cur_revno is not None:
659
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
660
yield revision_id, str(cur_revno), 0
773
br_rev_id = branch.last_revision()
774
663
if end_rev_id is None:
775
664
end_rev_id = br_rev_id
776
665
found_start = start_rev_id is None
777
graph_iter = graph.iter_lefthand_ancestry(end_rev_id,
778
(_mod_revision.NULL_REVISION,))
781
revision_id = next(graph_iter)
782
except StopIteration:
784
except errors.RevisionNotPresent as e:
786
yield e.revision_id, None, None
666
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
667
revno = branch.revision_id_to_dotted_revno(revision_id)
668
revno_str = '.'.join(str(n) for n in revno)
669
if not found_start and revision_id == start_rev_id:
670
yield revision_id, revno_str, 0
789
revno_str = _compute_revno_str(branch, revision_id)
790
if not found_start and revision_id == start_rev_id:
791
if not exclude_common_ancestry:
792
yield revision_id, revno_str, 0
796
yield revision_id, revno_str, 0
798
raise _StartNotLinearAncestor()
674
yield revision_id, revno_str, 0
677
raise _StartNotLinearAncestor()
801
680
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
842
721
yield rev_id, '.'.join(map(str, revno)), merge_depth
724
@deprecated_function(deprecated_in((2, 2, 0)))
725
def calculate_view_revisions(branch, start_revision, end_revision, direction,
726
specific_fileid, generate_merge_revisions):
727
"""Calculate the revisions to view.
729
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
730
a list of the same tuples.
732
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
734
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
735
direction, generate_merge_revisions or specific_fileid))
737
view_revisions = _filter_revisions_touching_file_id(branch,
738
specific_fileid, view_revisions,
739
include_merges=generate_merge_revisions)
740
return _rebase_merge_depth(view_revisions)
845
743
def _rebase_merge_depth(view_revisions):
846
744
"""Adjust depths upwards so the top level is 0."""
847
745
# If either the first or last revision have a merge_depth of 0, we're done
848
746
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
849
min_depth = min([d for r, n, d in view_revisions])
747
min_depth = min([d for r,n,d in view_revisions])
850
748
if min_depth != 0:
851
view_revisions = [(r, n, d - min_depth)
852
for r, n, d in view_revisions]
749
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
853
750
return view_revisions
856
753
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
857
file_ids=None, direction='reverse'):
754
file_ids=None, direction='reverse'):
858
755
"""Create a revision iterator for log.
860
757
:param branch: The branch being logged.
871
768
# Convert view_revisions into (view, None, None) groups to fit with
872
769
# the standard interface here.
873
if isinstance(view_revisions, list):
770
if type(view_revisions) == list:
874
771
# A single batch conversion is faster than many incremental ones.
875
772
# As we have all the data, do a batch conversion.
876
773
nones = [None] * len(view_revisions)
877
log_rev_iterator = iter([list(zip(view_revisions, nones, nones))])
774
log_rev_iterator = iter([zip(view_revisions, nones, nones)])
880
777
for view in view_revisions:
884
781
# It would be nicer if log adapters were first class objects
885
782
# with custom parameters. This will do for now. IGC 20090127
886
783
if adapter == _make_delta_filter:
887
log_rev_iterator = adapter(
888
branch, generate_delta, search, log_rev_iterator, file_ids,
784
log_rev_iterator = adapter(branch, generate_delta,
785
search, log_rev_iterator, file_ids, direction)
891
log_rev_iterator = adapter(
892
branch, generate_delta, search, log_rev_iterator)
787
log_rev_iterator = adapter(branch, generate_delta,
788
search, log_rev_iterator)
893
789
return log_rev_iterator
896
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
792
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
897
793
"""Create a filtered iterator of log_rev_iterator matching on a regex.
899
795
:param branch: The branch being logged.
900
796
:param generate_delta: Whether to generate a delta for each revision.
901
:param match: A dictionary with properties as keys and lists of strings
902
as values. To match, a revision may match any of the supplied strings
903
within a single property but must match at least one string for each
797
:param search: A user text search string.
905
798
:param log_rev_iterator: An input iterator containing all revisions that
906
799
could be displayed, in lists.
907
800
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
911
804
return log_rev_iterator
912
# Use lazy_compile so mapping to InvalidPattern error occurs.
913
searchRE = [(k, [lazy_regex.lazy_compile(x, re.IGNORECASE) for x in v])
914
for k, v in match.items()]
915
return _filter_re(searchRE, log_rev_iterator)
918
def _filter_re(searchRE, log_rev_iterator):
805
searchRE = re_compile_checked(search, re.IGNORECASE,
806
'log message filter')
807
return _filter_message_re(searchRE, log_rev_iterator)
810
def _filter_message_re(searchRE, log_rev_iterator):
919
811
for revs in log_rev_iterator:
920
new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
925
def _match_filter(searchRE, rev):
927
'message': (rev.message,),
928
'committer': (rev.committer,),
929
'author': (rev.get_apparent_authors()),
930
'bugs': list(rev.iter_bugs())
932
strings[''] = [item for inner_list in strings.values()
933
for item in inner_list]
934
for k, v in searchRE:
935
if k in strings and not _match_any_filter(strings[k], v):
940
def _match_any_filter(strings, res):
941
return any(r.search(s) for r in res for s in strings)
813
for (rev_id, revno, merge_depth), rev, delta in revs:
814
if searchRE.search(rev.message):
815
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
944
819
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
945
fileids=None, direction='reverse'):
820
fileids=None, direction='reverse'):
946
821
"""Add revision deltas to a log iterator if needed.
948
823
:param branch: The branch being logged.
991
866
if delta_type == 'full' and not check_fileids:
992
867
deltas = repository.get_deltas_for_revisions(revisions)
993
for rev, delta in zip(revs, deltas):
868
for rev, delta in izip(revs, deltas):
994
869
new_revs.append((rev[0], rev[1], delta))
996
871
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
997
for rev, delta in zip(revs, deltas):
872
for rev, delta in izip(revs, deltas):
998
873
if check_fileids:
999
874
if delta is None or not delta.has_changed():
1048
923
for revs in log_rev_iterator:
1049
924
# r = revision_id, n = revno, d = merge depth
1050
925
revision_ids = [view[0] for view, _, _ in revs]
1051
revisions = dict(repository.iter_revisions(revision_ids))
1052
yield [(rev[0], revisions[rev[0][0]], rev[2]) for rev in revs]
926
revisions = repository.get_revisions(revision_ids)
927
revs = [(rev[0], revision, rev[2]) for rev, revision in
928
izip(revs, revisions)]
1055
932
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
1089
968
:return: (start_rev_id, end_rev_id) tuple.
970
branch_revno, branch_rev_id = branch.last_revision_info()
1091
971
start_rev_id = None
1093
if start_revision is not None:
1094
if not isinstance(start_revision, revisionspec.RevisionInfo):
1095
raise TypeError(start_revision)
1096
start_rev_id = start_revision.rev_id
1097
start_revno = start_revision.revno
1098
if start_revno is None:
972
if start_revision is None:
975
if isinstance(start_revision, revisionspec.RevisionInfo):
976
start_rev_id = start_revision.rev_id
977
start_revno = start_revision.revno or 1
979
branch.check_real_revno(start_revision)
980
start_revno = start_revision
981
start_rev_id = branch.get_rev_id(start_revno)
1101
983
end_rev_id = None
1103
if end_revision is not None:
1104
if not isinstance(end_revision, revisionspec.RevisionInfo):
1105
raise TypeError(start_revision)
1106
end_rev_id = end_revision.rev_id
1107
end_revno = end_revision.revno
1108
if end_revno is None:
1110
end_revno = branch.revno()
1111
except errors.GhostRevisionsHaveNoRevno:
984
if end_revision is None:
985
end_revno = branch_revno
987
if isinstance(end_revision, revisionspec.RevisionInfo):
988
end_rev_id = end_revision.rev_id
989
end_revno = end_revision.revno or branch_revno
991
branch.check_real_revno(end_revision)
992
end_revno = end_revision
993
end_rev_id = branch.get_rev_id(end_revno)
1114
if branch.last_revision() != _mod_revision.NULL_REVISION:
995
if branch_revno != 0:
1115
996
if (start_rev_id == _mod_revision.NULL_REVISION
1116
or end_rev_id == _mod_revision.NULL_REVISION):
1117
raise errors.BzrCommandError(
1118
gettext('Logging revision 0 is invalid.'))
1119
if end_revno is not None and start_revno > end_revno:
1120
raise errors.BzrCommandError(
1121
gettext("Start revision must be older than the end revision."))
997
or end_rev_id == _mod_revision.NULL_REVISION):
998
raise errors.BzrCommandError('Logging revision 0 is invalid.')
999
if start_revno > end_revno:
1000
raise errors.BzrCommandError("Start revision must be older than "
1001
"the end revision.")
1122
1002
return (start_rev_id, end_rev_id)
1172
1052
end_revno = end_revision
1174
1054
if ((start_rev_id == _mod_revision.NULL_REVISION)
1175
or (end_rev_id == _mod_revision.NULL_REVISION)):
1176
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1055
or (end_rev_id == _mod_revision.NULL_REVISION)):
1056
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1177
1057
if start_revno > end_revno:
1178
raise errors.BzrCommandError(gettext("Start revision must be older "
1179
"than the end revision."))
1058
raise errors.BzrCommandError("Start revision must be older than "
1059
"the end revision.")
1181
1061
if end_revno < start_revno:
1182
1062
return None, None, None, None
1183
1063
cur_revno = branch_revno
1185
1065
mainline_revs = []
1186
graph = branch.repository.get_graph()
1187
for revision_id in graph.iter_lefthand_ancestry(
1188
branch_last_revision, (_mod_revision.NULL_REVISION,)):
1066
for revision_id in branch.repository.iter_reverse_revision_history(
1067
branch_last_revision):
1189
1068
if cur_revno < start_revno:
1190
1069
# We have gone far enough, but we always add 1 more revision
1191
1070
rev_nos[revision_id] = cur_revno
1205
1084
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1087
@deprecated_function(deprecated_in((2, 2, 0)))
1088
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1089
"""Filter view_revisions based on revision ranges.
1091
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1092
tuples to be filtered.
1094
:param start_rev_id: If not NONE specifies the first revision to be logged.
1095
If NONE then all revisions up to the end_rev_id are logged.
1097
:param end_rev_id: If not NONE specifies the last revision to be logged.
1098
If NONE then all revisions up to the end of the log are logged.
1100
:return: The filtered view_revisions.
1102
if start_rev_id or end_rev_id:
1103
revision_ids = [r for r, n, d in view_revisions]
1105
start_index = revision_ids.index(start_rev_id)
1108
if start_rev_id == end_rev_id:
1109
end_index = start_index
1112
end_index = revision_ids.index(end_rev_id)
1114
end_index = len(view_revisions) - 1
1115
# To include the revisions merged into the last revision,
1116
# extend end_rev_id down to, but not including, the next rev
1117
# with the same or lesser merge_depth
1118
end_merge_depth = view_revisions[end_index][2]
1120
for index in xrange(end_index+1, len(view_revisions)+1):
1121
if view_revisions[index][2] <= end_merge_depth:
1122
end_index = index - 1
1125
# if the search falls off the end then log to the end as well
1126
end_index = len(view_revisions) - 1
1127
view_revisions = view_revisions[start_index:end_index+1]
1128
return view_revisions
1208
1131
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1209
include_merges=True):
1132
include_merges=True):
1210
1133
r"""Return the list of revision ids which touch a given file id.
1212
1135
The function filters view_revisions and returns a subset.
1213
1136
This includes the revisions which directly change the file id,
1214
1137
and the revisions which merge these changes. So if the
1215
1138
revision graph is::
1257
1177
# indexing layer. We might consider passing in hints as to the known
1258
1178
# access pattern (sparse/clustered, high success rate/low success
1259
1179
# rate). This particular access is clustered with a low success rate.
1180
get_parent_map = branch.repository.texts.get_parent_map
1260
1181
modified_text_revisions = set()
1261
1182
chunk_size = 1000
1262
for start in range(0, len(text_keys), chunk_size):
1183
for start in xrange(0, len(text_keys), chunk_size):
1263
1184
next_keys = text_keys[start:start + chunk_size]
1264
1185
# Only keep the revision_id portion of the key
1265
1186
modified_text_revisions.update(
1213
@deprecated_function(deprecated_in((2, 2, 0)))
1214
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1215
include_merges=True):
1216
"""Produce an iterator of revisions to show
1217
:return: an iterator of (revision_id, revno, merge_depth)
1218
(if there is no revno for a revision, None is supplied)
1220
if not include_merges:
1221
revision_ids = mainline_revs[1:]
1222
if direction == 'reverse':
1223
revision_ids.reverse()
1224
for revision_id in revision_ids:
1225
yield revision_id, str(rev_nos[revision_id]), 0
1227
graph = branch.repository.get_graph()
1228
# This asks for all mainline revisions, which means we only have to spider
1229
# sideways, rather than depth history. That said, its still size-of-history
1230
# and should be addressed.
1231
# mainline_revisions always includes an extra revision at the beginning, so
1233
parent_map = dict(((key, value) for key, value in
1234
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1235
# filter out ghosts; merge_sort errors on ghosts.
1236
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1237
merge_sorted_revisions = tsort.merge_sort(
1241
generate_revno=True)
1243
if direction == 'forward':
1244
# forward means oldest first.
1245
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1246
elif direction != 'reverse':
1247
raise ValueError('invalid direction %r' % direction)
1249
for (sequence, rev_id, merge_depth, revno, end_of_merge
1250
) in merge_sorted_revisions:
1251
yield rev_id, '.'.join(map(str, revno)), merge_depth
1292
1254
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1293
1255
"""Reverse revisions by depth.
1295
1257
Revisions with a different depth are sorted as a group with the previous
1296
revision of that depth. There may be no topological justification for this
1258
revision of that depth. There may be no topological justification for this,
1297
1259
but it looks much nicer.
1299
1261
# Add a fake revision at start so that we can always attach sub revisions
1354
1312
to indicate which LogRevision attributes it supports:
1356
1314
- supports_delta must be True if this log formatter supports delta.
1357
Otherwise the delta attribute may not be populated. The 'delta_format'
1358
attribute describes whether the 'short_status' format (1) or the long
1359
one (2) should be used.
1315
Otherwise the delta attribute may not be populated. The 'delta_format'
1316
attribute describes whether the 'short_status' format (1) or the long
1317
one (2) should be used.
1361
1319
- supports_merge_revisions must be True if this log formatter supports
1362
merge revisions. If not, then only mainline revisions will be passed
1320
merge revisions. If not, then only mainline revisions will be passed
1365
1323
- preferred_levels is the number of levels this formatter defaults to.
1366
The default value is zero meaning display all levels.
1367
This value is only relevant if supports_merge_revisions is True.
1324
The default value is zero meaning display all levels.
1325
This value is only relevant if supports_merge_revisions is True.
1369
1327
- supports_tags must be True if this log formatter supports tags.
1370
Otherwise the tags attribute may not be populated.
1328
Otherwise the tags attribute may not be populated.
1372
1330
- supports_diff must be True if this log formatter supports diffs.
1373
Otherwise the diff attribute may not be populated.
1375
- supports_signatures must be True if this log formatter supports GPG
1331
Otherwise the diff attribute may not be populated.
1378
1333
Plugins can register functions to show custom revision properties using
1379
1334
the properties_handler_registry. The registered function
1380
must respect the following interface description::
1335
must respect the following interface description:
1382
1336
def my_show_properties(properties_dict):
1383
1337
# code that returns a dict {'name':'value'} of the properties
1388
1342
def __init__(self, to_file, show_ids=False, show_timezone='original',
1389
1343
delta_format=None, levels=None, show_advice=False,
1390
to_exact_file=None, author_list_handler=None):
1344
to_exact_file=None):
1391
1345
"""Create a LogFormatter.
1393
1347
:param to_file: the file to output to
1394
:param to_exact_file: if set, gives an output stream to which
1348
:param to_exact_file: if set, gives an output stream to which
1395
1349
non-Unicode diffs are written.
1396
1350
:param show_ids: if True, revision-ids are to be displayed
1397
1351
:param show_timezone: the timezone to use
1401
1355
let the log formatter decide.
1402
1356
:param show_advice: whether to show advice at the end of the
1404
:param author_list_handler: callable generating a list of
1405
authors to display for a given revision
1407
1359
self.to_file = to_file
1408
1360
# 'exact' stream used to show diff, it should print content 'as is'
1409
# and should not try to decode/encode it to unicode to avoid bug
1361
# and should not try to decode/encode it to unicode to avoid bug #328007
1411
1362
if to_exact_file is not None:
1412
1363
self.to_exact_file = to_exact_file
1414
# XXX: somewhat hacky; this assumes it's a codec writer; it's
1415
# better for code that expects to get diffs to pass in the exact
1365
# XXX: somewhat hacky; this assumes it's a codec writer; it's better
1366
# for code that expects to get diffs to pass in the exact file
1417
1368
self.to_exact_file = getattr(to_file, 'stream', to_file)
1418
1369
self.show_ids = show_ids
1419
1370
self.show_timezone = show_timezone
1420
1371
if delta_format is None:
1421
1372
# Ensures backward compatibility
1422
delta_format = 2 # long format
1373
delta_format = 2 # long format
1423
1374
self.delta_format = delta_format
1424
1375
self.levels = levels
1425
1376
self._show_advice = show_advice
1426
1377
self._merge_count = 0
1427
self._author_list_handler = author_list_handler
1429
1379
def get_levels(self):
1430
1380
"""Get the number of levels to display or 0 for all."""
1464
1414
def short_author(self, rev):
1465
return self.authors(rev, 'first', short=True, sep=', ')
1467
def authors(self, rev, who, short=False, sep=None):
1468
"""Generate list of authors, taking --authors option into account.
1470
The caller has to specify the name of a author list handler,
1471
as provided by the author list registry, using the ``who``
1472
argument. That name only sets a default, though: when the
1473
user selected a different author list generation using the
1474
``--authors`` command line switch, as represented by the
1475
``author_list_handler`` constructor argument, that value takes
1478
:param rev: The revision for which to generate the list of authors.
1479
:param who: Name of the default handler.
1480
:param short: Whether to shorten names to either name or address.
1481
:param sep: What separator to use for automatic concatenation.
1483
if self._author_list_handler is not None:
1484
# The user did specify --authors, which overrides the default
1485
author_list_handler = self._author_list_handler
1487
# The user didn't specify --authors, so we use the caller's default
1488
author_list_handler = author_list_registry.get(who)
1489
names = author_list_handler(rev)
1491
for i in range(len(names)):
1492
name, address = config.parse_username(names[i])
1498
names = sep.join(names)
1415
name, address = config.parse_username(rev.get_apparent_authors()[0])
1501
1420
def merge_marker(self, revision):
1502
1421
"""Get the merge marker to include in the output or '' if none."""
1600
1513
lines = [_LONG_SEP]
1601
1514
if revision.revno is not None:
1602
1515
lines.append('revno: %s%s' % (revision.revno,
1603
self.merge_marker(revision)))
1516
self.merge_marker(revision)))
1604
1517
if revision.tags:
1605
lines.append('tags: %s' % (', '.join(sorted(revision.tags))))
1606
if self.show_ids or revision.revno is None:
1607
lines.append('revision-id: %s' %
1608
(revision.rev.revision_id.decode('utf-8'),))
1518
lines.append('tags: %s' % (', '.join(revision.tags)))
1609
1519
if self.show_ids:
1520
lines.append('revision-id: %s' % (revision.rev.revision_id,))
1610
1521
for parent_id in revision.rev.parent_ids:
1611
lines.append('parent: %s' % (parent_id.decode('utf-8'),))
1522
lines.append('parent: %s' % (parent_id,))
1612
1523
lines.extend(self.custom_properties(revision.rev))
1614
1525
committer = revision.rev.committer
1615
authors = self.authors(revision.rev, 'all')
1526
authors = revision.rev.get_apparent_authors()
1616
1527
if authors != [committer]:
1617
1528
lines.append('author: %s' % (", ".join(authors),))
1618
1529
lines.append('committer: %s' % (committer,))
1639
1547
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1640
1548
if revision.delta is not None:
1641
1549
# Use the standard status output to display changes
1642
from breezy.delta import report_delta
1643
report_delta(to_file, revision.delta, short_status=False,
1550
from bzrlib.delta import report_delta
1551
report_delta(to_file, revision.delta, short_status=False,
1644
1552
show_ids=self.show_ids, indent=indent)
1645
1553
if revision.diff is not None:
1646
1554
to_file.write(indent + 'diff:\n')
1690
1598
to_file = self.to_file
1692
1600
if revision.tags:
1693
tags = ' {%s}' % (', '.join(sorted(revision.tags)))
1601
tags = ' {%s}' % (', '.join(revision.tags))
1694
1602
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1695
revision.revno or "", self.short_author(
1697
format_date(revision.rev.timestamp,
1698
revision.rev.timezone or 0,
1699
self.show_timezone, date_fmt="%Y-%m-%d",
1701
tags, self.merge_marker(revision)))
1702
self.show_properties(revision.rev, indent + offset)
1703
if self.show_ids or revision.revno is None:
1603
revision.revno, self.short_author(revision.rev),
1604
format_date(revision.rev.timestamp,
1605
revision.rev.timezone or 0,
1606
self.show_timezone, date_fmt="%Y-%m-%d",
1608
tags, self.merge_marker(revision)))
1609
self.show_properties(revision.rev, indent+offset)
1704
1611
to_file.write(indent + offset + 'revision-id:%s\n'
1705
% (revision.rev.revision_id.decode('utf-8'),))
1612
% (revision.rev.revision_id,))
1706
1613
if not revision.rev.message:
1707
1614
to_file.write(indent + offset + '(no message)\n')
1713
1620
if revision.delta is not None:
1714
1621
# Use the standard status output to display changes
1715
from breezy.delta import report_delta
1716
report_delta(to_file, revision.delta,
1717
short_status=self.delta_format == 1,
1622
from bzrlib.delta import report_delta
1623
report_delta(to_file, revision.delta,
1624
short_status=self.delta_format==1,
1718
1625
show_ids=self.show_ids, indent=indent + offset)
1719
1626
if revision.diff is not None:
1720
1627
self.show_diff(self.to_exact_file, revision.diff, ' ')
1754
1661
def log_revision(self, revision):
1755
1662
indent = ' ' * revision.merge_depth
1756
1663
self.to_file.write(self.log_string(revision.revno, revision.rev,
1757
self._max_chars, revision.tags, indent))
1664
self._max_chars, revision.tags, indent))
1758
1665
self.to_file.write('\n')
1760
1667
def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1761
1668
"""Format log info into one string. Truncate tail of string
1763
:param revno: revision number or None.
1764
Revision numbers counts from 1.
1765
:param rev: revision object
1766
:param max_chars: maximum length of resulting string
1767
:param tags: list of tags or None
1768
:param prefix: string to prefix each line
1769
:return: formatted truncated string
1669
:param revno: revision number or None.
1670
Revision numbers counts from 1.
1671
:param rev: revision object
1672
:param max_chars: maximum length of resulting string
1673
:param tags: list of tags or None
1674
:param prefix: string to prefix each line
1675
:return: formatted truncated string
1773
1679
# show revno only when is not None
1774
1680
out.append("%s:" % revno)
1775
if max_chars is not None:
1776
out.append(self.truncate(
1777
self.short_author(rev), (max_chars + 3) // 4))
1779
out.append(self.short_author(rev))
1681
out.append(self.truncate(self.short_author(rev), 20))
1780
1682
out.append(self.date_string(rev))
1781
1683
if len(rev.parent_ids) > 1:
1782
1684
out.append('[merge]')
1784
tag_str = '{%s}' % (', '.join(sorted(tags)))
1686
tag_str = '{%s}' % (', '.join(tags))
1785
1687
out.append(tag_str)
1786
1688
out.append(rev.get_summary())
1787
1689
return self.truncate(prefix + " ".join(out).rstrip('\n'), max_chars)
1801
1703
self.show_timezone,
1802
1704
date_fmt='%Y-%m-%d',
1803
1705
show_offset=False)
1804
committer_str = self.authors(revision.rev, 'first', sep=', ')
1805
committer_str = committer_str.replace(' <', ' <')
1806
to_file.write('%s %s\n\n' % (date_str, committer_str))
1706
committer_str = revision.rev.get_apparent_authors()[0].replace (' <', ' <')
1707
to_file.write('%s %s\n\n' % (date_str,committer_str))
1808
1709
if revision.delta is not None and revision.delta.has_changed():
1809
1710
for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
1811
1712
to_file.write('\t* %s:\n' % (path,))
1812
1713
for c in revision.delta.renamed:
1813
oldpath, newpath = c[:2]
1714
oldpath,newpath = c[:2]
1814
1715
# For renamed files, show both the old and the new path
1815
to_file.write('\t* %s:\n\t* %s:\n' % (oldpath, newpath))
1716
to_file.write('\t* %s:\n\t* %s:\n' % (oldpath,newpath))
1816
1717
to_file.write('\n')
1818
1719
if not revision.rev.message:
1841
1742
return self.get(name)(*args, **kwargs)
1843
1744
def get_default(self, branch):
1844
c = branch.get_config_stack()
1845
return self.get(c.get('log_format'))
1745
return self.get(branch.get_config().log_format())
1848
1748
log_formatter_registry = LogFormatterRegistry()
1851
1751
log_formatter_registry.register('short', ShortLogFormatter,
1852
'Moderately short log format.')
1752
'Moderately short log format')
1853
1753
log_formatter_registry.register('long', LongLogFormatter,
1854
'Detailed log format.')
1754
'Detailed log format')
1855
1755
log_formatter_registry.register('line', LineLogFormatter,
1856
'Log format with one line per revision.')
1756
'Log format with one line per revision')
1857
1757
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
1858
'Format used by GNU ChangeLog files.')
1758
'Format used by GNU ChangeLog files')
1861
1761
def register_formatter(name, formatter):
1872
1772
return log_formatter_registry.make_formatter(name, *args, **kwargs)
1873
1773
except KeyError:
1874
raise errors.BzrCommandError(
1875
gettext("unknown log formatter: %r") % name)
1878
def author_list_all(rev):
1879
return rev.get_apparent_authors()[:]
1882
def author_list_first(rev):
1883
lst = rev.get_apparent_authors()
1890
def author_list_committer(rev):
1891
return [rev.committer]
1894
author_list_registry = registry.Registry()
1896
author_list_registry.register('all', author_list_all,
1899
author_list_registry.register('first', author_list_first,
1902
author_list_registry.register('committer', author_list_committer,
1774
raise errors.BzrCommandError("unknown log formatter: %r" % name)
1777
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1778
# deprecated; for compatibility
1779
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1780
lf.show(revno, rev, delta)
1906
1783
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1923
1800
# This is the first index which is different between
1925
1802
base_idx = None
1926
for i in range(max(len(new_rh), len(old_rh))):
1803
for i in xrange(max(len(new_rh),
1927
1805
if (len(new_rh) <= i
1928
1806
or len(old_rh) <= i
1929
or new_rh[i] != old_rh[i]):
1807
or new_rh[i] != old_rh[i]):
1933
1811
if base_idx is None:
1934
1812
to_file.write('Nothing seems to have changed\n')
1936
# TODO: It might be nice to do something like show_log
1937
# and show the merged entries. But since this is the
1938
# removed revisions, it shouldn't be as important
1814
## TODO: It might be nice to do something like show_log
1815
## and show the merged entries. But since this is the
1816
## removed revisions, it shouldn't be as important
1939
1817
if base_idx < len(old_rh):
1940
to_file.write('*' * 60)
1818
to_file.write('*'*60)
1941
1819
to_file.write('\nRemoved Revisions:\n')
1942
1820
for i in range(base_idx, len(old_rh)):
1943
1821
rev = branch.repository.get_revision(old_rh[i])
1944
lr = LogRevision(rev, i + 1, 0, None)
1822
lr = LogRevision(rev, i+1, 0, None)
1945
1823
lf.log_revision(lr)
1946
to_file.write('*' * 60)
1824
to_file.write('*'*60)
1947
1825
to_file.write('\n\n')
1948
1826
if base_idx < len(new_rh):
1949
1827
to_file.write('Added Revisions:\n')
2026
1903
log_format = log_formatter_registry.get_default(branch)
2027
1904
lf = log_format(show_ids=False, to_file=output, show_timezone='original')
2028
1905
if old_history != []:
2029
output.write('*' * 60)
1906
output.write('*'*60)
2030
1907
output.write('\nRemoved Revisions:\n')
2031
1908
show_flat_log(branch.repository, old_history, old_revno, lf)
2032
output.write('*' * 60)
1909
output.write('*'*60)
2033
1910
output.write('\n\n')
2034
1911
if new_history != []:
2035
1912
output.write('Added Revisions:\n')
2036
1913
start_revno = new_revno - len(new_history) + 1
2037
1914
show_log(branch, lf, None, verbose=False, direction='forward',
2038
start_revision=start_revno)
1915
start_revision=start_revno,)
2041
1918
def show_flat_log(repository, history, last_revno, lf):
2046
1923
:param last_revno: The revno of the last revision_id in the history.
2047
1924
:param lf: The log formatter to use.
1926
start_revno = last_revno - len(history) + 1
2049
1927
revisions = repository.get_revisions(history)
2050
1928
for i, rev in enumerate(revisions):
2051
1929
lr = LogRevision(rev, i + last_revno, 0, None)
2052
1930
lf.log_revision(lr)
2055
def _get_info_for_log_files(revisionspec_list, file_list, add_cleanup):
1933
def _get_info_for_log_files(revisionspec_list, file_list):
2056
1934
"""Find file-ids and kinds given a list of files and a revision range.
2058
1936
We search for files at the end of the range. If not found there,
2062
1940
:param file_list: the list of paths given on the command line;
2063
1941
the first of these can be a branch location or a file path,
2064
1942
the remainder must be file paths
2065
:param add_cleanup: When the branch returned is read locked,
2066
an unlock call will be queued to the cleanup.
2067
1943
:return: (branch, info_list, start_rev_info, end_rev_info) where
2068
1944
info_list is a list of (relative_path, file_id, kind) tuples where
2069
1945
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2070
1946
branch will be read-locked.
2072
from breezy.builtins import _get_revision_range
2073
tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2075
add_cleanup(b.lock_read().unlock)
1948
from builtins import _get_revision_range, safe_relpath_files
1949
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2076
1951
# XXX: It's damn messy converting a list of paths to relative paths when
2077
1952
# those paths might be deleted ones, they might be on a case-insensitive
2078
1953
# filesystem and/or they might be in silly locations (like another branch).
2082
1957
# case of running log in a nested directory, assuming paths beyond the
2083
1958
# first one haven't been deleted ...
2085
relpaths = [path] + tree.safe_relpath_files(file_list[1:])
1960
relpaths = [path] + safe_relpath_files(tree, file_list[1:])
2087
1962
relpaths = [path] + file_list[1:]
2089
1964
start_rev_info, end_rev_info = _get_revision_range(revisionspec_list, b,
2091
1966
if relpaths in ([], [u'']):
2092
1967
return b, [], start_rev_info, end_rev_info
2093
1968
if start_rev_info is None and end_rev_info is None:
2143
2018
tree1 = b.repository.revision_tree(rev_id)
2144
2019
file_id = tree1.path2id(fp)
2145
kind = _get_kind_for_file_id(tree1, fp, file_id)
2020
kind = _get_kind_for_file_id(tree1, file_id)
2146
2021
info_list.append((fp, file_id, kind))
2147
2022
return b, info_list, start_rev_info, end_rev_info
2150
def _get_kind_for_file_id(tree, path, file_id):
2025
def _get_kind_for_file_id(tree, file_id):
2151
2026
"""Return the kind of a file-id or None if it doesn't exist."""
2152
2027
if file_id is not None:
2153
return tree.kind(path)
2028
return tree.kind(file_id)
2158
2033
properties_handler_registry = registry.Registry()
2160
2035
# Use the properties handlers to print out bug information if available
2163
2036
def _bugs_properties_handler(revision):
2165
related_bug_urls = []
2166
for bug_url, status in revision.iter_bugs():
2167
if status == 'fixed':
2168
fixed_bug_urls.append(bug_url)
2169
elif status == 'related':
2170
related_bug_urls.append(bug_url)
2173
text = ngettext('fixes bug', 'fixes bugs', len(fixed_bug_urls))
2174
ret[text] = ' '.join(fixed_bug_urls)
2175
if related_bug_urls:
2176
text = ngettext('related bug', 'related bugs',
2177
len(related_bug_urls))
2178
ret[text] = ' '.join(related_bug_urls)
2037
if revision.properties.has_key('bugs'):
2038
bug_lines = revision.properties['bugs'].split('\n')
2039
bug_rows = [line.split(' ', 1) for line in bug_lines]
2040
fixed_bug_urls = [row[0] for row in bug_rows if
2041
len(row) > 1 and row[1] == 'fixed']
2044
return {'fixes bug(s)': ' '.join(fixed_bug_urls)}
2182
2047
properties_handler_registry.register('bugs_properties_handler',
2183
2048
_bugs_properties_handler)
added
removed
bzrlib/log.py
