/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5273.1.5 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2009, 2010 Canonical Ltd
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
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
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Functionality for doing annotations in the 'optimal' way"""
18
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
19
from __future__ import absolute_import
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from .lazy_import import lazy_import
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
22
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
23
from breezy import (
5279.1.1 by Andrew Bennetts
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.
24
    annotate, # Must be lazy to avoid circular importing
25
    graph as _mod_graph,
26
    patiencediff,
27
    )
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
28
""")
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
29
from . import (
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
30
    errors,
31
    osutils,
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
32
    ui,
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
33
    )
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
34
from .sixish import (
35
    range,
36
    )
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
37
38
39
class Annotator(object):
40
    """Class that drives performing annotations."""
41
42
    def __init__(self, vf):
43
        """Create a new Annotator from a VersionedFile."""
44
        self._vf = vf
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
45
        self._parent_map = {}
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
46
        self._text_cache = {}
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
47
        # Map from key => number of nexts that will be built from this key
48
        self._num_needed_children = {}
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
49
        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.
50
        self._heads_provider = None
4454.3.73 by John Arbash Meinel
inherit from _annotator_py.Annotator in _annotator_pyx.Annotator.
51
        self._ann_tuple_cache = {}
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
52
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
53
    def _update_needed_children(self, key, parent_keys):
54
        for parent_key in parent_keys:
55
            if parent_key in self._num_needed_children:
56
                self._num_needed_children[parent_key] += 1
57
            else:
58
                self._num_needed_children[parent_key] = 1
59
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
60
    def _get_needed_keys(self, key):
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
61
        """Determine the texts we need to get from the backing vf.
62
63
        :return: (vf_keys_needed, ann_keys_needed)
64
            vf_keys_needed  These are keys that we need to get from the vf
65
            ann_keys_needed Texts which we have in self._text_cache but we
66
                            don't have annotations for. We need to yield these
67
                            in the proper order so that we can get proper
68
                            annotations.
69
        """
70
        parent_map = self._parent_map
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
71
        # We need 1 extra copy of the node we will be looking at when we are
72
        # done
73
        self._num_needed_children[key] = 1
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
74
        vf_keys_needed = set()
75
        ann_keys_needed = set()
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
76
        needed_keys = {key}
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
77
        while needed_keys:
78
            parent_lookup = []
79
            next_parent_map = {}
80
            for key in needed_keys:
81
                if key in self._parent_map:
82
                    # We don't need to lookup this key in the vf
83
                    if key not in self._text_cache:
84
                        # Extract this text from the vf
85
                        vf_keys_needed.add(key)
86
                    elif key not in self._annotations_cache:
87
                        # We do need to annotate
88
                        ann_keys_needed.add(key)
89
                        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.
90
                else:
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
91
                    parent_lookup.append(key)
92
                    vf_keys_needed.add(key)
93
            needed_keys = set()
94
            next_parent_map.update(self._vf.get_parent_map(parent_lookup))
95
            for key, parent_keys in next_parent_map.iteritems():
4454.3.66 by John Arbash Meinel
Implement no-graph support for the Python version.
96
                if parent_keys is None: # No graph versionedfile
97
                    parent_keys = ()
98
                    next_parent_map[key] = ()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
99
                self._update_needed_children(key, parent_keys)
100
                needed_keys.update([key for key in parent_keys
101
                                         if key not in parent_map])
102
            parent_map.update(next_parent_map)
103
            # _heads_provider does some graph caching, so it is only valid while
104
            # self._parent_map hasn't changed
105
            self._heads_provider = None
106
        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.
107
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
108
    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.
109
        """Get the texts we need to properly annotate key.
110
111
        :param key: A Key that is present in self._vf
112
        :return: Yield (this_key, text, num_lines)
113
            'text' is an opaque object that just has to work with whatever
114
            matcher object we are using. Currently it is always 'lines' but
115
            future improvements may change this to a simple text string.
116
        """
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
117
        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.
118
        if pb is not None:
119
            pb.update('getting stream', 0, len(keys))
120
        stream  = self._vf.get_record_stream(keys, 'topological', True)
121
        for idx, record in enumerate(stream):
122
            if pb is not None:
123
                pb.update('extracting', 0, len(keys))
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
124
            if record.storage_kind == 'absent':
125
                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.
126
            this_key = record.key
127
            lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
128
            num_lines = len(lines)
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
129
            self._text_cache[this_key] = lines
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
130
            yield this_key, lines, num_lines
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
131
        for key in ann_keys:
132
            lines = self._text_cache[key]
133
            num_lines = len(lines)
134
            yield key, lines, num_lines
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
135
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
136
    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.
137
        """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.
138
4454.3.9 by John Arbash Meinel
Remove heads_provider, as we don't use it now.
139
        :param text: The opaque value given by _get_needed_texts
140
        :param parent_key: The key for the parent text
141
        :return: (parent_annotations, matching_blocks)
142
            parent_annotations is a list as long as the number of lines in
143
                parent
144
            matching_blocks is a list of (parent_idx, text_idx, len) tuples
145
                indicating which lines match between the two texts
146
        """
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
147
        parent_lines = self._text_cache[parent_key]
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
148
        parent_annotations = self._annotations_cache[parent_key]
149
        # PatienceSequenceMatcher should probably be part of Policy
150
        matcher = patiencediff.PatienceSequenceMatcher(None,
4454.3.9 by John Arbash Meinel
Remove heads_provider, as we don't use it now.
151
            parent_lines, text)
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
152
        matching_blocks = matcher.get_matching_blocks()
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
153
        return parent_annotations, matching_blocks
154
4454.3.73 by John Arbash Meinel
inherit from _annotator_py.Annotator in _annotator_pyx.Annotator.
155
    def _update_from_first_parent(self, key, annotations, lines, parent_key):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
156
        """Reannotate this text relative to its first parent."""
4454.3.75 by John Arbash Meinel
Move the core loops into module-level helpers.
157
        (parent_annotations,
158
         matching_blocks) = self._get_parent_annotations_and_matches(
159
                                key, lines, parent_key)
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
160
161
        for parent_idx, lines_idx, match_len in matching_blocks:
162
            # For all matching regions we copy across the parent annotations
163
            annotations[lines_idx:lines_idx + match_len] = \
164
                parent_annotations[parent_idx:parent_idx + match_len]
165
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
166
    def _update_from_other_parents(self, key, annotations, lines,
167
                                   this_annotation, parent_key):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
168
        """Reannotate this text relative to a second (or more) parent."""
4454.3.75 by John Arbash Meinel
Move the core loops into module-level helpers.
169
        (parent_annotations,
170
         matching_blocks) = self._get_parent_annotations_and_matches(
171
                                key, lines, parent_key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
172
4454.3.6 by John Arbash Meinel
Adding a trivial 'last_entry' cache drops the time from 56s down to 40s
173
        last_ann = None
174
        last_parent = None
175
        last_res = None
4454.3.7 by John Arbash Meinel
Some minor changes
176
        # TODO: consider making all annotations unique and then using 'is'
177
        #       everywhere. Current results claim that isn't any faster,
178
        #       because of the time spent deduping
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
179
        #       deduping also saves a bit of memory. For NEWS it saves ~1MB,
180
        #       but that is out of 200-300MB for extracting everything, so a
181
        #       fairly trivial amount
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
182
        for parent_idx, lines_idx, match_len in matching_blocks:
183
            # For lines which match this parent, we will now resolve whether
184
            # 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.
185
            ann_sub = annotations[lines_idx:lines_idx + match_len]
186
            par_sub = parent_annotations[parent_idx:parent_idx + match_len]
187
            if ann_sub == par_sub:
188
                continue
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
189
            for idx in range(match_len):
4454.3.40 by John Arbash Meinel
Shave a bit more time off by using subset matching to skip whole regions.
190
                ann = ann_sub[idx]
191
                par_ann = par_sub[idx]
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
192
                ann_idx = lines_idx + idx
193
                if ann == par_ann:
194
                    # Nothing to change
195
                    continue
4454.3.7 by John Arbash Meinel
Some minor changes
196
                if ann == this_annotation:
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
197
                    # Originally claimed 'this', but it was really in this
198
                    # parent
199
                    annotations[ann_idx] = par_ann
200
                    continue
4454.3.7 by John Arbash Meinel
Some minor changes
201
                # Resolve the fact that both sides have a different value for
202
                # last modified
4454.3.6 by John Arbash Meinel
Adding a trivial 'last_entry' cache drops the time from 56s down to 40s
203
                if ann == last_ann and par_ann == last_parent:
204
                    annotations[ann_idx] = last_res
205
                else:
206
                    new_ann = set(ann)
207
                    new_ann.update(par_ann)
208
                    new_ann = tuple(sorted(new_ann))
209
                    annotations[ann_idx] = new_ann
210
                    last_ann = ann
211
                    last_parent = par_ann
212
                    last_res = new_ann
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
213
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
214
    def _record_annotation(self, key, parent_keys, annotations):
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
215
        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.
216
        for parent_key in parent_keys:
217
            num = self._num_needed_children[parent_key]
218
            num -= 1
219
            if num == 0:
220
                del self._text_cache[parent_key]
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
221
                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.
222
                # Do we want to clean up _num_needed_children at this point as
223
                # well?
224
            self._num_needed_children[parent_key] = num
4454.3.16 by John Arbash Meinel
Move more access patterns into helper functions.
225
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
226
    def _annotate_one(self, key, text, num_lines):
227
        this_annotation = (key,)
228
        # Note: annotations will be mutated by calls to _update_from*
229
        annotations = [this_annotation] * num_lines
230
        parent_keys = self._parent_map[key]
231
        if parent_keys:
4454.3.73 by John Arbash Meinel
inherit from _annotator_py.Annotator in _annotator_pyx.Annotator.
232
            self._update_from_first_parent(key, annotations, text,
233
                                           parent_keys[0])
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
234
            for parent in parent_keys[1:]:
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
235
                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,
236
                                                this_annotation, parent)
237
        self._record_annotation(key, parent_keys, annotations)
238
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
239
    def add_special_text(self, key, parent_keys, text):
4454.3.74 by John Arbash Meinel
Some small tweaks, add more documentation for 'add_special_text'.
240
        """Add a specific text to the graph.
241
242
        This is used to add a text which is not otherwise present in the
243
        versioned file. (eg. a WorkingTree injecting 'current:' into the
244
        graph to annotate the edited content.)
245
246
        :param key: The key to use to request this text be annotated
247
        :param parent_keys: The parents of this text
248
        :param text: A string containing the content of the text
249
        """
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
250
        self._parent_map[key] = parent_keys
251
        self._text_cache[key] = osutils.split_lines(text)
252
        self._heads_provider = None
253
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
254
    def annotate(self, key):
4454.3.75 by John Arbash Meinel
Move the core loops into module-level helpers.
255
        """Return annotated fulltext for the given key.
256
257
        :param key: A tuple defining the text to annotate
258
        :return: ([annotations], [lines])
259
            annotations is a list of tuples of keys, one for each line in lines
260
                        each key is a possible source for the given line.
261
            lines the text of "key" as a list of lines
262
        """
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
263
        pb = ui.ui_factory.nested_progress_bar()
264
        try:
265
            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,
266
                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.
267
        finally:
268
            pb.finished()
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
269
        try:
4454.3.3 by John Arbash Meinel
Start implementing the reannotation functionality directly.
270
            annotations = self._annotations_cache[key]
271
        except KeyError:
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
272
            raise errors.RevisionNotPresent(key, self._vf)
4454.3.8 by John Arbash Meinel
Factor out the 'get the lines to annotate' into a helper.
273
        return annotations, self._text_cache[key]
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
274
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
275
    def _get_heads_provider(self):
276
        if self._heads_provider is None:
277
            self._heads_provider = _mod_graph.KnownGraph(self._parent_map)
278
        return self._heads_provider
279
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
280
    def _resolve_annotation_tie(self, the_heads, line, tiebreaker):
281
        if tiebreaker is None:
282
            head = sorted(the_heads)[0]
283
        else:
284
            # Backwards compatibility, break up the heads into pairs and
285
            # resolve the result
286
            next_head = iter(the_heads)
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
287
            head = next(next_head)
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
288
            for possible_head in next_head:
289
                annotated_lines = ((head, line), (possible_head, line))
290
                head = tiebreaker(annotated_lines)[0]
291
        return head
292
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
293
    def annotate_flat(self, key):
294
        """Determine the single-best-revision to source for each line.
295
296
        This is meant as a compatibility thunk to how annotate() used to work.
4454.3.75 by John Arbash Meinel
Move the core loops into module-level helpers.
297
        :return: [(ann_key, line)]
298
            A list of tuples with a single annotation key for each line.
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
299
        """
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
300
        custom_tiebreaker = annotate._break_annotation_tie
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
301
        annotations, lines = self.annotate(key)
302
        out = []
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
303
        heads = self._get_heads_provider().heads
4454.3.13 by John Arbash Meinel
A bit of simplification to the annotate_flat logic.
304
        append = out.append
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
305
        for annotation, line in zip(annotations, lines):
306
            if len(annotation) == 1:
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
307
                head = annotation[0]
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
308
            else:
309
                the_heads = heads(annotation)
310
                if len(the_heads) == 1:
4454.3.73 by John Arbash Meinel
inherit from _annotator_py.Annotator in _annotator_pyx.Annotator.
311
                    for head in the_heads: break # get the item out of the set
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
312
                else:
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
313
                    head = self._resolve_annotation_tie(the_heads, line,
314
                                                        custom_tiebreaker)
315
            append((head, line))
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
316
        return out