26
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
33
37
from bzrlib.config import extract_email_address
34
from bzrlib.errors import BzrError
37
40
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
41
to_file=None, show_ids=False):
39
42
if to_file is None:
40
43
to_file = sys.stdout
45
# Handle the show_ids case
48
annotations = _annotations(branch.repository, file_id, rev_id)
49
max_origin_len = max(len(origin) for origin, text in annotations)
50
for origin, text in annotations:
51
if full or last_rev_id != origin:
55
to_file.write('%*s | %s' % (max_origin_len, this, text))
59
# Calculate the lengths of the various columns
43
60
annotation = list(_annotate_file(branch, rev_id, file_id))
44
max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation))
45
for (revno_str, author, date_str, line_rev_id, text ) in annotation:
61
if len(annotation) == 0:
62
max_origin_len = max_revno_len = max_revid_len = 0
64
max_origin_len = max(len(x[1]) for x in annotation)
65
max_revno_len = max(len(x[0]) for x in annotation)
66
max_revid_len = max(len(x[3]) for x in annotation)
68
max_revno_len = min(max_revno_len, 12)
69
max_revno_len = max(max_revno_len, 3)
71
# Output the annotations
73
encoding = getattr(to_file, 'encoding', None) or \
74
osutils.get_terminal_encoding()
75
for (revno_str, author, date_str, line_rev_id, text) in annotation:
47
anno = '%5s %-*s %8s ' % (revno_str, max_origin_len, author, date_str)
77
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
78
max_origin_len, author, date_str)
49
anno = "%5s %-7s " % ( revno_str, author[:7] )
51
if anno.lstrip() == "" and full: anno = prevanno
52
print >>to_file, '%s| %s' % (anno, text)
55
def _annotate_file(branch, rev_id, file_id ):
57
rh = branch.revision_history()
58
w = branch.weave_store.get_weave(file_id, branch.get_transaction())
80
if len(revno_str) > max_revno_len:
81
revno_str = revno_str[:max_revno_len-1] + '>'
82
anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
83
if anno.lstrip() == "" and full:
87
except UnicodeEncodeError:
88
# cmd_annotate should be passing in an 'exact' object, which means
89
# we have a direct handle to sys.stdout or equivalent. It may not
90
# be able to handle the exact Unicode characters, but 'annotate' is
91
# a user function (non-scripting), so shouldn't die because of
92
# unrepresentable annotation characters. So encode using 'replace',
93
# and write them again.
94
to_file.write(anno.encode(encoding, 'replace'))
95
print >>to_file, '| %s' % (text,)
99
def _annotations(repo, file_id, rev_id):
100
"""Return the list of (origin,text) for a revision of a file in a repository."""
101
w = repo.weave_store.get_weave(file_id, repo.get_transaction())
102
return list(w.annotate_iter(rev_id))
105
def _annotate_file(branch, rev_id, file_id):
106
"""Yield the origins for each line of a file.
108
This includes detailed information, such as the author name, and
109
date string for the commit, rather than just the revision id.
111
revision_id_to_revno = branch.get_revision_id_to_revno_map()
112
annotations = _annotations(branch.repository, file_id, rev_id)
59
113
last_origin = None
60
for origin, text in w.annotate_iter(rev_id):
114
revision_ids = set(o for o, t in annotations)
115
revision_ids = [o for o in revision_ids if
116
branch.repository.has_revision(o)]
117
revisions = dict((r.revision_id, r) for r in
118
branch.repository.get_revisions(revision_ids))
119
for origin, text in annotations:
61
120
text = text.rstrip('\r\n')
62
121
if origin == last_origin:
63
122
(revno_str, author, date_str) = ('','','')
65
124
last_origin = origin
66
line_rev_id = w.idx_to_name(origin)
67
if not branch.has_revision(line_rev_id):
125
if origin not in revisions:
68
126
(revno_str, author, date_str) = ('?','?','?')
71
revno_str = str(rh.index(line_rev_id) + 1)
74
rev = branch.get_revision(line_rev_id)
128
revno_str = '.'.join(str(i) for i in
129
revision_id_to_revno[origin])
130
rev = revisions[origin]
75
131
tz = rev.timezone or 0
76
date_str = time.strftime('%Y%m%d',
132
date_str = time.strftime('%Y%m%d',
77
133
time.gmtime(rev.timestamp + tz))
78
134
# a lazy way to get something like the email address
79
135
# TODO: Get real email address
80
author = rev.committer
136
author = rev.get_apparent_author()
82
138
author = extract_email_address(author)
139
except errors.NoEmailInUsername:
84
140
pass # use the whole name
85
yield (revno_str, author, date_str, line_rev_id, text)
141
yield (revno_str, author, date_str, origin, text)
144
def reannotate(parents_lines, new_lines, new_revision_id,
145
_left_matching_blocks=None):
146
"""Create a new annotated version from new lines and parent annotations.
148
:param parents_lines: List of annotated lines for all parents
149
:param new_lines: The un-annotated new lines
150
:param new_revision_id: The revision-id to associate with new lines
151
(will often be CURRENT_REVISION)
152
:param left_matching_blocks: a hint about which areas are common
153
between the text and its left-hand-parent. The format is
154
the SequenceMatcher.get_matching_blocks format.
156
if len(parents_lines) == 0:
157
for line in new_lines:
158
yield new_revision_id, line
159
elif len(parents_lines) == 1:
160
for data in _reannotate(parents_lines[0], new_lines, new_revision_id,
161
_left_matching_blocks):
164
block_list = [_left_matching_blocks] + [None] * len(parents_lines)
165
reannotations = [list(_reannotate(p, new_lines, new_revision_id, b))
166
for p, b in zip(parents_lines, block_list)]
167
for annos in zip(*reannotations):
168
origins = set(a for a, l in annos)
170
if len(origins) == 1:
171
yield iter(origins).next(), line
172
elif len(origins) == 2 and new_revision_id in origins:
173
yield (x for x in origins if x != new_revision_id).next(), line
175
yield new_revision_id, line
178
def _reannotate(parent_lines, new_lines, new_revision_id,
179
matching_blocks=None):
181
if matching_blocks is None:
182
plain_parent_lines = [l for r, l in parent_lines]
183
matcher = patiencediff.PatienceSequenceMatcher(None,
184
plain_parent_lines, new_lines)
185
matching_blocks = matcher.get_matching_blocks()
186
for i, j, n in matching_blocks:
187
for line in new_lines[new_cur:j]:
188
yield new_revision_id, line
189
for data in parent_lines[i:i+n]:
added
removed
bzrlib/annotate.py
