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