31
31
from bzrlib import (
36
37
from bzrlib.config import extract_email_address
38
from bzrlib.repository import _strip_NULL_ghosts
39
from bzrlib.revision import CURRENT_REVISION, Revision
39
42
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
40
43
to_file=None, show_ids=False):
44
"""Annotate file_id at revision rev_id in branch.
46
The branch should already be read_locked() when annotate_file is called.
48
:param branch: The branch to look for revision numbers and history from.
49
:param rev_id: The revision id to annotate.
50
:param file_id: The file_id to annotate.
51
:param verbose: Show all details rather than truncating to ensure
52
reasonable text width.
53
:param full: XXXX Not sure what this does.
54
:param to_file: The file to output the annotation to; if None stdout is
56
:param show_ids: Show revision ids in the annotation output.
41
58
if to_file is None:
42
59
to_file = sys.stdout
47
w = branch.repository.weave_store.get_weave(file_id,
48
branch.repository.get_transaction())
49
annotations = list(w.annotate_iter(rev_id))
50
max_origin_len = max(len(origin) for origin, text in annotations)
51
for origin, text in annotations:
52
if full or last_rev_id != origin:
56
to_file.write('%*s | %s' % (max_origin_len, this, text))
60
annotation = list(_annotate_file(branch, rev_id, file_id))
61
# Handle the show_ids case
62
annotations = _annotations(branch.repository, file_id, rev_id)
64
return _show_id_annotations(annotations, to_file, full)
66
# Calculate the lengths of the various columns
67
annotation = list(_expand_annotations(annotations, branch))
68
_print_annotations(annotation, verbose, to_file, full)
71
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
73
"""Annotate file_id in a tree.
75
The tree should already be read_locked() when annotate_file_tree is called.
77
:param tree: The tree to look for revision numbers and history from.
78
:param file_id: The file_id to annotate.
79
:param to_file: The file to output the annotation to.
80
:param verbose: Show all details rather than truncating to ensure
81
reasonable text width.
82
:param full: XXXX Not sure what this does.
83
:param show_ids: Show revision ids in the annotation output.
85
rev_id = tree.last_revision()
88
# Handle the show_ids case
89
annotations = list(tree.annotate_iter(file_id))
91
return _show_id_annotations(annotations, to_file, full)
93
# Create a virtual revision to represent the current tree state.
94
# Should get some more pending commit attributes, like pending tags,
96
current_rev = Revision(CURRENT_REVISION)
97
current_rev.parent_ids = tree.get_parent_ids()
98
current_rev.committer = tree.branch.get_config().username()
99
current_rev.message = "?"
100
current_rev.timestamp = round(time.time(), 3)
101
current_rev.timezone = osutils.local_time_offset()
102
annotation = list(_expand_annotations(annotations, tree.branch,
104
_print_annotations(annotation, verbose, to_file, full)
107
def _print_annotations(annotation, verbose, to_file, full):
108
"""Print annotations to to_file.
110
:param to_file: The file to output the annotation to.
111
:param verbose: Show all details rather than truncating to ensure
112
reasonable text width.
113
:param full: XXXX Not sure what this does.
61
115
if len(annotation) == 0:
62
116
max_origin_len = max_revno_len = max_revid_len = 0
64
118
max_origin_len = max(len(x[1]) for x in annotation)
65
119
max_revno_len = max(len(x[0]) for x in annotation)
66
120
max_revid_len = max(len(x[3]) for x in annotation)
69
122
max_revno_len = min(max_revno_len, 12)
70
123
max_revno_len = max(max_revno_len, 3)
125
# Output the annotations
127
encoding = getattr(to_file, 'encoding', None) or \
128
osutils.get_terminal_encoding()
72
129
for (revno_str, author, date_str, line_rev_id, text) in annotation:
74
131
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
77
134
if len(revno_str) > max_revno_len:
78
135
revno_str = revno_str[:max_revno_len-1] + '>'
79
136
anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
81
if anno.lstrip() == "" and full: anno = prevanno
82
print >>to_file, '%s| %s' % (anno, text)
86
def _annotate_file(branch, rev_id, file_id):
87
"""Yield the origins for each line of a file.
89
This includes detailed information, such as the committer name, and
90
date string for the commit, rather than just the revision id.
137
if anno.lstrip() == "" and full:
141
except UnicodeEncodeError:
142
# cmd_annotate should be passing in an 'exact' object, which means
143
# we have a direct handle to sys.stdout or equivalent. It may not
144
# be able to handle the exact Unicode characters, but 'annotate' is
145
# a user function (non-scripting), so shouldn't die because of
146
# unrepresentable annotation characters. So encode using 'replace',
147
# and write them again.
148
to_file.write(anno.encode(encoding, 'replace'))
149
to_file.write('| %s\n' % (text,))
153
def _show_id_annotations(annotations, to_file, full):
157
max_origin_len = max(len(origin) for origin, text in annotations)
158
for origin, text in annotations:
159
if full or last_rev_id != origin:
163
to_file.write('%*s | %s' % (max_origin_len, this, text))
168
def _annotations(repo, file_id, rev_id):
169
"""Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
170
annotations = repo.texts.annotate((file_id, rev_id))
172
return [(key[-1], line) for (key, line) in annotations]
175
def _expand_annotations(annotations, branch, current_rev=None):
176
"""Expand a a files annotations into command line UI ready tuples.
178
Each tuple includes detailed information, such as the author name, and date
179
string for the commit, rather than just the revision id.
181
:param annotations: The annotations to expand.
182
:param revision_id_to_revno: A map from id to revision numbers.
183
:param branch: A locked branch to query for revision details.
92
branch_last_revision = branch.last_revision()
93
revision_graph = branch.repository.get_revision_graph(branch_last_revision)
94
merge_sorted_revisions = tsort.merge_sort(
99
revision_id_to_revno = dict((rev_id, revno)
100
for seq_num, rev_id, depth, revno, end_of_merge
101
in merge_sorted_revisions)
102
w = branch.repository.weave_store.get_weave(file_id,
103
branch.repository.get_transaction())
185
repository = branch.repository
186
if current_rev is not None:
187
# This can probably become a function on MutableTree, get_revno_map there,
189
last_revision = current_rev.revision_id
190
# XXX: Partially Cloned from branch, uses the old_get_graph, eep.
191
graph = repository.get_graph()
192
revision_graph = dict(((key, value) for key, value in
193
graph.iter_ancestry(current_rev.parent_ids) if value is not None))
194
revision_graph = _strip_NULL_ghosts(revision_graph)
195
revision_graph[last_revision] = current_rev.parent_ids
196
merge_sorted_revisions = tsort.merge_sort(
201
revision_id_to_revno = dict((rev_id, revno)
202
for seq_num, rev_id, depth, revno, end_of_merge in
203
merge_sorted_revisions)
205
revision_id_to_revno = branch.get_revision_id_to_revno_map()
104
206
last_origin = None
105
annotations = list(w.annotate_iter(rev_id))
106
207
revision_ids = set(o for o, t in annotations)
209
if CURRENT_REVISION in revision_ids:
210
revision_id_to_revno[CURRENT_REVISION] = (
211
"%d?" % (branch.revno() + 1),)
212
revisions[CURRENT_REVISION] = current_rev
107
213
revision_ids = [o for o in revision_ids if
108
branch.repository.has_revision(o)]
109
revisions = dict((r.revision_id, r) for r in
110
branch.repository.get_revisions(revision_ids))
214
repository.has_revision(o)]
215
revisions.update((r.revision_id, r) for r in
216
repository.get_revisions(revision_ids))
111
217
for origin, text in annotations:
112
218
text = text.rstrip('\r\n')
113
219
if origin == last_origin:
133
239
yield (revno_str, author, date_str, origin, text)
136
def reannotate(parents_lines, new_lines, new_revision_id):
242
def reannotate(parents_lines, new_lines, new_revision_id,
243
_left_matching_blocks=None,
244
heads_provider=None):
137
245
"""Create a new annotated version from new lines and parent annotations.
139
247
:param parents_lines: List of annotated lines for all parents
140
248
:param new_lines: The un-annotated new lines
141
249
:param new_revision_id: The revision-id to associate with new lines
142
250
(will often be CURRENT_REVISION)
251
:param left_matching_blocks: a hint about which areas are common
252
between the text and its left-hand-parent. The format is
253
the SequenceMatcher.get_matching_blocks format
254
(start_left, start_right, length_of_match).
255
:param heads_provider: An object which provids a .heads() call to resolve
256
if any revision ids are children of others.
257
If None, then any ancestry disputes will be resolved with
144
if len(parents_lines) == 1:
145
for data in _reannotate(parents_lines[0], new_lines, new_revision_id):
260
if len(parents_lines) == 0:
261
lines = [(new_revision_id, line) for line in new_lines]
262
elif len(parents_lines) == 1:
263
lines = _reannotate(parents_lines[0], new_lines, new_revision_id,
264
_left_matching_blocks)
265
elif len(parents_lines) == 2:
266
left = _reannotate(parents_lines[0], new_lines, new_revision_id,
267
_left_matching_blocks)
268
lines = _reannotate_annotated(parents_lines[1], new_lines,
269
new_revision_id, left,
148
reannotations = [list(_reannotate(p, new_lines, new_revision_id)) for
272
reannotations = [_reannotate(parents_lines[0], new_lines,
273
new_revision_id, _left_matching_blocks)]
274
reannotations.extend(_reannotate(p, new_lines, new_revision_id)
275
for p in parents_lines[1:])
150
277
for annos in zip(*reannotations):
151
278
origins = set(a for a, l in annos)
153
279
if len(origins) == 1:
154
yield iter(origins).next(), line
155
elif len(origins) == 2 and new_revision_id in origins:
156
yield (x for x in origins if x != new_revision_id).next(), line
280
# All the parents agree, so just return the first one
281
lines.append(annos[0])
158
yield new_revision_id, line
161
def _reannotate(parent_lines, new_lines, new_revision_id):
162
plain_parent_lines = [l for r, l in parent_lines]
163
matcher = patiencediff.PatienceSequenceMatcher(None, plain_parent_lines,
284
if len(origins) == 2 and new_revision_id in origins:
285
origins.remove(new_revision_id)
286
if len(origins) == 1:
287
lines.append((origins.pop(), line))
289
lines.append((new_revision_id, line))
293
def _reannotate(parent_lines, new_lines, new_revision_id,
294
matching_blocks=None):
166
for i, j, n in matcher.get_matching_blocks():
296
if matching_blocks is None:
297
plain_parent_lines = [l for r, l in parent_lines]
298
matcher = patiencediff.PatienceSequenceMatcher(None,
299
plain_parent_lines, new_lines)
300
matching_blocks = matcher.get_matching_blocks()
302
for i, j, n in matching_blocks:
167
303
for line in new_lines[new_cur:j]:
168
yield new_revision_id, line
169
for data in parent_lines[i:i+n]:
304
lines.append((new_revision_id, line))
305
lines.extend(parent_lines[i:i+n])
310
def _get_matching_blocks(old, new):
311
matcher = patiencediff.PatienceSequenceMatcher(None,
313
return matcher.get_matching_blocks()
316
def _find_matching_unannotated_lines(output_lines, plain_child_lines,
317
child_lines, start_child, end_child,
318
right_lines, start_right, end_right,
319
heads_provider, revision_id):
320
"""Find lines in plain_right_lines that match the existing lines.
322
:param output_lines: Append final annotated lines to this list
323
:param plain_child_lines: The unannotated new lines for the child text
324
:param child_lines: Lines for the child text which have been annotated
326
:param start_child: Position in plain_child_lines and child_lines to start the
328
:param end_child: Last position in plain_child_lines and child_lines to search
330
:param right_lines: The annotated lines for the whole text for the right
332
:param start_right: Position in right_lines to start the match
333
:param end_right: Last position in right_lines to search for a match
334
:param heads_provider: When parents disagree on the lineage of a line, we
335
need to check if one side supersedes the other
336
:param revision_id: The label to give if a line should be labeled 'tip'
338
output_extend = output_lines.extend
339
output_append = output_lines.append
340
# We need to see if any of the unannotated lines match
341
plain_right_subset = [l for a,l in right_lines[start_right:end_right]]
342
plain_child_subset = plain_child_lines[start_child:end_child]
343
match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
347
for right_idx, child_idx, match_len in match_blocks:
348
# All the lines that don't match are just passed along
349
if child_idx > last_child_idx:
350
output_extend(child_lines[start_child + last_child_idx
351
:start_child + child_idx])
352
for offset in xrange(match_len):
353
left = child_lines[start_child+child_idx+offset]
354
right = right_lines[start_right+right_idx+offset]
355
if left[0] == right[0]:
356
# The annotations match, just return the left one
358
elif left[0] == revision_id:
359
# The left parent marked this as unmatched, so let the
360
# right parent claim it
363
# Left and Right both claim this line
364
if heads_provider is None:
365
output_append((revision_id, left[1]))
367
heads = heads_provider.heads((left[0], right[0]))
369
output_append((iter(heads).next(), left[1]))
371
# Both claim different origins, sort lexicographically
372
# so that we always get a stable result.
373
output_append(sorted([left, right])[0])
374
last_child_idx = child_idx + match_len
377
def _reannotate_annotated(right_parent_lines, new_lines, new_revision_id,
378
annotated_lines, heads_provider):
379
"""Update the annotations for a node based on another parent.
381
:param right_parent_lines: A list of annotated lines for the right-hand
383
:param new_lines: The unannotated new lines.
384
:param new_revision_id: The revision_id to attribute to lines which are not
385
present in either parent.
386
:param annotated_lines: A list of annotated lines. This should be the
387
annotation of new_lines based on parents seen so far.
388
:param heads_provider: When parents disagree on the lineage of a line, we
389
need to check if one side supersedes the other.
391
if len(new_lines) != len(annotated_lines):
392
raise AssertionError("mismatched new_lines and annotated_lines")
393
# First compare the newly annotated lines with the right annotated lines.
394
# Lines which were not changed in left or right should match. This tends to
395
# be the bulk of the lines, and they will need no further processing.
397
lines_extend = lines.extend
398
last_right_idx = 0 # The line just after the last match from the right side
400
matching_left_and_right = _get_matching_blocks(right_parent_lines,
402
for right_idx, left_idx, match_len in matching_left_and_right:
403
# annotated lines from last_left_idx to left_idx did not match the lines from
405
# to right_idx, the raw lines should be compared to determine what annotations
407
if last_right_idx == right_idx or last_left_idx == left_idx:
408
# One of the sides is empty, so this is a pure insertion
409
lines_extend(annotated_lines[last_left_idx:left_idx])
411
# We need to see if any of the unannotated lines match
412
_find_matching_unannotated_lines(lines,
413
new_lines, annotated_lines,
414
last_left_idx, left_idx,
416
last_right_idx, right_idx,
419
last_right_idx = right_idx + match_len
420
last_left_idx = left_idx + match_len
421
# If left and right agree on a range, just push that into the output
422
lines_extend(annotated_lines[left_idx:left_idx + match_len])
added
removed
bzrlib/annotate.py
