/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2004, 2005 Canonical Ltd
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
2
#
1385 by Martin Pool
- simple weave-based annotate code (not complete)
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
7
#
1385 by Martin Pool
- simple weave-based annotate code (not complete)
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
12
#
1385 by Martin Pool
- simple weave-based annotate code (not complete)
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
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
31
from bzrlib import (
32
    errors,
33
    tsort,
34
    )
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,
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
39
                  to_file=None, show_ids=False):
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=''
1185.33.39 by Martin Pool
[patch] annotate --long (robey pointer)
44
    annotation = list(_annotate_file(branch, rev_id, file_id))
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
45
    if len(annotation) == 0:
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
46
        max_origin_len = max_revno_len = max_revid_len = 0
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
47
    else:
48
        max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation))
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
49
        max_revno_len = max(len(x[0]) for x in annotation)
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
50
        max_revid_len = max(len(x[3]) for x in annotation)
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
51
2182.3.2 by John Arbash Meinel
Use shortened revnos unless --long is supplied
52
    if not verbose:
2182.3.3 by John Arbash Meinel
Add tests for annotate with dotted revnos.
53
        max_revno_len = max(min(max_revno_len, 12), 3)
2182.3.2 by John Arbash Meinel
Use shortened revnos unless --long is supplied
54
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
55
    last_rev_id = None
56
    for (revno_str, author, date_str, line_rev_id, text) in annotation:
57
        if show_ids:
58
            if full or last_rev_id != line_rev_id:
59
                anno = '%*s ' % (max_revid_len, str(line_rev_id))
60
            else:
61
                anno = ' ' * (max_revid_len+1)
62
            last_rev_id = line_rev_id
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
63
        else:
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
64
            if verbose:
65
                anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str, max_origin_len, author, date_str)
66
            else:
67
                if len(revno_str) > max_revno_len:
68
                    revno_str = revno_str[:max_revno_len-1] + '>'
69
                anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7] )
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
70
71
        if anno.lstrip() == "" and full: anno = prevanno
72
        print >>to_file, '%s| %s' % (anno, text)
73
        prevanno=anno
74
75
def _annotate_file(branch, rev_id, file_id ):
76
1385 by Martin Pool
- simple weave-based annotate code (not complete)
77
    rh = branch.revision_history()
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
78
    revision_graph = branch.repository.get_revision_graph(rev_id)
79
    merge_sorted_revisions = tsort.merge_sort(
80
        revision_graph,
81
        rev_id,
82
        None,
83
        generate_revno=True)
84
    revision_id_to_revno = dict((rev_id, revno)
85
                                for seq_num, rev_id, depth, revno, end_of_merge
86
                                 in merge_sorted_revisions)
87
    w = branch.repository.weave_store.get_weave(file_id,
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
88
        branch.repository.get_transaction())
1385 by Martin Pool
- simple weave-based annotate code (not complete)
89
    last_origin = None
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
90
    annotations = list(w.annotate_iter(rev_id))
91
    revision_ids = set(o for o, t in annotations)
92
    revision_ids = [o for o in revision_ids if 
93
                    branch.repository.has_revision(o)]
94
    revisions = dict((r.revision_id, r) for r in 
95
                     branch.repository.get_revisions(revision_ids))
96
    for origin, text in annotations:
1385 by Martin Pool
- simple weave-based annotate code (not complete)
97
        text = text.rstrip('\r\n')
98
        if origin == last_origin:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
99
            (revno_str, author, date_str) = ('','','')
1385 by Martin Pool
- simple weave-based annotate code (not complete)
100
        else:
101
            last_origin = origin
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
102
            if origin not in revisions:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
103
                (revno_str, author, date_str) = ('?','?','?')
1185.16.1 by Martin Pool
- update annotate for new branch api
104
            else:
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
105
                revno_str = '.'.join(str(i) for i in
106
                                            revision_id_to_revno[origin])
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
107
            rev = revisions[origin]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
108
            tz = rev.timezone or 0
109
            date_str = time.strftime('%Y%m%d', 
110
                                     time.gmtime(rev.timestamp + tz))
111
            # a lazy way to get something like the email address
112
            # TODO: Get real email address
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
113
            author = rev.committer
114
            try:
115
                author = extract_email_address(author)
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
116
            except errors.NoEmailInUsername:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
117
                pass        # use the whole name
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
118
        yield (revno_str, author, date_str, origin, text)