~bzr-pqm/bzr/bzr.dev

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: With --long, show entire email address, not just the first bit
26
27
# TODO: perhaps abbreviate timescales depending on how recent they are
28
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
29
1385 by Martin Pool
- simple weave-based annotate code (not complete)
30
import sys
31
import os
1185.16.1 by Martin Pool
- update annotate for new branch api
32
import time
1385 by Martin Pool
- simple weave-based annotate code (not complete)
33
34
import bzrlib.weave
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
35
from bzrlib.config import extract_email_address
36
37
38
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
39
        to_file=None):
1385 by Martin Pool
- simple weave-based annotate code (not complete)
40
    if to_file is None:
41
        to_file = sys.stdout
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
42
43
    prevanno=''
44
    for (revno_str, author, date_str, line_rev_id, text ) in \
45
            _annotate_file(branch, rev_id, file_id ):
46
47
        if verbose:
48
            anno = '%5s %-12s %8s ' % (revno_str, author[:12], date_str)
49
        else:
50
            anno = "%5s %-7s " % ( revno_str, author[:7] )
51
52
        if anno.lstrip() == "" and full: anno = prevanno
53
        print >>to_file, '%s| %s' % (anno, text)
54
        prevanno=anno
55
56
def _annotate_file(branch, rev_id, file_id ):
57
1385 by Martin Pool
- simple weave-based annotate code (not complete)
58
    rh = branch.revision_history()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
59
    w = branch.storage.weave_store.get_weave(file_id, 
60
                                             branch.storage.get_transaction())
1385 by Martin Pool
- simple weave-based annotate code (not complete)
61
    last_origin = None
62
    for origin, text in w.annotate_iter(rev_id):
63
        text = text.rstrip('\r\n')
64
        if origin == last_origin:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
65
            (revno_str, author, date_str) = ('','','')
1385 by Martin Pool
- simple weave-based annotate code (not complete)
66
        else:
67
            last_origin = origin
68
            line_rev_id = w.idx_to_name(origin)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
69
            if not branch.storage.has_revision(line_rev_id):
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
70
                (revno_str, author, date_str) = ('?','?','?')
1185.16.1 by Martin Pool
- update annotate for new branch api
71
            else:
1185.16.32 by Martin Pool
- add a basic annotate built-in command
72
                if line_rev_id in rh:
73
                    revno_str = str(rh.index(line_rev_id) + 1)
74
                else:
75
                    revno_str = 'merge'
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
76
            rev = branch.storage.get_revision(line_rev_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
77
            tz = rev.timezone or 0
78
            date_str = time.strftime('%Y%m%d', 
79
                                     time.gmtime(rev.timestamp + tz))
80
            # a lazy way to get something like the email address
81
            # TODO: Get real email address
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
82
            author = rev.committer
83
            try:
84
                author = extract_email_address(author)
85
            except BzrError:
86
                pass        # use the whole name
87
        yield (revno_str, author, date_str, line_rev_id, text)