26
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
33
36
from bzrlib.config import extract_email_address
34
from bzrlib.errors import BzrError
37
39
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
40
to_file=None, show_ids=False):
39
41
if to_file is None:
40
42
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))
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)
69
max_revno_len = min(max_revno_len, 12)
70
max_revno_len = max(max_revno_len, 3)
72
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)
74
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
75
max_origin_len, author, date_str)
49
anno = "%5s %-7s " % ( revno_str, author[:7] )
77
if len(revno_str) > max_revno_len:
78
revno_str = revno_str[:max_revno_len-1] + '>'
79
anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
51
81
if anno.lstrip() == "" and full: anno = prevanno
52
82
print >>to_file, '%s| %s' % (anno, text)
55
def _annotate_file(branch, rev_id, file_id ):
57
rh = branch.revision_history()
58
w = branch.repository.weave_store.get_weave(file_id,
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.
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,
59
103
branch.repository.get_transaction())
60
104
last_origin = None
61
for origin, text in w.annotate_iter(rev_id):
105
annotations = list(w.annotate_iter(rev_id))
106
revision_ids = set(o for o, t in annotations)
107
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))
111
for origin, text in annotations:
62
112
text = text.rstrip('\r\n')
63
113
if origin == last_origin:
64
114
(revno_str, author, date_str) = ('','','')
66
116
last_origin = origin
67
if not branch.repository.has_revision(origin):
117
if origin not in revisions:
68
118
(revno_str, author, date_str) = ('?','?','?')
71
revno_str = str(rh.index(origin) + 1)
74
rev = branch.repository.get_revision(origin)
120
revno_str = '.'.join(str(i) for i in
121
revision_id_to_revno[origin])
122
rev = revisions[origin]
75
123
tz = rev.timezone or 0
76
date_str = time.strftime('%Y%m%d',
124
date_str = time.strftime('%Y%m%d',
77
125
time.gmtime(rev.timestamp + tz))
78
126
# a lazy way to get something like the email address
79
127
# TODO: Get real email address
80
128
author = rev.committer
82
130
author = extract_email_address(author)
131
except errors.NoEmailInUsername:
84
132
pass # use the whole name
85
133
yield (revno_str, author, date_str, origin, text)
136
def reannotate(parents_lines, new_lines, new_revision_id):
137
"""Create a new annotated version from new lines and parent annotations.
139
:param parents_lines: List of annotated lines for all parents
140
:param new_lines: The un-annotated new lines
141
:param new_revision_id: The revision-id to associate with new lines
142
(will often be CURRENT_REVISION)
144
if len(parents_lines) == 1:
145
for data in _reannotate(parents_lines[0], new_lines, new_revision_id):
148
reannotations = [list(_reannotate(p, new_lines, new_revision_id)) for
150
for annos in zip(*reannotations):
151
origins = set(a for a, l in annos)
153
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
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,
166
for i, j, n in matcher.get_matching_blocks():
167
for line in new_lines[new_cur:j]:
168
yield new_revision_id, line
169
for data in parent_lines[i:i+n]:
added
removed
bzrlib/annotate.py
