150
144
start_revision=None,
151
145
end_revision=None,
155
148
"""Write out human-readable log of commits to this branch.
157
This function is being retained for backwards compatibility but
158
should not be extended with new parameters. Use the new Logger class
159
instead, eg. Logger(branch, rqst).show(lf), adding parameters to the
160
make_log_request_dict function.
162
:param lf: The LogFormatter object showing the output.
164
:param specific_fileid: If not None, list only the commits affecting the
165
specified file, rather than all commits.
167
:param verbose: If True show added/changed/deleted/renamed files.
169
:param direction: 'reverse' (default) is latest to earliest; 'forward' is
172
:param start_revision: If not None, only show revisions >= start_revision
174
:param end_revision: If not None, only show revisions <= end_revision
176
:param search: If not None, only show revisions with matching commit
179
:param limit: If set, shows only 'limit' revisions, all revisions are shown
182
:param show_diff: If True, output a diff after each revision.
184
# Convert old-style parameters to new-style parameters
185
if specific_fileid is not None:
186
file_ids = [specific_fileid]
191
delta_type = 'partial'
198
diff_type = 'partial'
204
# Build the request and execute it
205
rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
206
start_revision=start_revision, end_revision=end_revision,
207
limit=limit, message_search=search,
208
delta_type=delta_type, diff_type=diff_type)
209
Logger(branch, rqst).show(lf)
212
# Note: This needs to be kept this in sync with the defaults in
213
# make_log_request_dict() below
214
_DEFAULT_REQUEST_PARAMS = {
215
'direction': 'reverse',
217
'generate_tags': True,
218
'_match_using_deltas': True,
222
def make_log_request_dict(direction='reverse', specific_fileids=None,
223
start_revision=None, end_revision=None, limit=None,
224
message_search=None, levels=1, generate_tags=True, delta_type=None,
225
diff_type=None, _match_using_deltas=True):
226
"""Convenience function for making a logging request dictionary.
228
Using this function may make code slightly safer by ensuring
229
parameters have the correct names. It also provides a reference
230
point for documenting the supported parameters.
232
:param direction: 'reverse' (default) is latest to earliest;
233
'forward' is earliest to latest.
235
:param specific_fileids: If not None, only include revisions
236
affecting the specified files, rather than all revisions.
238
:param start_revision: If not None, only generate
239
revisions >= start_revision
241
:param end_revision: If not None, only generate
242
revisions <= end_revision
244
:param limit: If set, generate only 'limit' revisions, all revisions
245
are shown if None or 0.
247
:param message_search: If not None, only include revisions with
248
matching commit messages
250
:param levels: the number of levels of revisions to
251
generate; 1 for just the mainline; 0 for all levels.
253
:param generate_tags: If True, include tags for matched revisions.
255
:param delta_type: Either 'full', 'partial' or None.
256
'full' means generate the complete delta - adds/deletes/modifies/etc;
257
'partial' means filter the delta using specific_fileids;
258
None means do not generate any delta.
260
:param diff_type: Either 'full', 'partial' or None.
261
'full' means generate the complete diff - adds/deletes/modifies/etc;
262
'partial' means filter the diff using specific_fileids;
263
None means do not generate any diff.
265
:param _match_using_deltas: a private parameter controlling the
266
algorithm used for matching specific_fileids. This parameter
267
may be removed in the future so bzrlib client code should NOT
271
'direction': direction,
272
'specific_fileids': specific_fileids,
273
'start_revision': start_revision,
274
'end_revision': end_revision,
276
'message_search': message_search,
278
'generate_tags': generate_tags,
279
'delta_type': delta_type,
280
'diff_type': diff_type,
281
# Add 'private' attributes for features that may be deprecated
282
'_match_using_deltas': _match_using_deltas,
286
def _apply_log_request_defaults(rqst):
287
"""Apply default values to a request dictionary."""
288
result = _DEFAULT_REQUEST_PARAMS
294
class LogGenerator(object):
295
"""A generator of log revisions."""
297
def iter_log_revisions(self):
298
"""Iterate over LogRevision objects.
300
:return: An iterator yielding LogRevision objects.
302
raise NotImplementedError(self.iter_log_revisions)
305
class Logger(object):
306
"""An object the generates, formats and displays a log."""
308
def __init__(self, branch, rqst):
311
:param branch: the branch to log
312
:param rqst: A dictionary specifying the query parameters.
313
See make_log_request_dict() for supported values.
316
self.rqst = _apply_log_request_defaults(rqst)
321
:param lf: The LogFormatter object to send the output to.
323
if not isinstance(lf, LogFormatter):
324
warn("not a LogFormatter instance: %r" % lf)
326
self.branch.lock_read()
328
if getattr(lf, 'begin_log', None):
331
if getattr(lf, 'end_log', None):
336
def _show_body(self, lf):
337
"""Show the main log output.
339
Subclasses may wish to override this.
341
# Tweak the LogRequest based on what the LogFormatter can handle.
342
# (There's no point generating stuff if the formatter can't display it.)
344
rqst['levels'] = lf.get_levels()
345
if not getattr(lf, 'supports_tags', False):
346
rqst['generate_tags'] = False
347
if not getattr(lf, 'supports_delta', False):
348
rqst['delta_type'] = None
349
if not getattr(lf, 'supports_diff', False):
350
rqst['diff_type'] = None
352
# Find and print the interesting revisions
353
generator = self._generator_factory(self.branch, rqst)
354
for lr in generator.iter_log_revisions():
151
LogFormatter object to show the output.
154
If true, list only the commits affecting the specified
155
file, rather than all commits.
158
If true show added/changed/deleted/renamed files.
161
'reverse' (default) is latest to earliest;
162
'forward' is earliest to latest.
165
If not None, only show revisions >= start_revision
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
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."""
200
if not isinstance(lf, LogFormatter):
201
warn("not a LogFormatter instance: %r" % lf)
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)
214
generate_tags = getattr(lf, 'supports_tags', False)
216
if branch.supports_tags():
217
rev_tag_dict = branch.tags.get_reverse_tag_dict()
219
generate_delta = verbose and getattr(lf, 'supports_delta', False)
221
# now we just print all the revisions
223
revision_iterator = make_log_rev_iterator(branch, view_revisions,
224
generate_delta, search)
225
for revs in revision_iterator:
226
for (rev_id, revno, merge_depth), rev, delta in revs:
227
lr = LogRevision(rev, revno, merge_depth, delta,
228
rev_tag_dict.get(rev_id))
355
229
lf.log_revision(lr)
358
def _generator_factory(self, branch, rqst):
359
"""Make the LogGenerator object to use.
361
Subclasses may wish to override this.
363
return _DefaultLogGenerator(branch, rqst)
366
class _StartNotLinearAncestor(Exception):
367
"""Raised when a start revision is not found walking left-hand history."""
370
class _DefaultLogGenerator(LogGenerator):
371
"""The default generator of log revisions."""
373
def __init__(self, branch, rqst):
376
if rqst.get('generate_tags') and branch.supports_tags():
377
self.rev_tag_dict = branch.tags.get_reverse_tag_dict()
379
self.rev_tag_dict = {}
381
def iter_log_revisions(self):
382
"""Iterate over LogRevision objects.
384
:return: An iterator yielding LogRevision objects.
388
revision_iterator = self._create_log_revision_iterator()
389
for revs in revision_iterator:
390
for (rev_id, revno, merge_depth), rev, delta in revs:
391
# 0 levels means show everything; merge_depth counts from 0
392
levels = rqst.get('levels')
393
if levels != 0 and merge_depth >= levels:
395
diff = self._format_diff(rev, rev_id)
396
yield LogRevision(rev, revno, merge_depth, delta,
397
self.rev_tag_dict.get(rev_id), diff)
398
limit = rqst.get('limit')
401
if log_count >= limit:
404
def _format_diff(self, rev, rev_id):
405
diff_type = self.rqst.get('diff_type')
406
if diff_type is None:
408
repo = self.branch.repository
409
if len(rev.parent_ids) == 0:
410
ancestor_id = _mod_revision.NULL_REVISION
412
ancestor_id = rev.parent_ids[0]
413
tree_1 = repo.revision_tree(ancestor_id)
414
tree_2 = repo.revision_tree(rev_id)
415
file_ids = self.rqst.get('specific_fileids')
416
if diff_type == 'partial' and file_ids is not None:
417
specific_files = [tree_2.id2path(id) for id in file_ids]
419
specific_files = None
421
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
425
def _create_log_revision_iterator(self):
426
"""Create a revision iterator for log.
428
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
431
self.start_rev_id, self.end_rev_id = _get_revision_limits(
432
self.branch, self.rqst.get('start_revision'),
433
self.rqst.get('end_revision'))
434
if self.rqst.get('_match_using_deltas'):
435
return self._log_revision_iterator_using_delta_matching()
437
# We're using the per-file-graph algorithm. This scales really
438
# well but only makes sense if there is a single file and it's
440
file_count = len(self.rqst.get('specific_fileids'))
442
raise BzrError("illegal LogRequest: must match-using-deltas "
443
"when logging %d files" % file_count)
444
return self._log_revision_iterator_using_per_file_graph()
446
def _log_revision_iterator_using_delta_matching(self):
447
# Get the base revisions, filtering by the revision range
449
generate_merge_revisions = rqst.get('levels') != 1
450
delayed_graph_generation = not rqst.get('specific_fileids') and (
451
rqst.get('limit') or self.start_rev_id or self.end_rev_id)
452
view_revisions = _calc_view_revisions(self.branch, self.start_rev_id,
453
self.end_rev_id, rqst.get('direction'), generate_merge_revisions,
454
delayed_graph_generation=delayed_graph_generation)
456
# Apply the other filters
457
return make_log_rev_iterator(self.branch, view_revisions,
458
rqst.get('delta_type'), rqst.get('message_search'),
459
file_ids=rqst.get('specific_fileids'),
460
direction=rqst.get('direction'))
462
def _log_revision_iterator_using_per_file_graph(self):
463
# Get the base revisions, filtering by the revision range.
464
# Note that we always generate the merge revisions because
465
# filter_revisions_touching_file_id() requires them ...
467
view_revisions = _calc_view_revisions(self.branch, self.start_rev_id,
468
self.end_rev_id, rqst.get('direction'), True)
469
if not isinstance(view_revisions, list):
470
view_revisions = list(view_revisions)
471
view_revisions = _filter_revisions_touching_file_id(self.branch,
472
rqst.get('specific_fileids')[0], view_revisions,
473
include_merges=rqst.get('levels') != 1)
474
return make_log_rev_iterator(self.branch, view_revisions,
475
rqst.get('delta_type'), rqst.get('message_search'))
478
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
479
generate_merge_revisions, delayed_graph_generation=False):
480
"""Calculate the revisions to view.
482
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
483
a list of the same tuples.
485
br_revno, br_rev_id = branch.last_revision_info()
232
if log_count >= limit:
236
def calculate_view_revisions(branch, start_revision, end_revision, direction,
237
specific_fileid, generate_merge_revisions,
238
allow_single_merge_revision):
239
if (not generate_merge_revisions and start_revision is end_revision is
240
None and direction == 'reverse' and specific_fileid is None):
241
return _linear_view_revisions(branch)
243
mainline_revs, rev_nos, start_rev_id, end_rev_id = \
244
_get_mainline_revs(branch, start_revision, end_revision)
245
if not mainline_revs:
489
# If a single revision is requested, check we can handle it
490
generate_single_revision = (end_rev_id and start_rev_id == end_rev_id and
491
(not generate_merge_revisions or not _has_merges(branch, end_rev_id)))
492
if generate_single_revision:
493
return _generate_one_revision(branch, end_rev_id, br_rev_id, br_revno)
495
# If we only want to see linear revisions, we can iterate ...
496
if not generate_merge_revisions:
497
return _generate_flat_revisions(branch, start_rev_id, end_rev_id,
500
return _generate_all_revisions(branch, start_rev_id, end_rev_id,
501
direction, delayed_graph_generation)
504
def _generate_one_revision(branch, rev_id, br_rev_id, br_revno):
505
if rev_id == br_rev_id:
507
return [(br_rev_id, br_revno, 0)]
509
revno = branch.revision_id_to_dotted_revno(rev_id)
510
revno_str = '.'.join(str(n) for n in revno)
511
return [(rev_id, revno_str, 0)]
514
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction):
515
result = _linear_view_revisions(branch, start_rev_id, end_rev_id)
516
# If a start limit was given and it's not obviously an
517
# ancestor of the end limit, check it before outputting anything
518
if direction == 'forward' or (start_rev_id
519
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
521
result = list(result)
522
except _StartNotLinearAncestor:
523
raise errors.BzrCommandError('Start revision not found in'
524
' left-hand history of end revision.')
525
if direction == 'forward':
526
result = reversed(result)
530
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
531
delayed_graph_generation):
532
# On large trees, generating the merge graph can take 30-60 seconds
533
# so we delay doing it until a merge is detected, incrementally
534
# returning initial (non-merge) revisions while we can.
535
initial_revisions = []
536
if delayed_graph_generation:
538
for rev_id, revno, depth in \
539
_linear_view_revisions(branch, start_rev_id, end_rev_id):
540
if _has_merges(branch, rev_id):
544
initial_revisions.append((rev_id, revno, depth))
546
# No merged revisions found
547
if direction == 'reverse':
548
return initial_revisions
549
elif direction == 'forward':
550
return reversed(initial_revisions)
552
raise ValueError('invalid direction %r' % direction)
553
except _StartNotLinearAncestor:
554
# A merge was never detected so the lower revision limit can't
555
# be nested down somewhere
556
raise errors.BzrCommandError('Start revision not found in'
557
' history of end revision.')
559
# A log including nested merges is required. If the direction is reverse,
560
# we rebase the initial merge depths so that the development line is
561
# shown naturally, i.e. just like it is for linear logging. We can easily
562
# make forward the exact opposite display, but showing the merge revisions
563
# indented at the end seems slightly nicer in that case.
564
view_revisions = chain(iter(initial_revisions),
565
_graph_view_revisions(branch, start_rev_id, end_rev_id,
566
rebase_initial_depths=direction == 'reverse'))
567
248
if direction == 'reverse':
568
return view_revisions
569
elif direction == 'forward':
570
# Forward means oldest first, adjusting for depth.
571
view_revisions = reverse_by_depth(list(view_revisions))
572
return _rebase_merge_depth(view_revisions)
574
raise ValueError('invalid direction %r' % direction)
577
def _has_merges(branch, rev_id):
578
"""Does a revision have multiple parents or not?"""
579
parents = branch.repository.get_parent_map([rev_id]).get(rev_id, [])
580
return len(parents) > 1
583
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
584
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
585
if start_rev_id and end_rev_id:
586
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
587
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
588
if len(start_dotted) == 1 and len(end_dotted) == 1:
590
return start_dotted[0] <= end_dotted[0]
591
elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
592
start_dotted[0:1] == end_dotted[0:1]):
593
# both on same development line
594
return start_dotted[2] <= end_dotted[2]
601
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
602
"""Calculate a sequence of revisions to view, newest to oldest.
604
:param start_rev_id: the lower revision-id
605
:param end_rev_id: the upper revision-id
606
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
607
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
608
is not found walking the left-hand history
610
br_revno, br_rev_id = branch.last_revision_info()
611
repo = branch.repository
612
if start_rev_id is None and end_rev_id is None:
614
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
615
yield revision_id, str(cur_revno), 0
618
if end_rev_id is None:
619
end_rev_id = br_rev_id
620
found_start = start_rev_id is None
621
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
622
revno = branch.revision_id_to_dotted_revno(revision_id)
623
revno_str = '.'.join(str(n) for n in revno)
624
if not found_start and revision_id == start_rev_id:
625
yield revision_id, revno_str, 0
629
yield revision_id, revno_str, 0
632
raise _StartNotLinearAncestor()
635
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
636
rebase_initial_depths=True):
637
"""Calculate revisions to view including merges, newest to oldest.
639
:param branch: the branch
640
:param start_rev_id: the lower revision-id
641
:param end_rev_id: the upper revision-id
642
:param rebase_initial_depth: should depths be rebased until a mainline
644
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
646
view_revisions = branch.iter_merge_sorted_revisions(
647
start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
648
stop_rule="with-merges")
649
if not rebase_initial_depths:
650
for (rev_id, merge_depth, revno, end_of_merge
652
yield rev_id, '.'.join(map(str, revno)), merge_depth
654
# We're following a development line starting at a merged revision.
655
# We need to adjust depths down by the initial depth until we find
656
# a depth less than it. Then we use that depth as the adjustment.
657
# If and when we reach the mainline, depth adjustment ends.
658
depth_adjustment = None
659
for (rev_id, merge_depth, revno, end_of_merge
661
if depth_adjustment is None:
662
depth_adjustment = merge_depth
664
if merge_depth < depth_adjustment:
665
depth_adjustment = merge_depth
666
merge_depth -= depth_adjustment
667
yield rev_id, '.'.join(map(str, revno)), merge_depth
670
def calculate_view_revisions(branch, start_revision, end_revision, direction,
671
specific_fileid, generate_merge_revisions):
672
"""Calculate the revisions to view.
674
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
675
a list of the same tuples.
677
# This method is no longer called by the main code path.
678
# It is retained for API compatibility and may be deprecated
680
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
682
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
683
direction, generate_merge_revisions or specific_fileid))
249
start_rev_id, end_rev_id = end_rev_id, start_rev_id
251
generate_single_revision = False
252
if ((not generate_merge_revisions)
253
and ((start_rev_id and (start_rev_id not in rev_nos))
254
or (end_rev_id and (end_rev_id not in rev_nos)))):
255
generate_single_revision = ((start_rev_id == end_rev_id)
256
and allow_single_merge_revision)
257
if not generate_single_revision:
258
raise errors.BzrCommandError('Selected log formatter only supports'
259
' mainline revisions.')
260
generate_merge_revisions = generate_single_revision
261
view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
262
direction, include_merges=generate_merge_revisions)
263
view_revisions = _filter_revision_range(list(view_revs_iter),
266
if view_revisions and generate_single_revision:
267
view_revisions = view_revisions[0:1]
684
268
if specific_fileid:
685
269
view_revisions = _filter_revisions_touching_file_id(branch,
686
specific_fileid, view_revisions,
687
include_merges=generate_merge_revisions)
688
return _rebase_merge_depth(view_revisions)
691
def _rebase_merge_depth(view_revisions):
692
"""Adjust depths upwards so the top level is 0."""
693
# If either the first or last revision have a merge_depth of 0, we're done
274
# rebase merge_depth - unless there are no revisions or
275
# either the first or last revision have merge_depth = 0.
694
276
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
695
277
min_depth = min([d for r,n,d in view_revisions])
696
278
if min_depth != 0:
1077
536
return view_revisions
1080
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1081
include_merges=True):
1082
r"""Return the list of revision ids which touch a given file id.
539
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
541
"""Return the list of revision ids which touch a given file id.
1084
543
The function filters view_revisions and returns a subset.
1085
544
This includes the revisions which directly change the file id,
1086
545
and the revisions which merge these changes. So if the
1087
546
revision graph is::
1098
And 'C' changes a file, then both C and D will be returned. F will not be
1099
returned even though it brings the changes to C into the branch starting
1100
with E. (Note that if we were using F as the tip instead of G, then we
1103
This will also be restricted based on a subset of the mainline.
1105
:param branch: The branch where we can get text revision information.
1107
:param file_id: Filter out revisions that do not touch file_id.
1109
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1110
tuples. This is the list of revisions which will be filtered. It is
1111
assumed that view_revisions is in merge_sort order (i.e. newest
1114
:param include_merges: include merge revisions in the result or not
553
And 'C' changes a file, then both C and D will be returned.
555
This will also can be restricted based on a subset of the mainline.
1116
557
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
1118
# Lookup all possible text keys to determine which ones actually modified
1120
text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
1122
# Looking up keys in batches of 1000 can cut the time in half, as well as
1123
# memory consumption. GraphIndex *does* like to look for a few keys in
1124
# parallel, it just doesn't like looking for *lots* of keys in parallel.
1125
# TODO: This code needs to be re-evaluated periodically as we tune the
1126
# indexing layer. We might consider passing in hints as to the known
1127
# access pattern (sparse/clustered, high success rate/low success
1128
# rate). This particular access is clustered with a low success rate.
1129
get_parent_map = branch.repository.texts.get_parent_map
1130
modified_text_revisions = set()
1132
for start in xrange(0, len(text_keys), chunk_size):
1133
next_keys = text_keys[start:start + chunk_size]
1134
# Only keep the revision_id portion of the key
1135
modified_text_revisions.update(
1136
[k[1] for k in get_parent_map(next_keys)])
1137
del text_keys, next_keys
1140
# Track what revisions will merge the current revision, replace entries
1141
# with 'None' when they have been added to result
1142
current_merge_stack = [None]
1143
for info in view_revisions:
1144
rev_id, revno, depth = info
1145
if depth == len(current_merge_stack):
1146
current_merge_stack.append(info)
559
# find all the revisions that change the specific file
560
# build the ancestry of each revision in the graph
561
# - only listing the ancestors that change the specific file.
562
graph = branch.repository.get_graph()
563
# This asks for all mainline revisions, which means we only have to spider
564
# sideways, rather than depth history. That said, its still size-of-history
565
# and should be addressed.
566
# mainline_revisions always includes an extra revision at the beginning, so
568
parent_map = dict(((key, value) for key, value in
569
graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
570
sorted_rev_list = tsort.topo_sort(parent_map.items())
571
text_keys = [(file_id, rev_id) for rev_id in sorted_rev_list]
572
modified_text_versions = branch.repository.texts.get_parent_map(text_keys)
574
for rev in sorted_rev_list:
575
text_key = (file_id, rev)
576
parents = parent_map[rev]
577
if text_key not in modified_text_versions and len(parents) == 1:
578
# We will not be adding anything new, so just use a reference to
579
# the parent ancestry.
580
rev_ancestry = ancestry[parents[0]]
1148
del current_merge_stack[depth + 1:]
1149
current_merge_stack[-1] = info
1151
if rev_id in modified_text_revisions:
1152
# This needs to be logged, along with the extra revisions
1153
for idx in xrange(len(current_merge_stack)):
1154
node = current_merge_stack[idx]
1155
if node is not None:
1156
if include_merges or node[2] == 0:
1158
current_merge_stack[idx] = None
583
if text_key in modified_text_versions:
584
rev_ancestry.add(rev)
585
for parent in parents:
586
if parent not in ancestry:
587
# parent is a Ghost, which won't be present in
588
# sorted_rev_list, but we may access it later, so create an
590
ancestry[parent] = set()
591
rev_ancestry = rev_ancestry.union(ancestry[parent])
592
ancestry[rev] = rev_ancestry
594
def is_merging_rev(r):
595
parents = parent_map[r]
597
leftparent = parents[0]
598
for rightparent in parents[1:]:
599
if not ancestry[leftparent].issuperset(
600
ancestry[rightparent]):
604
# filter from the view the revisions that did not change or merge
606
return [(r, n, d) for r, n, d in view_revs_iter
607
if (file_id, r) in modified_text_versions or is_merging_rev(r)]
1162
610
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1741
def get_history_change(old_revision_id, new_revision_id, repository):
1742
"""Calculate the uncommon lefthand history between two revisions.
1744
:param old_revision_id: The original revision id.
1745
:param new_revision_id: The new revision id.
1746
:param repository: The repository to use for the calculation.
1748
return old_history, new_history
1751
old_revisions = set()
1753
new_revisions = set()
1754
new_iter = repository.iter_reverse_revision_history(new_revision_id)
1755
old_iter = repository.iter_reverse_revision_history(old_revision_id)
1756
stop_revision = None
1759
while do_new or do_old:
1762
new_revision = new_iter.next()
1763
except StopIteration:
1766
new_history.append(new_revision)
1767
new_revisions.add(new_revision)
1768
if new_revision in old_revisions:
1769
stop_revision = new_revision
1773
old_revision = old_iter.next()
1774
except StopIteration:
1777
old_history.append(old_revision)
1778
old_revisions.add(old_revision)
1779
if old_revision in new_revisions:
1780
stop_revision = old_revision
1782
new_history.reverse()
1783
old_history.reverse()
1784
if stop_revision is not None:
1785
new_history = new_history[new_history.index(stop_revision) + 1:]
1786
old_history = old_history[old_history.index(stop_revision) + 1:]
1787
return old_history, new_history
1790
def show_branch_change(branch, output, old_revno, old_revision_id):
1791
"""Show the changes made to a branch.
1793
:param branch: The branch to show changes about.
1794
:param output: A file-like object to write changes to.
1795
:param old_revno: The revno of the old tip.
1796
:param old_revision_id: The revision_id of the old tip.
1798
new_revno, new_revision_id = branch.last_revision_info()
1799
old_history, new_history = get_history_change(old_revision_id,
1802
if old_history == [] and new_history == []:
1803
output.write('Nothing seems to have changed\n')
1806
log_format = log_formatter_registry.get_default(branch)
1807
lf = log_format(show_ids=False, to_file=output, show_timezone='original')
1808
if old_history != []:
1809
output.write('*'*60)
1810
output.write('\nRemoved Revisions:\n')
1811
show_flat_log(branch.repository, old_history, old_revno, lf)
1812
output.write('*'*60)
1813
output.write('\n\n')
1814
if new_history != []:
1815
output.write('Added Revisions:\n')
1816
start_revno = new_revno - len(new_history) + 1
1817
show_log(branch, lf, None, verbose=False, direction='forward',
1818
start_revision=start_revno,)
1821
def show_flat_log(repository, history, last_revno, lf):
1822
"""Show a simple log of the specified history.
1824
:param repository: The repository to retrieve revisions from.
1825
:param history: A list of revision_ids indicating the lefthand history.
1826
:param last_revno: The revno of the last revision_id in the history.
1827
:param lf: The log formatter to use.
1829
start_revno = last_revno - len(history) + 1
1830
revisions = repository.get_revisions(history)
1831
for i, rev in enumerate(revisions):
1832
lr = LogRevision(rev, i + last_revno, 0, None)
1836
def _get_info_for_log_files(revisionspec_list, file_list):
1837
"""Find file-ids and kinds given a list of files and a revision range.
1839
We search for files at the end of the range. If not found there,
1840
we try the start of the range.
1842
:param revisionspec_list: revision range as parsed on the command line
1843
:param file_list: the list of paths given on the command line;
1844
the first of these can be a branch location or a file path,
1845
the remainder must be file paths
1846
:return: (branch, info_list, start_rev_info, end_rev_info) where
1847
info_list is a list of (relative_path, file_id, kind) tuples where
1848
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
1850
from builtins import _get_revision_range, safe_relpath_files
1851
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
1852
# XXX: It's damn messy converting a list of paths to relative paths when
1853
# those paths might be deleted ones, they might be on a case-insensitive
1854
# filesystem and/or they might be in silly locations (like another branch).
1855
# For example, what should "log bzr://branch/dir/file1 file2" do? (Is
1856
# file2 implicitly in the same dir as file1 or should its directory be
1857
# taken from the current tree somehow?) For now, this solves the common
1858
# case of running log in a nested directory, assuming paths beyond the
1859
# first one haven't been deleted ...
1861
relpaths = [path] + safe_relpath_files(tree, file_list[1:])
1863
relpaths = [path] + file_list[1:]
1865
start_rev_info, end_rev_info = _get_revision_range(revisionspec_list, b,
1867
if relpaths in ([], [u'']):
1868
return b, [], start_rev_info, end_rev_info
1869
if start_rev_info is None and end_rev_info is None:
1871
tree = b.basis_tree()
1874
file_id = tree.path2id(fp)
1875
kind = _get_kind_for_file_id(tree, file_id)
1877
# go back to when time began
1880
rev1 = b.get_rev_id(1)
1881
except errors.NoSuchRevision:
1886
tree1 = b.repository.revision_tree(rev1)
1888
file_id = tree1.path2id(fp)
1889
kind = _get_kind_for_file_id(tree1, file_id)
1890
info_list.append((fp, file_id, kind))
1892
elif start_rev_info == end_rev_info:
1893
# One revision given - file must exist in it
1894
tree = b.repository.revision_tree(end_rev_info.rev_id)
1896
file_id = tree.path2id(fp)
1897
kind = _get_kind_for_file_id(tree, file_id)
1898
info_list.append((fp, file_id, kind))
1901
# Revision range given. Get the file-id from the end tree.
1902
# If that fails, try the start tree.
1903
rev_id = end_rev_info.rev_id
1905
tree = b.basis_tree()
1907
tree = b.repository.revision_tree(rev_id)
1910
file_id = tree.path2id(fp)
1911
kind = _get_kind_for_file_id(tree, file_id)
1914
rev_id = start_rev_info.rev_id
1916
rev1 = b.get_rev_id(1)
1917
tree1 = b.repository.revision_tree(rev1)
1919
tree1 = b.repository.revision_tree(rev_id)
1920
file_id = tree1.path2id(fp)
1921
kind = _get_kind_for_file_id(tree1, file_id)
1922
info_list.append((fp, file_id, kind))
1923
return b, info_list, start_rev_info, end_rev_info
1926
def _get_kind_for_file_id(tree, file_id):
1927
"""Return the kind of a file-id or None if it doesn't exist."""
1928
if file_id is not None:
1929
return tree.kind(file_id)
1934
992
properties_handler_registry = registry.Registry()
1937
994
# adapters which revision ids to log are filtered. When log is called, the
1938
995
# log_rev_iterator is adapted through each of these factory methods.
1939
996
# Plugins are welcome to mutate this list in any way they like - as long
added
removed
bzrlib/log.py
