1
# Copyright (C) 2004, 2005 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""File annotate based on weave storage"""
19
# TODO: Choice of more or less verbose formats:
21
# interposed: show more details between blocks of modified lines
23
# TODO: Show which revision caused a line to merge into the parent
25
# TODO: perhaps abbreviate timescales depending on how recent they are
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
36
from bzrlib.config import extract_email_address
39
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
40
to_file=None, show_ids=False):
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
annotation = list(_annotate_file(branch, rev_id, file_id))
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:
74
anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
75
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])
81
if anno.lstrip() == "" and full: anno = prevanno
82
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.
93
rh = branch.revision_history()
94
revision_graph = branch.repository.get_revision_graph(rev_id)
95
merge_sorted_revisions = tsort.merge_sort(
100
revision_id_to_revno = dict((rev_id, revno)
101
for seq_num, rev_id, depth, revno, end_of_merge
102
in merge_sorted_revisions)
103
w = branch.repository.weave_store.get_weave(file_id,
104
branch.repository.get_transaction())
106
annotations = list(w.annotate_iter(rev_id))
107
revision_ids = set(o for o, t in annotations)
108
revision_ids = [o for o in revision_ids if
109
branch.repository.has_revision(o)]
110
revisions = dict((r.revision_id, r) for r in
111
branch.repository.get_revisions(revision_ids))
112
for origin, text in annotations:
113
text = text.rstrip('\r\n')
114
if origin == last_origin:
115
(revno_str, author, date_str) = ('','','')
118
if origin not in revisions:
119
(revno_str, author, date_str) = ('?','?','?')
121
revno_str = '.'.join(str(i) for i in
122
revision_id_to_revno[origin])
123
rev = revisions[origin]
124
tz = rev.timezone or 0
125
date_str = time.strftime('%Y%m%d',
126
time.gmtime(rev.timestamp + tz))
127
# a lazy way to get something like the email address
128
# TODO: Get real email address
129
author = rev.committer
131
author = extract_email_address(author)
132
except errors.NoEmailInUsername:
133
pass # use the whole name
134
yield (revno_str, author, date_str, origin, text)
137
def reannotate(parents_lines, new_lines, new_revision_id):
138
"""Create a new annotated version from new lines and parent annotations.
140
:param parents_lines: List of annotated lines for all parents
141
:param new_lines: The un-annotated new lines
142
:param new_revision_id: The revision-id to associate with new lines
143
(will often be CURRENT_REVISION)
145
if len(parents_lines) == 1:
146
for data in _reannotate(parents_lines[0], new_lines, new_revision_id):
149
reannotations = [list(_reannotate(p, new_lines, new_revision_id)) for
151
for annos in zip(*reannotations):
152
origins = set(a for a, l in annos)
154
if len(origins) == 1:
155
yield iter(origins).next(), line
156
elif len(origins) == 2 and new_revision_id in origins:
157
yield (x for x in origins if x != new_revision_id).next(), line
159
yield new_revision_id, line
162
def _reannotate(parent_lines, new_lines, new_revision_id):
163
plain_parent_lines = [l for r, l in parent_lines]
164
matcher = patiencediff.PatienceSequenceMatcher(None, plain_parent_lines,
167
for i, j, n in matcher.get_matching_blocks():
168
for line in new_lines[new_cur:j]:
169
yield new_revision_id, line
170
for data in parent_lines[i:i+n]:
added
removed
bzrlib/annotate.py
