36
31
from bzrlib.config import extract_email_address
32
from bzrlib.errors import NoEmailInUsername
39
35
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
40
to_file=None, show_ids=False):
41
37
if to_file is None:
42
38
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
41
annotation = list(_annotate_file(branch, rev_id, file_id))
61
42
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:
45
max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation))
46
for (revno_str, author, date_str, line_rev_id, text ) in annotation:
74
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
75
max_origin_len, author, date_str)
48
anno = '%5s %-*s %8s ' % (revno_str, max_origin_len, author, date_str)
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])
50
anno = "%5s %-7s " % ( revno_str, author[:7] )
81
52
if anno.lstrip() == "" and full: anno = prevanno
82
53
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.
92
revision_id_to_revno = branch.get_revision_id_to_revno_map()
93
w = branch.repository.weave_store.get_weave(file_id,
56
def _annotate_file(branch, rev_id, file_id ):
58
rh = branch.revision_history()
59
w = branch.repository.weave_store.get_weave(file_id,
94
60
branch.repository.get_transaction())
96
annotations = list(w.annotate_iter(rev_id))
97
revision_ids = set(o for o, t in annotations)
98
revision_ids = [o for o in revision_ids if
99
branch.repository.has_revision(o)]
100
revisions = dict((r.revision_id, r) for r in
101
branch.repository.get_revisions(revision_ids))
102
for origin, text in annotations:
62
for origin, text in w.annotate_iter(rev_id):
103
63
text = text.rstrip('\r\n')
104
64
if origin == last_origin:
105
65
(revno_str, author, date_str) = ('','','')
107
67
last_origin = origin
108
if origin not in revisions:
68
if not branch.repository.has_revision(origin):
109
69
(revno_str, author, date_str) = ('?','?','?')
111
revno_str = '.'.join(str(i) for i in
112
revision_id_to_revno[origin])
113
rev = revisions[origin]
72
revno_str = str(rh.index(origin) + 1)
75
rev = branch.repository.get_revision(origin)
114
76
tz = rev.timezone or 0
115
date_str = time.strftime('%Y%m%d',
77
date_str = time.strftime('%Y%m%d',
116
78
time.gmtime(rev.timestamp + tz))
117
79
# a lazy way to get something like the email address
118
80
# TODO: Get real email address
119
81
author = rev.committer
121
83
author = extract_email_address(author)
122
except errors.NoEmailInUsername:
84
except NoEmailInUsername:
123
85
pass # use the whole name
124
86
yield (revno_str, author, date_str, origin, text)
127
def reannotate(parents_lines, new_lines, new_revision_id):
128
"""Create a new annotated version from new lines and parent annotations.
130
:param parents_lines: List of annotated lines for all parents
131
:param new_lines: The un-annotated new lines
132
:param new_revision_id: The revision-id to associate with new lines
133
(will often be CURRENT_REVISION)
135
if len(parents_lines) == 1:
136
for data in _reannotate(parents_lines[0], new_lines, new_revision_id):
139
reannotations = [list(_reannotate(p, new_lines, new_revision_id)) for
141
for annos in zip(*reannotations):
142
origins = set(a for a, l in annos)
144
if len(origins) == 1:
145
yield iter(origins).next(), line
146
elif len(origins) == 2 and new_revision_id in origins:
147
yield (x for x in origins if x != new_revision_id).next(), line
149
yield new_revision_id, line
152
def _reannotate(parent_lines, new_lines, new_revision_id):
153
plain_parent_lines = [l for r, l in parent_lines]
154
matcher = patiencediff.PatienceSequenceMatcher(None, plain_parent_lines,
157
for i, j, n in matcher.get_matching_blocks():
158
for line in new_lines[new_cur:j]:
159
yield new_revision_id, line
160
for data in parent_lines[i:i+n]:
added
removed
bzrlib/annotate.py
