← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Robert Collins
  • Date: 2005-10-18 05:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018052622-653d638c9e26fde4
fix broken tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
22
22
 
23
23
# TODO: Show which revision caused a line to merge into the parent
24
24
 
 
25
# TODO: With --long, show entire email address, not just the first bit
 
26
 
25
27
# TODO: perhaps abbreviate timescales depending on how recent they are
26
28
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
27
29
 
31
33
 
32
34
import bzrlib.weave
33
35
from bzrlib.config import extract_email_address
34
 
from bzrlib.errors import BzrError
35
36
 
36
37
 
37
38
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
40
41
        to_file = sys.stdout
41
42
 
42
43
    prevanno=''
43
 
    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:
 
44
    for (revno_str, author, date_str, line_rev_id, text ) in \
 
45
            _annotate_file(branch, rev_id, file_id ):
 
46
 
46
47
        if verbose:
47
 
            anno = '%5s %-*s %8s ' % (revno_str, max_origin_len, author, date_str)
 
48
            anno = '%5s %-12s %8s ' % (revno_str, author[:12], date_str)
48
49
        else:
49
50
            anno = "%5s %-7s " % ( revno_str, author[:7] )
50
51
 
55
56
def _annotate_file(branch, rev_id, file_id ):
56
57
 
57
58
    rh = branch.revision_history()
58
 
    w = branch.repository.weave_store.get_weave(file_id, 
59
 
        branch.repository.get_transaction())
 
59
    w = branch.weave_store.get_weave(file_id, branch.get_transaction())
60
60
    last_origin = None
61
61
    for origin, text in w.annotate_iter(rev_id):
62
62
        text = text.rstrip('\r\n')
64
64
            (revno_str, author, date_str) = ('','','')
65
65
        else:
66
66
            last_origin = origin
67
 
            if not branch.repository.has_revision(origin):
 
67
            line_rev_id = w.idx_to_name(origin)
 
68
            if not branch.has_revision(line_rev_id):
68
69
                (revno_str, author, date_str) = ('?','?','?')
69
70
            else:
70
 
                if origin in rh:
71
 
                    revno_str = str(rh.index(origin) + 1)
 
71
                if line_rev_id in rh:
 
72
                    revno_str = str(rh.index(line_rev_id) + 1)
72
73
                else:
73
74
                    revno_str = 'merge'
74
 
            rev = branch.repository.get_revision(origin)
 
75
            rev = branch.get_revision(line_rev_id)
75
76
            tz = rev.timezone or 0
76
77
            date_str = time.strftime('%Y%m%d', 
77
78
                                     time.gmtime(rev.timestamp + tz))
82
83
                author = extract_email_address(author)
83
84
            except BzrError:
84
85
                pass        # use the whole name
85
 
        yield (revno_str, author, date_str, origin, text)
 
86
        yield (revno_str, author, date_str, line_rev_id, text)
 
87
 
 
88
 
 
89
if __name__ == '__main__':
 
90
    from bzrlib.branch import Branch
 
91
    from bzrlib.trace import enable_default_logging
 
92
    from bzrlib.workingtree import WorkingTree
 
93
 
 
94
    enable_default_logging()
 
95
    b = Branch.open_containing(sys.argv[1])[0]
 
96
    tree = WorkingTree(b.base, b)
 
97
    rp = tree.relpath(sys.argv[1])
 
98
    tree = b.revision_tree(b.last_revision())
 
99
    file_id = tree.inventory.path2id(rp)
 
100
    file_version = tree.inventory[file_id].revision
 
101
    annotate_file(b, file_version, file_id, to_file = sys.stdout)