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  | 
# short: just show revno
 | 
|
22  | 
# long: revno, author, date
 | 
|
23  | 
# interposed: show more details between blocks of modified lines
 | 
|
24  | 
||
25  | 
# TODO: Show which revision caused a line to merge into the parent
 | 
|
26  | 
||
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
27  | 
import sys  | 
28  | 
import os  | 
|
| 
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  | 
|
31  | 
import bzrlib.weave  | 
|
32  | 
||
33  | 
def annotate_file(branch, rev_id, file_id, to_file=None):  | 
|
34  | 
if to_file is None:  | 
|
35  | 
to_file = sys.stdout  | 
|
36  | 
rh = branch.revision_history()  | 
|
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
37  | 
w = branch.weave_store.get_weave(file_id, branch.get_transaction())  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
38  | 
last_origin = None  | 
39  | 
for origin, text in w.annotate_iter(rev_id):  | 
|
40  | 
text = text.rstrip('\r\n')  | 
|
41  | 
if origin == last_origin:  | 
|
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
42  | 
anno = ''  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
43  | 
else:  | 
44  | 
last_origin = origin  | 
|
45  | 
line_rev_id = w.idx_to_name(origin)  | 
|
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
46  | 
if not branch.has_revision(line_rev_id):  | 
47  | 
anno = '???'  | 
|
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
48  | 
else:  | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
49  | 
if line_rev_id in rh:  | 
50  | 
revno_str = str(rh.index(line_rev_id) + 1)  | 
|
51  | 
else:  | 
|
52  | 
revno_str = 'merge'  | 
|
53  | 
rev = branch.get_revision(line_rev_id)  | 
|
54  | 
tz = rev.timezone or 0  | 
|
55  | 
date_str = time.strftime('%Y%m%d',  | 
|
56  | 
time.gmtime(rev.timestamp + tz))  | 
|
57  | 
            # a lazy way to get something like the email address
 | 
|
58  | 
            # TODO: Get real email address
 | 
|
59  | 
author = line_rev_id  | 
|
60  | 
if '@' in author:  | 
|
61  | 
author = author[:author.index('@')]  | 
|
62  | 
author = author[:12]  | 
|
63  | 
anno = '%5s %-12s %8s' % (revno_str, author, date_str)  | 
|
64  | 
print '%-27.27s | %s' % (anno, text)  | 
|
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
65  | 
|
66  | 
||
67  | 
if __name__ == '__main__':  | 
|
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
68  | 
from bzrlib.branch import Branch  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
69  | 
from bzrlib.trace import enable_default_logging  | 
70  | 
||
71  | 
enable_default_logging()  | 
|
| 
1185.16.1
by Martin Pool
 - update annotate for new branch api  | 
72  | 
b = Branch.open_containing(sys.argv[1])  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
73  | 
rp = b.relpath(sys.argv[1])  | 
74  | 
tree = b.revision_tree(b.last_revision())  | 
|
75  | 
file_id = tree.inventory.path2id(rp)  | 
|
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
76  | 
file_version = tree.inventory[file_id].revision  | 
| 
1385
by Martin Pool
 - simple weave-based annotate code (not complete)  | 
77  | 
annotate_file(b, file_version, file_id, sys.stdout)  |