bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
1  | 
# Copyright (C) 2004, 2005 by Canonical Ltd
 | 
2  | 
||
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.
 | 
|
7  | 
||
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.
 | 
|
12  | 
||
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
 | 
|
16  | 
||
17  | 
"""File annotate based on weave storage"""
 | 
|
18  | 
||
| 
1185.16.8
by Martin Pool
 doc  | 
19  | 
# TODO: Choice of more or less verbose formats:
 | 
20  | 
# 
 | 
|
21  | 
# interposed: show more details between blocks of modified lines
 | 
|
22  | 
||
23  | 
# TODO: Show which revision caused a line to merge into the parent
 | 
|
24  | 
||
| 
1185.16.57
by Martin Pool
 [merge] from aaron  | 
25  | 
# TODO: perhaps abbreviate timescales depending on how recent they are
 | 
26  | 
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
 | 
|
27  | 
||
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
28  | 
import sys  | 
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
29  | 
import time  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
30  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
31  | 
from bzrlib.config import extract_email_address  | 
| 
1185.33.31
by Martin Pool
 Make annotate cope better with revisions committed without a valid  | 
32  | 
from bzrlib.errors import BzrError  | 
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
33  | 
|
34  | 
||
35  | 
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,  | 
|
36  | 
to_file=None):  | 
|
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
37  | 
if to_file is None:  | 
38  | 
to_file = sys.stdout  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
39  | 
|
40  | 
prevanno=''  | 
|
| 
1185.33.39
by Martin Pool
 [patch] annotate --long (robey pointer)  | 
41  | 
annotation = list(_annotate_file(branch, rev_id, file_id))  | 
42  | 
max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation))  | 
|
43  | 
for (revno_str, author, date_str, line_rev_id, text ) in annotation:  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
44  | 
if verbose:  | 
| 
1185.33.39
by Martin Pool
 [patch] annotate --long (robey pointer)  | 
45  | 
anno = '%5s %-*s %8s ' % (revno_str, max_origin_len, author, date_str)  | 
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
46  | 
else:  | 
47  | 
anno = "%5s %-7s " % ( revno_str, author[:7] )  | 
|
48  | 
||
49  | 
if anno.lstrip() == "" and full: anno = prevanno  | 
|
50  | 
print >>to_file, '%s| %s' % (anno, text)  | 
|
51  | 
prevanno=anno  | 
|
52  | 
||
53  | 
def _annotate_file(branch, rev_id, file_id ):  | 
|
54  | 
||
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
55  | 
rh = branch.revision_history()  | 
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
56  | 
w = branch.repository.weave_store.get_weave(file_id,  | 
57  | 
branch.repository.get_transaction())  | 
|
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
58  | 
last_origin = None  | 
59  | 
for origin, text in w.annotate_iter(rev_id):  | 
|
60  | 
text = text.rstrip('\r\n')  | 
|
61  | 
if origin == last_origin:  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
62  | 
(revno_str, author, date_str) = ('','','')  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
63  | 
else:  | 
64  | 
last_origin = origin  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
65  | 
if not branch.repository.has_revision(origin):  | 
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
66  | 
(revno_str, author, date_str) = ('?','?','?')  | 
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
67  | 
else:  | 
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
68  | 
if origin in rh:  | 
69  | 
revno_str = str(rh.index(origin) + 1)  | 
|
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
70  | 
else:  | 
71  | 
revno_str = 'merge'  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
72  | 
rev = branch.repository.get_revision(origin)  | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
73  | 
tz = rev.timezone or 0  | 
74  | 
date_str = time.strftime('%Y%m%d',  | 
|
75  | 
time.gmtime(rev.timestamp + tz))  | 
|
76  | 
            # a lazy way to get something like the email address
 | 
|
77  | 
            # TODO: Get real email address
 | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
78  | 
author = rev.committer  | 
79  | 
try:  | 
|
80  | 
author = extract_email_address(author)  | 
|
81  | 
except BzrError:  | 
|
82  | 
pass # use the whole name  | 
|
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
83  | 
yield (revno_str, author, date_str, origin, text)  |