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