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