← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to annotate.py

  • Committer: Aaron Bentley
  • Date: 2005-06-15 15:53:52 UTC
  • Revision ID: abentley@panoramicfeedback.com-20050615155352-afb1ccd8c20839c7
updated docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate.py
1
 
# Copyright (C) 2004, 2005 Aaron Bentley
2
 
# <aaron.bentley@utoronto.ca>
3
 
#
4
 
#    This program is free software; you can redistribute it and/or modify
5
 
#    it under the terms of the GNU General Public License as published by
6
 
#    the Free Software Foundation; either version 2 of the License, or
7
 
#    (at your option) any later version.
8
 
#
9
 
#    This program is distributed in the hope that it will be useful,
10
 
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
11
 
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
 
#    GNU General Public License for more details.
13
 
#
14
 
#    You should have received a copy of the GNU General Public License
15
 
#    along with this program; if not, write to the Free Software
16
 
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
 
from bzrlib.branch import Branch
 
1
from bzrlib import Branch
18
2
from bzrlib.commands import Command
19
 
from bzrlib.errors import BzrCommandError
20
3
import os
21
4
import progress
22
 
from progress import show_progress
23
5
import patches
24
6
import difflib
25
7
import sys
32
14
    i = 0
33
15
    for revno in q:
34
16
        i += 1
35
 
        cur_tree = branch.revision_tree(branch.get_rev_id(revno))
 
17
        cur_tree = branch.revision_tree(branch.lookup_revision(revno))
36
18
        if file_id not in cur_tree.inventory:
37
19
            text_id = None
38
20
        else:
39
21
            text_id = cur_tree.inventory[file_id].text_id
40
22
        if text_id != later_text_id:
41
23
            patch = get_patch(branch, revno, later_revision, file_id)
42
 
            yield revno+1, patch.iter_inserted(), patch
 
24
            yield revno, patch.iter_inserted(), patch
43
25
            later_revision = revno
44
26
            later_text_id = text_id
45
27
        yield progress.Progress("revisions", i)
46
28
 
47
29
def get_patch(branch, old_revno, new_revno, file_id):
48
 
    old_tree = branch.revision_tree(branch.get_rev_id(old_revno))
49
 
    new_tree = branch.revision_tree(branch.get_rev_id(new_revno))
 
30
    old_tree = branch.revision_tree(branch.lookup_revision(old_revno))
 
31
    new_tree = branch.revision_tree(branch.lookup_revision(new_revno))
50
32
    if file_id in old_tree.inventory:
51
33
        old_file = old_tree.get_file(file_id).readlines()
52
34
    else:
61
43
    def run(self, filename):
62
44
        if not os.path.exists(filename):
63
45
            raise BzrCommandError("The file %s does not exist." % filename)
64
 
        branch = (Branch.open_containing(filename))
65
 
        file_id = branch.working_tree().path2id(branch.relpath(filename))
 
46
        branch = (Branch(filename))
 
47
        file_id = branch.working_tree().path2id(filename)
66
48
        if file_id is None:
67
49
            raise BzrCommandError("The file %s is not versioned." % filename)
68
50
        lines = branch.basis_tree().get_file(file_id)
70
52
        anno_d_iter = iter_anno_data(branch, file_id)
71
53
        progress_bar = progress.ProgressBar()
72
54
        try:
73
 
            for result in iter_annotate_file(lines, anno_d_iter):
 
55
            for result in patches.iter_annotate_file(lines, anno_d_iter):
74
56
                if isinstance(result, progress.Progress):
75
57
                    result.total = total
76
 
                    show_progress(progress_bar, result)
 
58
                    progress_bar(result)
77
59
                else:
78
60
                    anno_lines = result
79
61
        finally:
80
 
            progress_bar.clear()
 
62
            progress.clear_progress_bar()
81
63
        for line in anno_lines:
82
64
            sys.stdout.write("%4s:%s" % (str(line.log), line.text))
83
65
 
84
 
 
85
 
class AnnotateLine:
86
 
    """A line associated with the log that produced it"""
87
 
    def __init__(self, text, log=None):
88
 
        self.text = text
89
 
        self.log = log
90
 
 
91
 
class CantGetRevisionData(Exception):
92
 
    def __init__(self, revision):
93
 
        Exception.__init__(self, "Can't get data for revision %s" % revision)
94
 
        
95
 
def annotate_file2(file_lines, anno_iter):
96
 
    for result in iter_annotate_file(file_lines, anno_iter):
97
 
        pass
98
 
    return result
99
 
 
100
 
        
101
 
def iter_annotate_file(file_lines, anno_iter):
102
 
    lines = [AnnotateLine(f) for f in file_lines]
103
 
    patches = []
104
 
    try:
105
 
        for result in anno_iter:
106
 
            if isinstance(result, progress.Progress):
107
 
                yield result
108
 
                continue
109
 
            log, iter_inserted, patch = result
110
 
            for (num, line) in iter_inserted:
111
 
                old_num = num
112
 
 
113
 
                for cur_patch in patches:
114
 
                    num = cur_patch.pos_in_mod(num)
115
 
                    if num == None: 
116
 
                        break
117
 
 
118
 
                if num >= len(lines):
119
 
                    continue
120
 
                if num is not None and lines[num].log is None:
121
 
                    lines[num].log = log
122
 
            patches=[patch]+patches
123
 
    except CantGetRevisionData:
124
 
        pass
125
 
    yield lines