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