/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 (
2593.1.3 by Adeodato Simó
Cope with to_file.encoding being None or not present.
41
    osutils,
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
42
    )
6737 by Jelmer Vernooij
Merge lp:~jelmer/brz/move-errors-config.
43
from .config import (
44
    NoEmailInUsername,
45
    NoWhoami,
46
    extract_email_address,
47
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
48
from .repository import _strip_NULL_ghosts
49
from .revision import (
5815.3.13 by Jelmer Vernooij
Fix some formatting.
50
    CURRENT_REVISION,
51
    Revision,
52
    )
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
53
54
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
55
def annotate_file_tree(tree, path, to_file, verbose=False, full=False,
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
56
                       show_ids=False, branch=None, file_id=None):
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
57
    """Annotate file_id in a tree.
58
59
    The tree should already be read_locked() when annotate_file_tree is called.
60
61
    :param tree: The tree to look for revision numbers and history from.
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
62
    :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.
63
    :param to_file: The file to output the annotation to.
64
    :param verbose: Show all details rather than truncating to ensure
65
        reasonable text width.
66
    :param full: XXXX Not sure what this does.
67
    :param show_ids: Show revision ids in the annotation output.
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
68
    :param file_id: The file_id to annotate (must match file path)
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
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
76
    encoding = osutils.get_terminal_encoding()
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
77
    # Handle the show_ids case
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
78
    annotations = list(tree.annotate_iter(path, file_id))
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
79
    if show_ids:
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
80
        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.
81
5815.3.15 by Jelmer Vernooij
Fix test.
82
    if not getattr(tree, "get_revision_id", False):
83
        # Create a virtual revision to represent the current tree state.
84
        # Should get some more pending commit attributes, like pending tags,
85
        # bugfixes etc.
86
        current_rev = Revision(CURRENT_REVISION)
87
        current_rev.parent_ids = tree.get_parent_ids()
5967.1.1 by Jonathan Riddell
allow for bzr annotate without whoami being set
88
        try:
6351.3.8 by Jelmer Vernooij
Use get_config_stack.
89
            current_rev.committer = branch.get_config_stack().get('email')
6737 by Jelmer Vernooij
Merge lp:~jelmer/brz/move-errors-config.
90
        except NoWhoami:
5875.3.28 by Vincent Ladeuil
Fix more test failures.
91
            current_rev.committer = 'local user'
5815.3.15 by Jelmer Vernooij
Fix test.
92
        current_rev.message = "?"
93
        current_rev.timestamp = round(time.time(), 3)
94
        current_rev.timezone = osutils.local_time_offset()
95
    else:
96
        current_rev = None
5815.3.12 by Jelmer Vernooij
Support optional branch argument to annotate_file_tree.
97
    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.
98
        current_rev))
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
99
    _print_annotations(annotation, verbose, to_file, full, encoding)
100
101
102
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.
103
    """Print annotations to to_file.
104
105
    :param to_file: The file to output the annotation to.
106
    :param verbose: Show all details rather than truncating to ensure
107
        reasonable text width.
108
    :param full: XXXX Not sure what this does.
109
    """
2027.3.1 by John Arbash Meinel
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
110
    if len(annotation) == 0:
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
111
        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
112
    else:
2182.3.8 by John Arbash Meinel
Some cleanup to make annotate.py < 79 chars wide.
113
        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.
114
        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
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:
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
127
                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
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)
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
134
        to_file.write('| %s\n' % (text.decode(encoding),))
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
135
        prevanno = anno
136
137
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
138
def _show_id_annotations(annotations, to_file, full, encoding):
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:
7045.1.11 by Jelmer Vernooij
Some annotate fixes.
147
            this = b''
148
        to_file.write('%*s | %s' % (max_origin_len, this.decode('utf-8'),
149
            text.decode(encoding)))
3960.1.3 by Vincent Ladeuil
Damn gremlin.
150
        last_rev_id = origin
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
151
    return
152
153
154
def _expand_annotations(annotations, branch, current_rev=None):
4031.3.1 by Frank Aspell
Fixing various typos
155
    """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.
156
157
    Each tuple includes detailed information, such as the author name, and date
158
    string for the commit, rather than just the revision id.
159
160
    :param annotations: The annotations to expand.
161
    :param revision_id_to_revno: A map from id to revision numbers.
162
    :param branch: A locked branch to query for revision details.
2182.3.10 by John Arbash Meinel
minor cleanup.
163
    """
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
164
    repository = branch.repository
6997.7.5 by Jelmer Vernooij
Add comments.
165
    revision_ids = set(o for o, t in annotations)
3603.4.3 by Robert Collins
Review feedback.
166
    if current_rev is not None:
5815.3.13 by Jelmer Vernooij
Fix some formatting.
167
        # This can probably become a function on MutableTree, get_revno_map
168
        # there, or something.
3603.4.3 by Robert Collins
Review feedback.
169
        last_revision = current_rev.revision_id
170
        # 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.
171
        # XXX: The main difficulty is that we need to inject a single new node
172
        #      (current_rev) into the graph before it gets numbered, etc.
173
        #      Once KnownGraph gets an 'add_node()' function, we can use
174
        #      VF.get_known_graph_ancestry().
3603.4.3 by Robert Collins
Review feedback.
175
        graph = repository.get_graph()
176
        revision_graph = dict(((key, value) for key, value in
177
            graph.iter_ancestry(current_rev.parent_ids) if value is not None))
178
        revision_graph = _strip_NULL_ghosts(revision_graph)
179
        revision_graph[last_revision] = current_rev.parent_ids
180
        merge_sorted_revisions = tsort.merge_sort(
181
            revision_graph,
182
            last_revision,
183
            None,
184
            generate_revno=True)
185
        revision_id_to_revno = dict((rev_id, revno)
186
            for seq_num, rev_id, depth, revno, end_of_merge in
187
                merge_sorted_revisions)
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(
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:
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
212
                revno_str = '.'.join(str(i) for i in
213
                                            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]
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
221
            try:
222
                author = extract_email_address(author)
6737 by Jelmer Vernooij
Merge lp:~jelmer/brz/move-errors-config.
223
            except NoEmailInUsername:
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
224
                pass        # use the whole name
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
225
        yield (revno_str, author, date_str, origin, text)
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
226
227
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
228
def reannotate(parents_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
229
               _left_matching_blocks=None,
230
               heads_provider=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
231
    """Create a new annotated version from new lines and parent annotations.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
232
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
233
    :param parents_lines: List of annotated lines for all parents
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
234
    :param new_lines: The un-annotated new lines
235
    :param new_revision_id: The revision-id to associate with new lines
236
        (will often be CURRENT_REVISION)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
237
    :param left_matching_blocks: a hint about which areas are common
238
        between the text and its left-hand-parent.  The format is
3224.1.3 by John Arbash Meinel
Clarify the format of 'matching_blocks'
239
        the SequenceMatcher.get_matching_blocks format
240
        (start_left, start_right, length_of_match).
4031.3.1 by Frank Aspell
Fixing various typos
241
    :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.
242
        if any revision ids are children of others.
243
        If None, then any ancestry disputes will be resolved with
244
        new_revision_id
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
245
    """
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
246
    if len(parents_lines) == 0:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
247
        lines = [(new_revision_id, line) for line in new_lines]
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
248
    elif len(parents_lines) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
249
        lines = _reannotate(parents_lines[0], new_lines, new_revision_id,
250
                            _left_matching_blocks)
251
    elif len(parents_lines) == 2:
252
        left = _reannotate(parents_lines[0], new_lines, new_revision_id,
253
                           _left_matching_blocks)
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
254
        lines = _reannotate_annotated(parents_lines[1], new_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
255
                                      new_revision_id, left,
256
                                      heads_provider)
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
257
    else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
258
        reannotations = [_reannotate(parents_lines[0], new_lines,
259
                                     new_revision_id, _left_matching_blocks)]
260
        reannotations.extend(_reannotate(p, new_lines, new_revision_id)
261
                             for p in parents_lines[1:])
262
        lines = []
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
263
        for annos in zip(*reannotations):
264
            origins = set(a for a, l in annos)
265
            if len(origins) == 1:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
266
                # All the parents agree, so just return the first one
267
                lines.append(annos[0])
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
268
            else:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
269
                line = annos[0][1]
270
                if len(origins) == 2 and new_revision_id in origins:
271
                    origins.remove(new_revision_id)
272
                if len(origins) == 1:
3180.2.2 by John Arbash Meinel
Fix typo, (thanks Ian)
273
                    lines.append((origins.pop(), line))
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
274
                else:
275
                    lines.append((new_revision_id, line))
276
    return lines
1551.9.18 by Aaron Bentley
Updates from review comments
277
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
278
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
279
def _reannotate(parent_lines, new_lines, new_revision_id,
280
                matching_blocks=None):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
281
    new_cur = 0
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
282
    if matching_blocks is None:
2831.3.1 by Ian Clatworthy
code cleanups for annotate.py
283
        plain_parent_lines = [l for r, l in parent_lines]
284
        matcher = patiencediff.PatienceSequenceMatcher(None,
285
            plain_parent_lines, new_lines)
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
286
        matching_blocks = matcher.get_matching_blocks()
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
287
    lines = []
2770.1.5 by Aaron Bentley
Clean up docs, test matching blocks for reannotate
288
    for i, j, n in matching_blocks:
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
289
        for line in new_lines[new_cur:j]:
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
290
            lines.append((new_revision_id, line))
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
291
        lines.extend(parent_lines[i:i + n])
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
292
        new_cur = j + n
3180.2.1 by John Arbash Meinel
Change reannotate to special case the 2-parent case.
293
    return lines
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
294
295
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
296
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.
297
    matcher = patiencediff.PatienceSequenceMatcher(None, old, new)
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
298
    return matcher.get_matching_blocks()
299
300
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
301
_break_annotation_tie = None
302
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
303
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
304
def _old_break_annotation_tie(annotated_lines):
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
305
    """Chose an attribution between several possible ones.
306
307
    :param annotated_lines: A list of tuples ((file_id, rev_id), line) where
308
        the lines are identical but the revids different while no parent
309
        relation exist between them
310
311
     :return : The "winning" line. This must be one with a revid that
312
         guarantees that further criss-cross merges will converge. Failing to
313
         do so have performance implications.
314
    """
315
    # sort lexicographically so that we always get a stable result.
4202.4.2 by Vincent Ladeuil
Add more explanations for _break_annotation_tie.
316
317
    # TODO: while 'sort' is the easiest (and nearly the only possible solution)
318
    # with the current implementation, chosing the oldest revision is known to
319
    # provide better results (as in matching user expectations). The most
320
    # common use case being manual cherry-pick from an already existing
321
    # revision.
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
322
    return sorted(annotated_lines)[0]
323
324
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
325
def _find_matching_unannotated_lines(output_lines, plain_child_lines,
326
                                     child_lines, start_child, end_child,
327
                                     right_lines, start_right, end_right,
328
                                     heads_provider, revision_id):
329
    """Find lines in plain_right_lines that match the existing lines.
330
331
    :param output_lines: Append final annotated lines to this list
332
    :param plain_child_lines: The unannotated new lines for the child text
333
    :param child_lines: Lines for the child text which have been annotated
334
        for the left parent
4202.4.1 by Vincent Ladeuil
Allow bug #348459 to be fixed externally in specific contexts.
335
336
    :param start_child: Position in plain_child_lines and child_lines to start
337
        the match searching
338
    :param end_child: Last position in plain_child_lines and child_lines to
339
        search for a match
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
340
    :param right_lines: The annotated lines for the whole text for the right
341
        parent
342
    :param start_right: Position in right_lines to start the match
343
    :param end_right: Last position in right_lines to search for a match
344
    :param heads_provider: When parents disagree on the lineage of a line, we
345
        need to check if one side supersedes the other
346
    :param revision_id: The label to give if a line should be labeled 'tip'
347
    """
348
    output_extend = output_lines.extend
349
    output_append = output_lines.append
350
    # We need to see if any of the unannotated lines match
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
351
    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.
352
    plain_child_subset = plain_child_lines[start_child:end_child]
353
    match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
354
355
    last_child_idx = 0
356
357
    for right_idx, child_idx, match_len in match_blocks:
358
        # All the lines that don't match are just passed along
359
        if child_idx > last_child_idx:
360
            output_extend(child_lines[start_child + last_child_idx
361
                                      :start_child + child_idx])
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
362
        for offset in range(match_len):
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
363
            left = child_lines[start_child+child_idx+offset]
364
            right = right_lines[start_right+right_idx+offset]
365
            if left[0] == right[0]:
366
                # The annotations match, just return the left one
367
                output_append(left)
368
            elif left[0] == revision_id:
369
                # The left parent marked this as unmatched, so let the
370
                # right parent claim it
371
                output_append(right)
372
            else:
373
                # Left and Right both claim this line
374
                if heads_provider is None:
375
                    output_append((revision_id, left[1]))
376
                else:
377
                    heads = heads_provider.heads((left[0], right[0]))
378
                    if len(heads) == 1:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
379
                        output_append((next(iter(heads)), left[1]))
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
380
                    else:
4202.4.2 by Vincent Ladeuil
Add more explanations for _break_annotation_tie.
381
                        # Both claim different origins, get a stable result.
382
                        # If the result is not stable, there is a risk a
383
                        # performance degradation as criss-cross merges will
384
                        # flip-flop the attribution.
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
385
                        if _break_annotation_tie is None:
386
                            output_append(
387
                                _old_break_annotation_tie([left, right]))
388
                        else:
389
                            output_append(_break_annotation_tie([left, right]))
3224.1.23 by John Arbash Meinel
Clean up the new function variables.
390
        last_child_idx = child_idx + match_len
391
392
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
393
def _reannotate_annotated(right_parent_lines, new_lines, new_revision_id,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
394
                          annotated_lines, heads_provider):
3224.1.9 by John Arbash Meinel
Introduce _reannotate_annotated, which updates an annotated text based on a new parent.
395
    """Update the annotations for a node based on another parent.
396
397
    :param right_parent_lines: A list of annotated lines for the right-hand
398
        parent.
399
    :param new_lines: The unannotated new lines.
400
    :param new_revision_id: The revision_id to attribute to lines which are not
401
        present in either parent.
402
    :param annotated_lines: A list of annotated lines. This should be the
403
        annotation of new_lines based on parents seen so far.
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
404
    :param heads_provider: When parents disagree on the lineage of a line, we
405
        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.
406
    """
3376.2.3 by Martin Pool
Updated info about assertions
407
    if len(new_lines) != len(annotated_lines):
408
        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.
409
    # First compare the newly annotated lines with the right annotated lines.
410
    # Lines which were not changed in left or right should match. This tends to
411
    # be the bulk of the lines, and they will need no further processing.
412
    lines = []
413
    lines_extend = lines.extend
7143.11.1 by Jelmer Vernooij
Remove some unused imports.
414
    last_right_idx = 0  # The line just after the last match from the right side
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