13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""File annotate based on weave storage"""
19
19
# TODO: Choice of more or less verbose formats:
21
21
# interposed: show more details between blocks of modified lines
23
23
# TODO: Show which revision caused a line to merge into the parent
25
25
# TODO: perhaps abbreviate timescales depending on how recent they are
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
59
57
to_file = sys.stdout
61
59
# Handle the show_ids case
62
annotations = _annotations(branch.repository, file_id, rev_id)
64
return _show_id_annotations(annotations, to_file, full)
62
annotations = _annotations(branch.repository, file_id, rev_id)
63
max_origin_len = max(len(origin) for origin, text in annotations)
64
for origin, text in annotations:
65
if full or last_rev_id != origin:
69
to_file.write('%*s | %s' % (max_origin_len, this, text))
66
73
# 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.
74
annotation = list(_annotate_file(branch, rev_id, file_id))
115
75
if len(annotation) == 0:
116
76
max_origin_len = max_revno_len = max_revid_len = 0
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
113
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 file's 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.
114
"""Return the list of (origin,text) for a revision of a file in a repository."""
115
w = repo.weave_store.get_weave(file_id, repo.get_transaction())
116
return list(w.annotate_iter(rev_id))
119
def _annotate_file(branch, rev_id, file_id):
120
"""Yield the origins for each line of a file.
122
This includes detailed information, such as the author name, and
123
date string for the commit, rather than just the revision id.
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()
125
revision_id_to_revno = branch.get_revision_id_to_revno_map()
126
annotations = _annotations(branch.repository, file_id, rev_id)
206
127
last_origin = None
207
128
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
213
revision_ids = [o for o in revision_ids if
214
repository.has_revision(o)]
215
revisions.update((r.revision_id, r) for r in
216
repository.get_revisions(revision_ids))
129
revision_ids = [o for o in revision_ids if
130
branch.repository.has_revision(o)]
131
revisions = dict((r.revision_id, r) for r in
132
branch.repository.get_revisions(revision_ids))
217
133
for origin, text in annotations:
218
134
text = text.rstrip('\r\n')
219
135
if origin == last_origin:
242
158
def reannotate(parents_lines, new_lines, new_revision_id,
243
_left_matching_blocks=None,
244
heads_provider=None):
159
_left_matching_blocks=None):
245
160
"""Create a new annotated version from new lines and parent annotations.
247
162
:param parents_lines: List of annotated lines for all parents
248
163
:param new_lines: The un-annotated new lines
249
164
:param new_revision_id: The revision-id to associate with new lines
250
165
(will often be CURRENT_REVISION)
251
166
:param left_matching_blocks: a hint about which areas are common
252
167
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 provides 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
168
the SequenceMatcher.get_matching_blocks format.
260
170
if len(parents_lines) == 0:
261
lines = [(new_revision_id, line) for line in new_lines]
171
for line in new_lines:
172
yield new_revision_id, line
262
173
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,
174
for data in _reannotate(parents_lines[0], new_lines, new_revision_id,
175
_left_matching_blocks):
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:])
178
block_list = [_left_matching_blocks] + [None] * len(parents_lines)
179
reannotations = [list(_reannotate(p, new_lines, new_revision_id, b))
180
for p, b in zip(parents_lines, block_list)]
277
181
for annos in zip(*reannotations):
278
182
origins = set(a for a, l in annos)
279
184
if len(origins) == 1:
280
# All the parents agree, so just return the first one
281
lines.append(annos[0])
185
yield iter(origins).next(), line
186
elif len(origins) == 2 and new_revision_id in origins:
187
yield (x for x in origins if x != new_revision_id).next(), line
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))
189
yield new_revision_id, line
293
192
def _reannotate(parent_lines, new_lines, new_revision_id,
298
197
matcher = patiencediff.PatienceSequenceMatcher(None,
299
198
plain_parent_lines, new_lines)
300
199
matching_blocks = matcher.get_matching_blocks()
302
200
for i, j, n in matching_blocks:
303
201
for line in new_lines[new_cur:j]:
304
lines.append((new_revision_id, line))
305
lines.extend(parent_lines[i:i+n])
202
yield new_revision_id, line
203
for data in 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
