/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
1
# Copyright (C) 2009 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
"""Functionality for doing annotations in the 'optimal' way"""
18
19
from bzrlib import (
20
    errors,
21
    graph as _mod_graph,
22
    osutils,
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
23
    patiencediff,
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
24
    ui,
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
25
    )
26
27
28
class AnnotatorPolicy(object):
29
    """Variables that define annotations."""
30
31
32
class Annotator(object):
33
    """Class that drives performing annotations."""
34
35
    def __init__(self, vf):
36
        """Create a new Annotator from a VersionedFile."""
37
        self._vf = vf
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
38
        self._parent_map = {}
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
39
        self._text_cache = {}
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
40
        # Map from key => number of nexts that will be built from this key
41
        self._num_needed_children = {}
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
42
        self._annotations_cache = {}
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
43
        self._heads_provider = None
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
44
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
45
    def _update_needed_children(self, key, parent_keys):
46
        for parent_key in parent_keys:
47
            if parent_key in self._num_needed_children:
48
                self._num_needed_children[parent_key] += 1
49
            else:
50
                self._num_needed_children[parent_key] = 1
51
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
52
    def _get_needed_keys(self, key):
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
53
        """Determine the texts we need to get from the backing vf.
54
55
        :return: (vf_keys_needed, ann_keys_needed)
56
            vf_keys_needed  These are keys that we need to get from the vf
57
            ann_keys_needed Texts which we have in self._text_cache but we
58
                            don't have annotations for. We need to yield these
59
                            in the proper order so that we can get proper
60
                            annotations.
61
        """
62
        parent_map = self._parent_map
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
63
        # We need 1 extra copy of the node we will be looking at when we are
64
        # done
65
        self._num_needed_children[key] = 1
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
66
        vf_keys_needed = set()
67
        ann_keys_needed = set()
68
        needed_keys = set([key])
69
        while needed_keys:
70
            parent_lookup = []
71
            next_parent_map = {}
72
            for key in needed_keys:
73
                if key in self._parent_map:
74
                    # We don't need to lookup this key in the vf
75
                    if key not in self._text_cache:
76
                        # Extract this text from the vf
77
                        vf_keys_needed.add(key)
78
                    elif key not in self._annotations_cache:
79
                        # We do need to annotate
80
                        ann_keys_needed.add(key)
81
                        next_parent_map[key] = self._parent_map[key]
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
82
                else:
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
83
                    parent_lookup.append(key)
84
                    vf_keys_needed.add(key)
85
            needed_keys = set()
86
            next_parent_map.update(self._vf.get_parent_map(parent_lookup))
87
            for key, parent_keys in next_parent_map.iteritems():
88
                self._update_needed_children(key, parent_keys)
89
                needed_keys.update([key for key in parent_keys
90
                                         if key not in parent_map])
91
            parent_map.update(next_parent_map)
92
            # _heads_provider does some graph caching, so it is only valid while
93
            # self._parent_map hasn't changed
94
            self._heads_provider = None
95
        return vf_keys_needed, ann_keys_needed
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
96
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
97
    def _get_needed_texts(self, key, pb=None):
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
98
        """Get the texts we need to properly annotate key.
99
100
        :param key: A Key that is present in self._vf
101
        :return: Yield (this_key, text, num_lines)
102
            'text' is an opaque object that just has to work with whatever
103
            matcher object we are using. Currently it is always 'lines' but
104
            future improvements may change this to a simple text string.
105
        """
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
106
        keys, ann_keys = self._get_needed_keys(key)
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
107
        if pb is not None:
108
            pb.update('getting stream', 0, len(keys))
109
        stream  = self._vf.get_record_stream(keys, 'topological', True)
110
        for idx, record in enumerate(stream):
111
            if pb is not None:
112
                pb.update('extracting', 0, len(keys))
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
113
            if record.storage_kind == 'absent':
114
                raise errors.RevisionNotPresent(record.key, self._vf)
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
115
            this_key = record.key
116
            lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
117
            num_lines = len(lines)
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
118
            self._text_cache[this_key] = lines
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
119
            yield this_key, lines, num_lines
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
120
        for key in ann_keys:
121
            lines = self._text_cache[key]
122
            num_lines = len(lines)
123
            yield key, lines, num_lines
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
124
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
125
    def _get_parent_annotations_and_matches(self, key, text, parent_key):
4454.3.9 by John Arbash Meinel
Remove heads_provider, as we don't use it now.
126
        """Get the list of annotations for the parent, and the matching lines.
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
127
4454.3.9 by John Arbash Meinel
Remove heads_provider, as we don't use it now.
128
        :param text: The opaque value given by _get_needed_texts
129
        :param parent_key: The key for the parent text
130
        :return: (parent_annotations, matching_blocks)
131
            parent_annotations is a list as long as the number of lines in
132
                parent
133
            matching_blocks is a list of (parent_idx, text_idx, len) tuples
134
                indicating which lines match between the two texts
135
        """
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
136
        parent_lines = self._text_cache[parent_key]
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
137
        parent_annotations = self._annotations_cache[parent_key]
138
        # PatienceSequenceMatcher should probably be part of Policy
139
        matcher = patiencediff.PatienceSequenceMatcher(None,
4454.3.9 by John Arbash Meinel
Remove heads_provider, as we don't use it now.
140
            parent_lines, text)
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
141
        matching_blocks = matcher.get_matching_blocks()
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
142
        return parent_annotations, matching_blocks
143
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
144
    def _update_from_one_parent(self, key, annotations, lines, parent_key):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
145
        """Reannotate this text relative to its first parent."""
146
        parent_annotations, matching_blocks = self._get_parent_annotations_and_matches(
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
147
            key, lines, parent_key)
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
148
149
        for parent_idx, lines_idx, match_len in matching_blocks:
150
            # For all matching regions we copy across the parent annotations
151
            annotations[lines_idx:lines_idx + match_len] = \
152
                parent_annotations[parent_idx:parent_idx + match_len]
153
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
154
    def _update_from_other_parents(self, key, annotations, lines,
155
                                   this_annotation, parent_key):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
156
        """Reannotate this text relative to a second (or more) parent."""
157
        parent_annotations, matching_blocks = self._get_parent_annotations_and_matches(
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
158
            key, lines, parent_key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
159
4454.3.6 by John Arbash Meinel
Adding a trivial 'last_entry' cache drops the time from 56s down to 40s
160
        last_ann = None
161
        last_parent = None
162
        last_res = None
4454.3.7 by John Arbash Meinel
Some minor changes
163
        # TODO: consider making all annotations unique and then using 'is'
164
        #       everywhere. Current results claim that isn't any faster,
165
        #       because of the time spent deduping
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
166
        #       deduping also saves a bit of memory. For NEWS it saves ~1MB,
167
        #       but that is out of 200-300MB for extracting everything, so a
168
        #       fairly trivial amount
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
169
        for parent_idx, lines_idx, match_len in matching_blocks:
170
            # For lines which match this parent, we will now resolve whether
171
            # this parent wins over the current annotation
4454.3.40 by John Arbash Meinel
Shave a bit more time off by using subset matching to skip whole regions.
172
            ann_sub = annotations[lines_idx:lines_idx + match_len]
173
            par_sub = parent_annotations[parent_idx:parent_idx + match_len]
174
            if ann_sub == par_sub:
175
                continue
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
176
            for idx in xrange(match_len):
4454.3.40 by John Arbash Meinel
Shave a bit more time off by using subset matching to skip whole regions.
177
                ann = ann_sub[idx]
178
                par_ann = par_sub[idx]
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
179
                ann_idx = lines_idx + idx
180
                if ann == par_ann:
181
                    # Nothing to change
182
                    continue
4454.3.7 by John Arbash Meinel
Some minor changes
183
                if ann == this_annotation:
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
184
                    # Originally claimed 'this', but it was really in this
185
                    # parent
186
                    annotations[ann_idx] = par_ann
187
                    continue
4454.3.7 by John Arbash Meinel
Some minor changes
188
                # Resolve the fact that both sides have a different value for
189
                # last modified
4454.3.6 by John Arbash Meinel
Adding a trivial 'last_entry' cache drops the time from 56s down to 40s
190
                if ann == last_ann and par_ann == last_parent:
191
                    annotations[ann_idx] = last_res
192
                else:
193
                    new_ann = set(ann)
194
                    new_ann.update(par_ann)
195
                    new_ann = tuple(sorted(new_ann))
196
                    annotations[ann_idx] = new_ann
197
                    last_ann = ann
198
                    last_parent = par_ann
199
                    last_res = new_ann
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
200
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
201
    def _record_annotation(self, key, parent_keys, annotations):
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
202
        self._annotations_cache[key] = annotations
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
203
        for parent_key in parent_keys:
204
            num = self._num_needed_children[parent_key]
205
            num -= 1
206
            if num == 0:
207
                del self._text_cache[parent_key]
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
208
                del self._annotations_cache[parent_key]
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
209
                # Do we want to clean up _num_needed_children at this point as
210
                # well?
211
            self._num_needed_children[parent_key] = num
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
212
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
213
    def _annotate_one(self, key, text, num_lines):
214
        this_annotation = (key,)
215
        # Note: annotations will be mutated by calls to _update_from*
216
        annotations = [this_annotation] * num_lines
217
        parent_keys = self._parent_map[key]
218
        if parent_keys:
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
219
            self._update_from_one_parent(key, annotations, text, parent_keys[0])
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
220
            for parent in parent_keys[1:]:
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
221
                self._update_from_other_parents(key, annotations, text,
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
222
                                                this_annotation, parent)
223
        self._record_annotation(key, parent_keys, annotations)
224
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
225
    def add_special_text(self, key, parent_keys, text):
226
        """Add a specific text to the graph."""
227
        self._parent_map[key] = parent_keys
228
        self._text_cache[key] = osutils.split_lines(text)
229
        self._heads_provider = None
230
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
231
    def annotate(self, key):
232
        """Return annotated fulltext for the given key."""
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
233
        pb = ui.ui_factory.nested_progress_bar()
234
        try:
235
            for text_key, text, num_lines in self._get_needed_texts(key, pb=pb):
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
236
                self._annotate_one(text_key, text, num_lines)
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
237
        finally:
238
            pb.finished()
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
239
        try:
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
240
            annotations = self._annotations_cache[key]
241
        except KeyError:
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
242
            raise errors.RevisionNotPresent(key, self._vf)
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
243
        return annotations, self._text_cache[key]
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
244
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
245
    def _get_heads_provider(self):
246
        if self._heads_provider is None:
247
            self._heads_provider = _mod_graph.KnownGraph(self._parent_map)
248
        return self._heads_provider
249
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
250
    def annotate_flat(self, key):
251
        """Determine the single-best-revision to source for each line.
252
253
        This is meant as a compatibility thunk to how annotate() used to work.
254
        """
255
        annotations, lines = self.annotate(key)
256
        assert len(annotations) == len(lines)
257
        out = []
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
258
        heads = self._get_heads_provider().heads
4454.3.13 by John Arbash Meinel
A bit of simplification to the annotate_flat logic.
259
        append = out.append
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
260
        for annotation, line in zip(annotations, lines):
261
            if len(annotation) == 1:
4454.3.13 by John Arbash Meinel
A bit of simplification to the annotate_flat logic.
262
                append((annotation[0], line))
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
263
            else:
264
                the_heads = heads(annotation)
265
                if len(the_heads) == 1:
266
                    for head in the_heads:
267
                        break
268
                else:
269
                    # We need to resolve the ambiguity, for now just pick the
270
                    # sorted smallest
4454.3.13 by John Arbash Meinel
A bit of simplification to the annotate_flat logic.
271
                    head = sorted(the_heads)[0]
272
                append((head, line))
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
273
        return out