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