1
# Copyright (C) 2004, 2005 by Canonical Ltd
1
# Copyright (C) 2004, 2005 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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
33
35
from bzrlib.config import extract_email_address
34
from bzrlib.errors import BzrError
37
38
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
39
to_file=None, show_ids=False):
39
40
if to_file is None:
40
41
to_file = sys.stdout
46
w = branch.repository.weave_store.get_weave(file_id,
47
branch.repository.get_transaction())
48
annotations = list(w.annotate_iter(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))
43
59
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:
60
if len(annotation) == 0:
61
max_origin_len = max_revno_len = max_revid_len = 0
63
max_origin_len = max(len(x[1]) for x in annotation)
64
max_revno_len = max(len(x[0]) for x in annotation)
65
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
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)
73
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
74
max_origin_len, author, date_str)
49
anno = "%5s %-7s " % ( revno_str, author[:7] )
76
if len(revno_str) > max_revno_len:
77
revno_str = revno_str[:max_revno_len-1] + '>'
78
anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
51
80
if anno.lstrip() == "" and full: anno = prevanno
52
81
print >>to_file, '%s| %s' % (anno, text)
55
85
def _annotate_file(branch, rev_id, file_id ):
86
"""Yield the origins for each line of a file.
88
This includes detailed information, such as the committer name, and
89
date string for the commit, rather than just the revision id.
57
92
rh = branch.revision_history()
58
w = branch.repository.weave_store.get_weave(file_id,
93
revision_graph = branch.repository.get_revision_graph(rev_id)
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)
added
removed
bzrlib/annotate.py
