/brz/remove-bazaar

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