1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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.
31
from bzrlib.lazy_import import lazy_import
32
lazy_import(globals(), """
33
31
from bzrlib import (
42
37
from bzrlib.config import extract_email_address
43
38
from bzrlib.repository import _strip_NULL_ghosts
44
39
from bzrlib.revision import CURRENT_REVISION, Revision
158
153
def _show_id_annotations(annotations, to_file, full):
161
154
last_rev_id = None
162
155
max_origin_len = max(len(origin) for origin, text in annotations)
163
156
for origin, text in annotations:
173
166
def _annotations(repo, file_id, rev_id):
174
167
"""Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
175
168
annotations = repo.texts.annotate((file_id, rev_id))
177
170
return [(key[-1], line) for (key, line) in annotations]
180
173
def _expand_annotations(annotations, branch, current_rev=None):
181
"""Expand a file's annotations into command line UI ready tuples.
174
"""Expand a a files annotations into command line UI ready tuples.
183
176
Each tuple includes detailed information, such as the author name, and date
184
177
string for the commit, rather than just the revision id.
194
187
last_revision = current_rev.revision_id
195
188
# XXX: Partially Cloned from branch, uses the old_get_graph, eep.
196
# XXX: The main difficulty is that we need to inject a single new node
197
# (current_rev) into the graph before it gets numbered, etc.
198
# Once KnownGraph gets an 'add_node()' function, we can use
199
# VF.get_known_graph_ancestry().
200
189
graph = repository.get_graph()
201
190
revision_graph = dict(((key, value) for key, value in
202
191
graph.iter_ancestry(current_rev.parent_ids) if value is not None))
219
208
revision_id_to_revno[CURRENT_REVISION] = (
220
209
"%d?" % (branch.revno() + 1),)
221
210
revisions[CURRENT_REVISION] = current_rev
222
revision_ids = [o for o in revision_ids if
211
revision_ids = [o for o in revision_ids if
223
212
repository.has_revision(o)]
224
revisions.update((r.revision_id, r) for r in
213
revisions.update((r.revision_id, r) for r in
225
214
repository.get_revisions(revision_ids))
226
215
for origin, text in annotations:
227
216
text = text.rstrip('\r\n')
240
229
time.gmtime(rev.timestamp + tz))
241
230
# a lazy way to get something like the email address
242
231
# TODO: Get real email address
243
author = rev.get_apparent_authors()[0]
232
author = rev.get_apparent_author()
245
234
author = extract_email_address(author)
246
235
except errors.NoEmailInUsername:
252
241
_left_matching_blocks=None,
253
242
heads_provider=None):
254
243
"""Create a new annotated version from new lines and parent annotations.
256
245
:param parents_lines: List of annotated lines for all parents
257
246
:param new_lines: The un-annotated new lines
258
247
:param new_revision_id: The revision-id to associate with new lines
261
250
between the text and its left-hand-parent. The format is
262
251
the SequenceMatcher.get_matching_blocks format
263
252
(start_left, start_right, length_of_match).
264
:param heads_provider: An object which provides a .heads() call to resolve
253
:param heads_provider: An object which provids a .heads() call to resolve
265
254
if any revision ids are children of others.
266
255
If None, then any ancestry disputes will be resolved with
319
308
def _get_matching_blocks(old, new):
320
matcher = patiencediff.PatienceSequenceMatcher(None, old, new)
309
matcher = patiencediff.PatienceSequenceMatcher(None,
321
311
return matcher.get_matching_blocks()
324
_break_annotation_tie = None
326
def _old_break_annotation_tie(annotated_lines):
327
"""Chose an attribution between several possible ones.
329
:param annotated_lines: A list of tuples ((file_id, rev_id), line) where
330
the lines are identical but the revids different while no parent
331
relation exist between them
333
:return : The "winning" line. This must be one with a revid that
334
guarantees that further criss-cross merges will converge. Failing to
335
do so have performance implications.
337
# sort lexicographically so that we always get a stable result.
339
# TODO: while 'sort' is the easiest (and nearly the only possible solution)
340
# with the current implementation, chosing the oldest revision is known to
341
# provide better results (as in matching user expectations). The most
342
# common use case being manual cherry-pick from an already existing
344
return sorted(annotated_lines)[0]
347
314
def _find_matching_unannotated_lines(output_lines, plain_child_lines,
348
315
child_lines, start_child, end_child,
349
316
right_lines, start_right, end_right,
354
321
:param plain_child_lines: The unannotated new lines for the child text
355
322
:param child_lines: Lines for the child text which have been annotated
356
323
for the left parent
358
:param start_child: Position in plain_child_lines and child_lines to start
360
:param end_child: Last position in plain_child_lines and child_lines to
324
:param start_child: Position in plain_child_lines and child_lines to start the
326
:param end_child: Last position in plain_child_lines and child_lines to search
362
328
:param right_lines: The annotated lines for the whole text for the right
364
330
:param start_right: Position in right_lines to start the match
400
366
if len(heads) == 1:
401
367
output_append((iter(heads).next(), left[1]))
403
# Both claim different origins, get a stable result.
404
# If the result is not stable, there is a risk a
405
# performance degradation as criss-cross merges will
406
# flip-flop the attribution.
407
if _break_annotation_tie is None:
409
_old_break_annotation_tie([left, right]))
411
output_append(_break_annotation_tie([left, right]))
369
# Both claim different origins, sort lexicographically
370
# so that we always get a stable result.
371
output_append(sorted([left, right])[0])
412
372
last_child_idx = child_idx + match_len
438
398
matching_left_and_right = _get_matching_blocks(right_parent_lines,
440
400
for right_idx, left_idx, match_len in matching_left_and_right:
441
# annotated lines from last_left_idx to left_idx did not match the
442
# lines from last_right_idx to right_idx, the raw lines should be
443
# compared to determine what annotations need to be updated
401
# annotated lines from last_left_idx to left_idx did not match the lines from
403
# to right_idx, the raw lines should be compared to determine what annotations
444
405
if last_right_idx == right_idx or last_left_idx == left_idx:
445
406
# One of the sides is empty, so this is a pure insertion
446
407
lines_extend(annotated_lines[last_left_idx:left_idx])
458
419
# If left and right agree on a range, just push that into the output
459
420
lines_extend(annotated_lines[left_idx:left_idx + match_len])
464
from bzrlib._annotator_pyx import Annotator
465
except ImportError, e:
466
osutils.failed_to_load_extension(e)
467
from bzrlib._annotator_py import Annotator
added
removed
bzrlib/annotate.py
