/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2245.3.2 by John Arbash Meinel
Cleanup according to Wouter's suggestions.
1
# Copyright (C) 2004, 2005, 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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:
20
# 
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
26
# e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
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
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
31
from bzrlib import (
32
    errors,
2593.1.3 by Adeodato Simó
Cope with to_file.encoding being None or not present.
33
    osutils,
1551.9.19 by Aaron Bentley
Merge from bzr.dev
34
    patiencediff,
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
35
    tsort,
36
    )
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
37
from bzrlib.config import extract_email_address
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
38
from bzrlib.revision import CURRENT_REVISION, Revision
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
39
40
41
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.
42
                  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.
43
    """Annotate file_id at revision rev_id in branch.
44
45
    The branch should already be read_locked() when annotate_file is called.
46
47
    :param branch: The branch to look for revision numbers and history from.
48
    :param rev_id: The revision id to annotate.
49
    :param file_id: The file_id to annotate.
50
    :param verbose: Show all details rather than truncating to ensure
51
        reasonable text width.
52
    :param full: XXXX Not sure what this does.
53
    :param to_file: The file to output the annotation to; if None stdout is
54
        used.
55
    :param show_ids: Show revision ids in the annotation output.
56
    """
1385 by Martin Pool
- simple weave-based annotate code (not complete)
57
    if to_file is None:
58
        to_file = sys.stdout
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
59
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
60
    # Handle the show_ids case
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
61
    annotations = _annotations(branch.repository, file_id, rev_id)
62
    if show_ids:
63
        return _show_id_annotations(annotations, to_file, full)
64
65
    # Calculate the lengths of the various columns
66
    annotation = list(_expand_annotations(annotations, branch))
67
    _print_annotations(annotation, verbose, to_file, full)
68
69
70
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
71
    show_ids=False):
72
    """Annotate file_id in a tree.
73
74
    The tree should already be read_locked() when annotate_file_tree is called.
75
76
    :param tree: The tree to look for revision numbers and history from.
77
    :param file_id: The file_id to annotate.
78
    :param to_file: The file to output the annotation to.
79
    :param verbose: Show all details rather than truncating to ensure
80
        reasonable text width.
81
    :param full: XXXX Not sure what this does.
82
    :param show_ids: Show revision ids in the annotation output.
83
    """
84
    rev_id = tree.last_revision()
85
    branch = tree.branch
86
87
    # Handle the show_ids case
88
    annotations = list(tree.annotate_iter(file_id))
89
    if show_ids:
90
        return _show_id_annotations(annotations, to_file, full)
91
92
    # Calculate the lengths of the various columns
93
    current_rev = Revision(CURRENT_REVISION)
94
    current_rev.parent_ids = tree.get_parent_ids()
95
    current_rev.committer = tree.branch.get_config().username()
96
    current_rev.message = "?"
97
    current_rev.timestamp = round(time.time(), 3)
98
    current_rev.timezone = osutils.local_time_offset()
99
    # Should get pending tags/fixes etc - pending commit attributes.
100
    annotation = list(_expand_annotations(annotations, tree.branch,
101
        current_rev))
102
    _print_annotations(annotation, verbose, to_file, full)
103
104
105
def _print_annotations(annotation, verbose, to_file, full):
106
    """Print annotations to to_file.
107
108
    :param to_file: The file to output the annotation to.
109
    :param verbose: Show all details rather than truncating to ensure
110
        reasonable text width.
111
    :param full: XXXX Not sure what this does.
112
    """
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
113
    if len(annotation) == 0:
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
114
        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
115
    else:
2182.3.8 by John Arbash Meinel
Some cleanup to make annotate.py < 79 chars wide.
116
        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.
117
        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
118
        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
119
    if not verbose:
2182.3.7 by John Arbash Meinel
Cleanup and add blackbox tests for annotate.
120
        max_revno_len = min(max_revno_len, 12)
121
    max_revno_len = max(max_revno_len, 3)
2182.3.2 by John Arbash Meinel
Use shortened revnos unless --long is supplied
122
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
123
    # Output the annotations
124
    prevanno = ''
125
    encoding = getattr(to_file, 'encoding', None) or \
126
            osutils.get_terminal_encoding()
2182.3.4 by John Arbash Meinel
add show-ids and test that nearby areas are collapsed without full
127
    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
128
        if verbose:
129
            anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
130
                                       max_origin_len, author, date_str)
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
131
        else:
2182.3.9 by John Arbash Meinel
Faster annotate --show-ids. No need to pull the history or the revision info
132
            if len(revno_str) > max_revno_len:
133
                revno_str = revno_str[:max_revno_len-1] + '>'
134
            anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
135
        if anno.lstrip() == "" and full:
136
            anno = prevanno
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
137
        try:
138
            to_file.write(anno)
139
        except UnicodeEncodeError:
2593.1.4 by Adeodato Simó
Add comment from John to the try/except block.
140
            # cmd_annotate should be passing in an 'exact' object, which means
141
            # we have a direct handle to sys.stdout or equivalent. It may not
142
            # be able to handle the exact Unicode characters, but 'annotate' is
143
            # a user function (non-scripting), so shouldn't die because of
144
            # unrepresentable annotation characters. So encode using 'replace',
145
            # and write them again.
2593.1.3 by Adeodato Simó
Cope with to_file.encoding being None or not present.
146
            to_file.write(anno.encode(encoding, 'replace'))
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
147
        to_file.write('| %s\n' % (text,))
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
148
        prevanno = anno
149
150
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
151
def _show_id_annotations(annotations, to_file, full):
152
    last_rev_id = None
153
    max_origin_len = max(len(origin) for origin, text in annotations)
154
    for origin, text in annotations:
155
        if full or last_rev_id != origin:
156
            this = origin
157
        else:
158
            this = ''
159
        to_file.write('%*s | %s' % (max_origin_len, this, text))
160
        last_rev_id = origin
161
    return
162
163
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
164
def _annotations(repo, file_id, rev_id):
3350.6.10 by Martin Pool
VersionedFiles review cleanups
165
    """Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
166
    annotations = repo.texts.annotate((file_id, rev_id))
3350.6.10 by Martin Pool
VersionedFiles review cleanups
167
    # 
168
    return [(key[-1], line) for (key, line) in annotations]
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
169
2182.3.10 by John Arbash Meinel
minor cleanup.
170
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
171
def _expand_annotations(annotations, branch, current_rev=None):
172
    """Expand a a files annotations into command line UI ready tuples.
173
174
    Each tuple includes detailed information, such as the author name, and date
175
    string for the commit, rather than just the revision id.
176
177
    :param annotations: The annotations to expand.
178
    :param revision_id_to_revno: A map from id to revision numbers.
179
    :param branch: A locked branch to query for revision details.
2182.3.10 by John Arbash Meinel
minor cleanup.
180
    """
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
181
    repository = branch.repository
2418.5.8 by John Arbash Meinel
Update annotate.py to use the new helper function.
182
    revision_id_to_revno = branch.get_revision_id_to_revno_map()
1385 by Martin Pool
- simple weave-based annotate code (not complete)
183
    last_origin = None
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
184
    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.
185
    revisions = {}
186
    if CURRENT_REVISION in revision_ids:
187
        revision_id_to_revno[CURRENT_REVISION] = (
188
            "%d?" % (branch.revno() + 1),)
189
        revisions[CURRENT_REVISION] = current_rev
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
190
    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.
191
                    repository.has_revision(o)]
192
    revisions.update((r.revision_id, r) for r in 
193
                     repository.get_revisions(revision_ids))
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
194
    for origin, text in annotations:
1385 by Martin Pool
- simple weave-based annotate code (not complete)
195
        text = text.rstrip('\r\n')
196
        if origin == last_origin:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
197
            (revno_str, author, date_str) = ('','','')
1385 by Martin Pool
- simple weave-based annotate code (not complete)
198
        else:
199
            last_origin = origin
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
200
            if origin not in revisions:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
201
                (revno_str, author, date_str) = ('?','?','?')
1185.16.1 by Martin Pool
- update annotate for new branch api
202
            else:
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
203
                revno_str = '.'.join(str(i) for i in
204
                                            revision_id_to_revno[origin])
1551.9.6 by Aaron Bentley
Optimize annotate by retrieving all revisions at once
205
            rev = revisions[origin]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
206
            tz = rev.timezone or 0
2182.3.8 by John Arbash Meinel
Some cleanup to make annotate.py < 79 chars wide.
207
            date_str = time.strftime('%Y%m%d',
1185.16.32 by Martin Pool
- add a basic annotate built-in command
208
                                     time.gmtime(rev.timestamp + tz))
209
            # a lazy way to get something like the email address
210
            # TODO: Get real email address
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
211
            author = rev.get_apparent_author()
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
212
            try:
213
                author = extract_email_address(author)
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
214
            except errors.NoEmailInUsername:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
215
                pass        # use the whole name
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
216
        yield (revno_str, author, date_str, origin, text)
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
217
218
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
219
def reannotate(parents_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
220
               _left_matching_blocks=None,
221
               heads_provider=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
222
    """Create a new annotated version from new lines and parent annotations.
223
    
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
224
    :param parents_lines: List of annotated lines for all parents
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
225
    :param new_lines: The un-annotated new lines
226
    :param new_revision_id: The revision-id to associate with new lines
227
        (will often be CURRENT_REVISION)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
228
    :param left_matching_blocks: a hint about which areas are common
229
        between the text and its left-hand-parent.  The format is
3224.1.3 by John Arbash Meinel
Clarify the format of 'matching_blocks'
230
        the SequenceMatcher.get_matching_blocks format
231
        (start_left, start_right, length_of_match).
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
232
    :param heads_provider: An object which provids a .heads() call to resolve
233
        if any revision ids are children of others.
234
        If None, then any ancestry disputes will be resolved with
235
        new_revision_id
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
236
    """
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
237
    if len(parents_lines) == 0:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
238
        lines = [(new_revision_id, line) for line in new_lines]
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
239
    elif len(parents_lines) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
240
        lines = _reannotate(parents_lines[0], new_lines, new_revision_id,
241
                            _left_matching_blocks)
242
    elif len(parents_lines) == 2:
243
        left = _reannotate(parents_lines[0], new_lines, new_revision_id,
244
                           _left_matching_blocks)
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
245
        lines = _reannotate_annotated(parents_lines[1], new_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
246
                                      new_revision_id, left,
247
                                      heads_provider)
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
248
    else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
249
        reannotations = [_reannotate(parents_lines[0], new_lines,
250
                                     new_revision_id, _left_matching_blocks)]
251
        reannotations.extend(_reannotate(p, new_lines, new_revision_id)
252
                             for p in parents_lines[1:])
253
        lines = []
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
254
        for annos in zip(*reannotations):
255
            origins = set(a for a, l in annos)
256
            if len(origins) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
257
                # All the parents agree, so just return the first one
258
                lines.append(annos[0])
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
259
            else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
260
                line = annos[0][1]
261
                if len(origins) == 2 and new_revision_id in origins:
262
                    origins.remove(new_revision_id)
263
                if len(origins) == 1:
3180.2.2 by John Arbash Meinel
Fix typo, (thanks Ian)
264
                    lines.append((origins.pop(), line))
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
265
                else:
266
                    lines.append((new_revision_id, line))
267
    return lines
1551.9.18 by Aaron Bentley
Updates from review comments
268
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
269
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
270
def _reannotate(parent_lines, new_lines, new_revision_id,
271
                matching_blocks=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
272
    new_cur = 0
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
273
    if matching_blocks is None:
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
274
        plain_parent_lines = [l for r, l in parent_lines]
275
        matcher = patiencediff.PatienceSequenceMatcher(None,
276
            plain_parent_lines, new_lines)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
277
        matching_blocks = matcher.get_matching_blocks()
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
278
    lines = []
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
279
    for i, j, n in matching_blocks:
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
280
        for line in new_lines[new_cur:j]:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
281
            lines.append((new_revision_id, line))
282
        lines.extend(parent_lines[i:i+n])
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
283
        new_cur = j + n
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
284
    return lines
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
285
286
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
287
def _get_matching_blocks(old, new):
288
    matcher = patiencediff.PatienceSequenceMatcher(None,
289
        old, new)
290
    return matcher.get_matching_blocks()
291
292
293
def _find_matching_unannotated_lines(output_lines, plain_child_lines,
294
                                     child_lines, start_child, end_child,
295
                                     right_lines, start_right, end_right,
296
                                     heads_provider, revision_id):
297
    """Find lines in plain_right_lines that match the existing lines.
298
299
    :param output_lines: Append final annotated lines to this list
300
    :param plain_child_lines: The unannotated new lines for the child text
301
    :param child_lines: Lines for the child text which have been annotated
302
        for the left parent
303
    :param start_child: Position in plain_child_lines and child_lines to start the
304
        match searching
305
    :param end_child: Last position in plain_child_lines and child_lines to search
306
        for a match
307
    :param right_lines: The annotated lines for the whole text for the right
308
        parent
309
    :param start_right: Position in right_lines to start the match
310
    :param end_right: Last position in right_lines to search for a match
311
    :param heads_provider: When parents disagree on the lineage of a line, we
312
        need to check if one side supersedes the other
313
    :param revision_id: The label to give if a line should be labeled 'tip'
314
    """
315
    output_extend = output_lines.extend
316
    output_append = output_lines.append
317
    # We need to see if any of the unannotated lines match
318
    plain_right_subset = [l for a,l in right_lines[start_right:end_right]]
319
    plain_child_subset = plain_child_lines[start_child:end_child]
320
    match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
321
322
    last_child_idx = 0
323
324
    for right_idx, child_idx, match_len in match_blocks:
325
        # All the lines that don't match are just passed along
326
        if child_idx > last_child_idx:
327
            output_extend(child_lines[start_child + last_child_idx
328
                                      :start_child + child_idx])
329
        for offset in xrange(match_len):
330
            left = child_lines[start_child+child_idx+offset]
331
            right = right_lines[start_right+right_idx+offset]
332
            if left[0] == right[0]:
333
                # The annotations match, just return the left one
334
                output_append(left)
335
            elif left[0] == revision_id:
336
                # The left parent marked this as unmatched, so let the
337
                # right parent claim it
338
                output_append(right)
339
            else:
340
                # Left and Right both claim this line
341
                if heads_provider is None:
342
                    output_append((revision_id, left[1]))
343
                else:
344
                    heads = heads_provider.heads((left[0], right[0]))
345
                    if len(heads) == 1:
346
                        output_append((iter(heads).next(), left[1]))
347
                    else:
3588.3.1 by John Arbash Meinel
Simple patch to the annotate logic to handle bug #232188
348
                        # Both claim different origins, sort lexicographically
349
                        # so that we always get a stable result.
350
                        output_append(sorted([left, right])[0])
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
351
        last_child_idx = child_idx + match_len
352
353
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
354
def _reannotate_annotated(right_parent_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
355
                          annotated_lines, heads_provider):
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
356
    """Update the annotations for a node based on another parent.
357
358
    :param right_parent_lines: A list of annotated lines for the right-hand
359
        parent.
360
    :param new_lines: The unannotated new lines.
361
    :param new_revision_id: The revision_id to attribute to lines which are not
362
        present in either parent.
363
    :param annotated_lines: A list of annotated lines. This should be the
364
        annotation of new_lines based on parents seen so far.
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
365
    :param heads_provider: When parents disagree on the lineage of a line, we
366
        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.
367
    """
3376.2.3 by Martin Pool
Updated info about assertions
368
    if len(new_lines) != len(annotated_lines):
369
        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.
370
    # First compare the newly annotated lines with the right annotated lines.
371
    # Lines which were not changed in left or right should match. This tends to
372
    # be the bulk of the lines, and they will need no further processing.
373
    lines = []
374
    lines_extend = lines.extend
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
375
    last_right_idx = 0 # The line just after the last match from the right side
376
    last_left_idx = 0
377
    matching_left_and_right = _get_matching_blocks(right_parent_lines,
378
                                                   annotated_lines)
379
    for right_idx, left_idx, match_len in matching_left_and_right:
380
        # annotated lines from last_left_idx to left_idx did not match the lines from
381
        # last_right_idx
382
        # to right_idx, the raw lines should be compared to determine what annotations
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
383
        # need to be updated
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
384
        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.
385
            # 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.
386
            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.
387
        else:
388
            # We need to see if any of the unannotated lines match
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
389
            _find_matching_unannotated_lines(lines,
390
                                             new_lines, annotated_lines,
391
                                             last_left_idx, left_idx,
392
                                             right_parent_lines,
393
                                             last_right_idx, right_idx,
394
                                             heads_provider,
395
                                             new_revision_id)
396
        last_right_idx = right_idx + match_len
397
        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.
398
        # 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.
399
        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.
400
    return lines