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