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