/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) 2005-2010 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1385 by Martin Pool
- simple weave-based annotate code (not complete)
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:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
20
#
1185.16.8 by Martin Pool
doc
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
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.
1185.16.57 by Martin Pool
[merge] from aaron
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
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.
31
from bzrlib.lazy_import import lazy_import
32
lazy_import(globals(), """
33
from bzrlib import (
34
    patiencediff,
35
    tsort,
36
    )
37
""")
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
38
from bzrlib import (
39
    errors,
2593.1.3 by Adeodato Simó
Cope with to_file.encoding being None or not present.
40
    osutils,
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
41
    )
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
42
from bzrlib.config import extract_email_address
3603.4.3 by Robert Collins
Review feedback.
43
from bzrlib.repository import _strip_NULL_ghosts
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
44
from bzrlib.revision import CURRENT_REVISION, Revision
5815.3.5 by Jelmer Vernooij
Update NEWS.
45
from bzrlib.symbol_versioning import (
46
    deprecated_function,
47
    deprecated_in,
48
    )
49
50
51
@deprecated_function(deprecated_in((2, 4, 0)))
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
52
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
53
                  to_file=None, show_ids=False):
3010.1.1 by Robert Collins
Lock the tree's used to test annotate_file, and add a docstring for annotate_file explaining its needs.
54
    """Annotate file_id at revision rev_id in branch.
55
56
    The branch should already be read_locked() when annotate_file is called.
57
58
    :param branch: The branch to look for revision numbers and history from.
59
    :param rev_id: The revision id to annotate.
60
    :param file_id: The file_id to annotate.
61
    :param verbose: Show all details rather than truncating to ensure
62
        reasonable text width.
63
    :param full: XXXX Not sure what this does.
64
    :param to_file: The file to output the annotation to; if None stdout is
65
        used.
66
    :param show_ids: Show revision ids in the annotation output.
67
    """
5815.3.6 by Jelmer Vernooij
Refactor annotate_file to be implemented on top of annotate_file_revision_tree.
68
    tree = branch.repository.revision_tree(rev_id)
69
    annotate_file_revision_tree(tree, file_id, to_file, verbose=verbose,
70
        full=full, show_ids=show_ids, branch=branch)
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
71
72
5815.3.1 by Jelmer Vernooij
Add annotate_file_revision_tree.
73
def annotate_file_revision_tree(tree, file_id, to_file, verbose=False,
74
    full=False, show_ids=False, branch=None):
75
    """Annotate file_id in a revision tree.
76
77
    :param tree: The tree to look for revision numbers and history from.
78
    :param file_id: The file_id to annotate.
79
    :param to_file: The file to output the annotation to.
80
    :param verbose: Show all details rather than truncating to ensure
81
        reasonable text width.
82
    :param full: XXXX Not sure what this does.
83
    :param show_ids: Show revision ids in the annotation output.
84
    :param branch: Branch to use for revno lookups.
85
    """
5815.3.3 by Jelmer Vernooij
inline annotate_file.
86
    if to_file is None:
87
        to_file = sys.stdout
88
89
    # Handle the show_ids case
5815.3.4 by Jelmer Vernooij
Use tree.annotate_iter.
90
    annotations = list(tree.annotate_iter(file_id))
5815.3.3 by Jelmer Vernooij
inline annotate_file.
91
    if show_ids:
92
        return _show_id_annotations(annotations, to_file, full)
93
94
    # Calculate the lengths of the various columns
95
    annotation = list(_expand_annotations(annotations, branch))
96
    _print_annotations(annotation, verbose, to_file, full)
5815.3.1 by Jelmer Vernooij
Add annotate_file_revision_tree.
97
98
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
99
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
100
    show_ids=False):
101
    """Annotate file_id in a tree.
102
103
    The tree should already be read_locked() when annotate_file_tree is called.
104
105
    :param tree: The tree to look for revision numbers and history from.
106
    :param file_id: The file_id to annotate.
107
    :param to_file: The file to output the annotation to.
108
    :param verbose: Show all details rather than truncating to ensure
109
        reasonable text width.
110
    :param full: XXXX Not sure what this does.
111
    :param show_ids: Show revision ids in the annotation output.
112
    """
113
    # Handle the show_ids case
114
    annotations = list(tree.annotate_iter(file_id))
115
    if show_ids:
116
        return _show_id_annotations(annotations, to_file, full)
117
3603.4.3 by Robert Collins
Review feedback.
118
    # Create a virtual revision to represent the current tree state.
119
    # Should get some more pending commit attributes, like pending tags,
120
    # bugfixes etc.
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
121
    current_rev = Revision(CURRENT_REVISION)
122
    current_rev.parent_ids = tree.get_parent_ids()
123
    current_rev.committer = tree.branch.get_config().username()
124
    current_rev.message = "?"
125
    current_rev.timestamp = round(time.time(), 3)
126
    current_rev.timezone = osutils.local_time_offset()
127
    annotation = list(_expand_annotations(annotations, tree.branch,
128
        current_rev))
129
    _print_annotations(annotation, verbose, to_file, full)
130
131
132
def _print_annotations(annotation, verbose, to_file, full):
133
    """Print annotations to to_file.
134
135
    :param to_file: The file to output the annotation to.
136
    :param verbose: Show all details rather than truncating to ensure
137
        reasonable text width.
138
    :param full: XXXX Not sure what this does.
139
    """
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
140
    if len(annotation) == 0:
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
141
        max_origin_len = max_revno_len = max_revid_len = 0
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
142
    else:
2182.3.8 by John Arbash Meinel
Some cleanup to make annotate.py < 79 chars wide.
143
        max_origin_len = max(len(x[1]) for x in annotation)
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
144
        max_revno_len = max(len(x[0]) for x in annotation)
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
145
        max_revid_len = max(len(x[3]) for x in annotation)
2182.3.2 by John Arbash Meinel
Use shortened revnos unless --long is supplied
146
    if not verbose:
2182.3.7 by John Arbash Meinel
Cleanup and add blackbox tests for annotate.
147
        max_revno_len = min(max_revno_len, 12)
148
    max_revno_len = max(max_revno_len, 3)
2182.3.2 by John Arbash Meinel
Use shortened revnos unless --long is supplied
149
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
150
    # Output the annotations
151
    prevanno = ''
152
    encoding = getattr(to_file, 'encoding', None) or \
153
            osutils.get_terminal_encoding()
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
154
    for (revno_str, author, date_str, line_rev_id, text) in annotation:
2182.3.9 by John Arbash Meinel
Faster annotate --show-ids. No need to pull the history or the revision info
155
        if verbose:
156
            anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
157
                                       max_origin_len, author, date_str)
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
158
        else:
2182.3.9 by John Arbash Meinel
Faster annotate --show-ids. No need to pull the history or the revision info
159
            if len(revno_str) > max_revno_len:
160
                revno_str = revno_str[:max_revno_len-1] + '>'
161
            anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
162
        if anno.lstrip() == "" and full:
163
            anno = prevanno
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
164
        try:
165
            to_file.write(anno)
166
        except UnicodeEncodeError:
2593.1.4 by Adeodato Simó
Add comment from John to the try/except block.
167
            # cmd_annotate should be passing in an 'exact' object, which means
168
            # we have a direct handle to sys.stdout or equivalent. It may not
169
            # be able to handle the exact Unicode characters, but 'annotate' is
170
            # a user function (non-scripting), so shouldn't die because of
171
            # unrepresentable annotation characters. So encode using 'replace',
172
            # and write them again.
2593.1.3 by Adeodato Simó
Cope with to_file.encoding being None or not present.
173
            to_file.write(anno.encode(encoding, 'replace'))
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
174
        to_file.write('| %s\n' % (text,))
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
175
        prevanno = anno
176
177
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
178
def _show_id_annotations(annotations, to_file, full):
3960.1.2 by Vincent Ladeuil
Don't outsmart original author !
179
    if not annotations:
180
        return
181
    last_rev_id = None
182
    max_origin_len = max(len(origin) for origin, text in annotations)
183
    for origin, text in annotations:
184
        if full or last_rev_id != origin:
185
            this = origin
186
        else:
187
            this = ''
188
        to_file.write('%*s | %s' % (max_origin_len, this, text))
3960.1.3 by Vincent Ladeuil
Damn gremlin.
189
        last_rev_id = origin
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
190
    return
191
192
193
def _expand_annotations(annotations, branch, current_rev=None):
4031.3.1 by Frank Aspell
Fixing various typos
194
    """Expand a file's annotations into command line UI ready tuples.
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
195
196
    Each tuple includes detailed information, such as the author name, and date
197
    string for the commit, rather than just the revision id.
198
199
    :param annotations: The annotations to expand.
200
    :param revision_id_to_revno: A map from id to revision numbers.
201
    :param branch: A locked branch to query for revision details.
2182.3.10 by John Arbash Meinel
minor cleanup.
202
    """
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
203
    repository = branch.repository
3603.4.3 by Robert Collins
Review feedback.
204
    if current_rev is not None:
205
        # This can probably become a function on MutableTree, get_revno_map there,
206
        # or something.
207
        last_revision = current_rev.revision_id
208
        # XXX: Partially Cloned from branch, uses the old_get_graph, eep.
4593.5.31 by John Arbash Meinel
Fix bzrlib.missing to not directly load the graph, etc.
209
        # XXX: The main difficulty is that we need to inject a single new node
210
        #      (current_rev) into the graph before it gets numbered, etc.
211
        #      Once KnownGraph gets an 'add_node()' function, we can use
212
        #      VF.get_known_graph_ancestry().
3603.4.3 by Robert Collins
Review feedback.
213
        graph = repository.get_graph()
214
        revision_graph = dict(((key, value) for key, value in
215
            graph.iter_ancestry(current_rev.parent_ids) if value is not None))
216
        revision_graph = _strip_NULL_ghosts(revision_graph)
217
        revision_graph[last_revision] = current_rev.parent_ids
218
        merge_sorted_revisions = tsort.merge_sort(
219
            revision_graph,
220
            last_revision,
221
            None,
222
            generate_revno=True)
223
        revision_id_to_revno = dict((rev_id, revno)
224
            for seq_num, rev_id, depth, revno, end_of_merge in
225
                merge_sorted_revisions)
226
    else:
227
        revision_id_to_revno = branch.get_revision_id_to_revno_map()
1385 by Martin Pool
- simple weave-based annotate code (not complete)
228
    last_origin = None
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
229
    revision_ids = set(o for o, t in annotations)
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
230
    revisions = {}
231
    if CURRENT_REVISION in revision_ids:
232
        revision_id_to_revno[CURRENT_REVISION] = (
233
            "%d?" % (branch.revno() + 1),)
234
        revisions[CURRENT_REVISION] = current_rev
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
235
    revision_ids = [o for o in revision_ids if
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
236
                    repository.has_revision(o)]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
237
    revisions.update((r.revision_id, r) for r in
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
238
                     repository.get_revisions(revision_ids))
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
239
    for origin, text in annotations:
1385 by Martin Pool
- simple weave-based annotate code (not complete)
240
        text = text.rstrip('\r\n')
241
        if origin == last_origin:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
242
            (revno_str, author, date_str) = ('','','')
1385 by Martin Pool
- simple weave-based annotate code (not complete)
243
        else:
244
            last_origin = origin
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
245
            if origin not in revisions:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
246
                (revno_str, author, date_str) = ('?','?','?')
1185.16.1 by Martin Pool
- update annotate for new branch api
247
            else:
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
248
                revno_str = '.'.join(str(i) for i in
249
                                            revision_id_to_revno[origin])
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
250
            rev = revisions[origin]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
251
            tz = rev.timezone or 0
2182.3.8 by John Arbash Meinel
Some cleanup to make annotate.py < 79 chars wide.
252
            date_str = time.strftime('%Y%m%d',
1185.16.32 by Martin Pool
- add a basic annotate built-in command
253
                                     time.gmtime(rev.timestamp + tz))
254
            # a lazy way to get something like the email address
255
            # TODO: Get real email address
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
256
            author = rev.get_apparent_authors()[0]
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
257
            try:
258
                author = extract_email_address(author)
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
259
            except errors.NoEmailInUsername:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
260
                pass        # use the whole name
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
261
        yield (revno_str, author, date_str, origin, text)
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
262
263
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
264
def reannotate(parents_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
265
               _left_matching_blocks=None,
266
               heads_provider=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
267
    """Create a new annotated version from new lines and parent annotations.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
268
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
269
    :param parents_lines: List of annotated lines for all parents
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
270
    :param new_lines: The un-annotated new lines
271
    :param new_revision_id: The revision-id to associate with new lines
272
        (will often be CURRENT_REVISION)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
273
    :param left_matching_blocks: a hint about which areas are common
274
        between the text and its left-hand-parent.  The format is
3224.1.3 by John Arbash Meinel
Clarify the format of 'matching_blocks'
275
        the SequenceMatcher.get_matching_blocks format
276
        (start_left, start_right, length_of_match).
4031.3.1 by Frank Aspell
Fixing various typos
277
    :param heads_provider: An object which provides a .heads() call to resolve
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
278
        if any revision ids are children of others.
279
        If None, then any ancestry disputes will be resolved with
280
        new_revision_id
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
281
    """
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
282
    if len(parents_lines) == 0:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
283
        lines = [(new_revision_id, line) for line in new_lines]
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
284
    elif len(parents_lines) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
285
        lines = _reannotate(parents_lines[0], new_lines, new_revision_id,
286
                            _left_matching_blocks)
287
    elif len(parents_lines) == 2:
288
        left = _reannotate(parents_lines[0], new_lines, new_revision_id,
289
                           _left_matching_blocks)
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
290
        lines = _reannotate_annotated(parents_lines[1], new_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
291
                                      new_revision_id, left,
292
                                      heads_provider)
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
293
    else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
294
        reannotations = [_reannotate(parents_lines[0], new_lines,
295
                                     new_revision_id, _left_matching_blocks)]
296
        reannotations.extend(_reannotate(p, new_lines, new_revision_id)
297
                             for p in parents_lines[1:])
298
        lines = []
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
299
        for annos in zip(*reannotations):
300
            origins = set(a for a, l in annos)
301
            if len(origins) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
302
                # All the parents agree, so just return the first one
303
                lines.append(annos[0])
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
304
            else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
305
                line = annos[0][1]
306
                if len(origins) == 2 and new_revision_id in origins:
307
                    origins.remove(new_revision_id)
308
                if len(origins) == 1:
3180.2.2 by John Arbash Meinel
Fix typo, (thanks Ian)
309
                    lines.append((origins.pop(), line))
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
310
                else:
311
                    lines.append((new_revision_id, line))
312
    return lines
1551.9.18 by Aaron Bentley
Updates from review comments
313
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
314
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
315
def _reannotate(parent_lines, new_lines, new_revision_id,
316
                matching_blocks=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
317
    new_cur = 0
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
318
    if matching_blocks is None:
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
319
        plain_parent_lines = [l for r, l in parent_lines]
320
        matcher = patiencediff.PatienceSequenceMatcher(None,
321
            plain_parent_lines, new_lines)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
322
        matching_blocks = matcher.get_matching_blocks()
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
323
    lines = []
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
324
    for i, j, n in matching_blocks:
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
325
        for line in new_lines[new_cur:j]:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
326
            lines.append((new_revision_id, line))
327
        lines.extend(parent_lines[i:i+n])
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
328
        new_cur = j + n
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
329
    return lines
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
330
331
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
332
def _get_matching_blocks(old, new):
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.
333
    matcher = patiencediff.PatienceSequenceMatcher(None, old, new)
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
334
    return matcher.get_matching_blocks()
335
336
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
337
_break_annotation_tie = None
338
339
def _old_break_annotation_tie(annotated_lines):
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
340
    """Chose an attribution between several possible ones.
341
342
    :param annotated_lines: A list of tuples ((file_id, rev_id), line) where
343
        the lines are identical but the revids different while no parent
344
        relation exist between them
345
346
     :return : The "winning" line. This must be one with a revid that
347
         guarantees that further criss-cross merges will converge. Failing to
348
         do so have performance implications.
349
    """
350
    # sort lexicographically so that we always get a stable result.
4202.4.2 by Vincent Ladeuil
Add more explanations for _break_annotation_tie.
351
352
    # TODO: while 'sort' is the easiest (and nearly the only possible solution)
353
    # with the current implementation, chosing the oldest revision is known to
354
    # provide better results (as in matching user expectations). The most
355
    # common use case being manual cherry-pick from an already existing
356
    # revision.
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
357
    return sorted(annotated_lines)[0]
358
359
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
360
def _find_matching_unannotated_lines(output_lines, plain_child_lines,
361
                                     child_lines, start_child, end_child,
362
                                     right_lines, start_right, end_right,
363
                                     heads_provider, revision_id):
364
    """Find lines in plain_right_lines that match the existing lines.
365
366
    :param output_lines: Append final annotated lines to this list
367
    :param plain_child_lines: The unannotated new lines for the child text
368
    :param child_lines: Lines for the child text which have been annotated
369
        for the left parent
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
370
371
    :param start_child: Position in plain_child_lines and child_lines to start
372
        the match searching
373
    :param end_child: Last position in plain_child_lines and child_lines to
374
        search for a match
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
375
    :param right_lines: The annotated lines for the whole text for the right
376
        parent
377
    :param start_right: Position in right_lines to start the match
378
    :param end_right: Last position in right_lines to search for a match
379
    :param heads_provider: When parents disagree on the lineage of a line, we
380
        need to check if one side supersedes the other
381
    :param revision_id: The label to give if a line should be labeled 'tip'
382
    """
383
    output_extend = output_lines.extend
384
    output_append = output_lines.append
385
    # We need to see if any of the unannotated lines match
386
    plain_right_subset = [l for a,l in right_lines[start_right:end_right]]
387
    plain_child_subset = plain_child_lines[start_child:end_child]
388
    match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
389
390
    last_child_idx = 0
391
392
    for right_idx, child_idx, match_len in match_blocks:
393
        # All the lines that don't match are just passed along
394
        if child_idx > last_child_idx:
395
            output_extend(child_lines[start_child + last_child_idx
396
                                      :start_child + child_idx])
397
        for offset in xrange(match_len):
398
            left = child_lines[start_child+child_idx+offset]
399
            right = right_lines[start_right+right_idx+offset]
400
            if left[0] == right[0]:
401
                # The annotations match, just return the left one
402
                output_append(left)
403
            elif left[0] == revision_id:
404
                # The left parent marked this as unmatched, so let the
405
                # right parent claim it
406
                output_append(right)
407
            else:
408
                # Left and Right both claim this line
409
                if heads_provider is None:
410
                    output_append((revision_id, left[1]))
411
                else:
412
                    heads = heads_provider.heads((left[0], right[0]))
413
                    if len(heads) == 1:
414
                        output_append((iter(heads).next(), left[1]))
415
                    else:
4202.4.2 by Vincent Ladeuil
Add more explanations for _break_annotation_tie.
416
                        # Both claim different origins, get a stable result.
417
                        # If the result is not stable, there is a risk a
418
                        # performance degradation as criss-cross merges will
419
                        # flip-flop the attribution.
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
420
                        if _break_annotation_tie is None:
421
                            output_append(
422
                                _old_break_annotation_tie([left, right]))
423
                        else:
424
                            output_append(_break_annotation_tie([left, right]))
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
425
        last_child_idx = child_idx + match_len
426
427
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
428
def _reannotate_annotated(right_parent_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
429
                          annotated_lines, heads_provider):
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
430
    """Update the annotations for a node based on another parent.
431
432
    :param right_parent_lines: A list of annotated lines for the right-hand
433
        parent.
434
    :param new_lines: The unannotated new lines.
435
    :param new_revision_id: The revision_id to attribute to lines which are not
436
        present in either parent.
437
    :param annotated_lines: A list of annotated lines. This should be the
438
        annotation of new_lines based on parents seen so far.
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
439
    :param heads_provider: When parents disagree on the lineage of a line, we
440
        need to check if one side supersedes the other.
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
441
    """
3376.2.3 by Martin Pool
Updated info about assertions
442
    if len(new_lines) != len(annotated_lines):
443
        raise AssertionError("mismatched new_lines and annotated_lines")
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
444
    # First compare the newly annotated lines with the right annotated lines.
445
    # Lines which were not changed in left or right should match. This tends to
446
    # be the bulk of the lines, and they will need no further processing.
447
    lines = []
448
    lines_extend = lines.extend
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
449
    last_right_idx = 0 # The line just after the last match from the right side
450
    last_left_idx = 0
451
    matching_left_and_right = _get_matching_blocks(right_parent_lines,
452
                                                   annotated_lines)
453
    for right_idx, left_idx, match_len in matching_left_and_right:
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
454
        # annotated lines from last_left_idx to left_idx did not match the
455
        # lines from last_right_idx to right_idx, the raw lines should be
456
        # compared to determine what annotations need to be updated
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
457
        if last_right_idx == right_idx or last_left_idx == left_idx:
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
458
            # One of the sides is empty, so this is a pure insertion
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
459
            lines_extend(annotated_lines[last_left_idx:left_idx])
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
460
        else:
461
            # We need to see if any of the unannotated lines match
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
462
            _find_matching_unannotated_lines(lines,
463
                                             new_lines, annotated_lines,
464
                                             last_left_idx, left_idx,
465
                                             right_parent_lines,
466
                                             last_right_idx, right_idx,
467
                                             heads_provider,
468
                                             new_revision_id)
469
        last_right_idx = right_idx + match_len
470
        last_left_idx = left_idx + match_len
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
471
        # If left and right agree on a range, just push that into the output
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
472
        lines_extend(annotated_lines[left_idx:left_idx + match_len])
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
473
    return lines
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
474
475
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
476
try:
4454.3.55 by John Arbash Meinel
Remove some debugging counters.
477
    from bzrlib._annotator_pyx import Annotator
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
478
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
479
    osutils.failed_to_load_extension(e)
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
480
    from bzrlib._annotator_py import Annotator