/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
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
31
from bzrlib.config import extract_email_address
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
32
from bzrlib.errors import NoEmailInUsername
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))
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
42
    if len(annotation) == 0:
43
        max_origin_len = 0
44
    else:
45
        max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation))
1185.33.39 by Martin Pool
[patch] annotate --long (robey pointer)
46
    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
47
        if verbose:
1185.33.39 by Martin Pool
[patch] annotate --long (robey pointer)
48
            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
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.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
59
    w = branch.repository.weave_store.get_weave(file_id, 
60
        branch.repository.get_transaction())
1385 by Martin Pool
- simple weave-based annotate code (not complete)
61
    last_origin = None
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
62
    annotations = list(w.annotate_iter(rev_id))
63
    revision_ids = set(o for o, t in annotations)
64
    revision_ids = [o for o in revision_ids if 
65
                    branch.repository.has_revision(o)]
66
    revisions = dict((r.revision_id, r) for r in 
67
                     branch.repository.get_revisions(revision_ids))
68
    for origin, text in annotations:
1385 by Martin Pool
- simple weave-based annotate code (not complete)
69
        text = text.rstrip('\r\n')
70
        if origin == last_origin:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
71
            (revno_str, author, date_str) = ('','','')
1385 by Martin Pool
- simple weave-based annotate code (not complete)
72
        else:
73
            last_origin = origin
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
74
            if origin not in revisions:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
75
                (revno_str, author, date_str) = ('?','?','?')
1185.16.1 by Martin Pool
- update annotate for new branch api
76
            else:
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
77
                if origin in rh:
78
                    revno_str = str(rh.index(origin) + 1)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
79
                else:
80
                    revno_str = 'merge'
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
81
            rev = revisions[origin]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
82
            tz = rev.timezone or 0
83
            date_str = time.strftime('%Y%m%d', 
84
                                     time.gmtime(rev.timestamp + tz))
85
            # a lazy way to get something like the email address
86
            # TODO: Get real email address
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
87
            author = rev.committer
88
            try:
89
                author = extract_email_address(author)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
90
            except NoEmailInUsername:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
91
                pass        # use the whole name
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
92
        yield (revno_str, author, date_str, origin, text)
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
93
94
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
95
def reannotate(parents_lines, new_lines, new_revision_id):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
96
    """Create a new annotated version from new lines and parent annotations.
97
    
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
98
    :param parents_lines: List of annotated lines for all parents
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
99
    :param new_lines: The un-annotated new lines
100
    :param new_revision_id: The revision-id to associate with new lines
101
        (will often be CURRENT_REVISION)
102
    """
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
103
    if len(parents_lines) == 1:
104
        for data in _reannotate(parents_lines[0], new_lines, new_revision_id):
105
            yield data
106
    else:
107
        reannotations = [list(_reannotate(p, new_lines, new_revision_id)) for
108
                         p in parents_lines]
109
        for annos in zip(*reannotations):
110
            origins = set(a for a, l in annos)
111
            line = annos[0][1]
112
            if len(origins) == 1:
113
                yield iter(origins).next(), line
114
            elif len(origins) == 2 and new_revision_id in origins:
115
                yield (x for x in origins if x != new_revision_id).next(), line
116
            else:
117
                yield new_revision_id, line
1551.9.18 by Aaron Bentley
Updates from review comments
118
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
119
120
def _reannotate(parent_lines, new_lines, new_revision_id):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
121
    plain_parent_lines = [l for r, l in parent_lines]
122
    patiencediff.PatienceSequenceMatcher()
1551.9.18 by Aaron Bentley
Updates from review comments
123
    matcher = patiencediff.PatienceSequenceMatcher(None, plain_parent_lines,
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
124
                                                   new_lines)
125
    new_cur = 0
126
    for i, j, n in matcher.get_matching_blocks():
127
        for line in new_lines[new_cur:j]:
128
            yield new_revision_id, line
129
        for data in parent_lines[i:i+n]:
1551.9.18 by Aaron Bentley
Updates from review comments
130
            yield data
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
131
        new_cur = j + n