Rev 4531: Add support for compatibility with old '_break_annotation_tie' function. in http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate
John Arbash Meinel
john at arbash-meinel.com
Wed Jul 8 18:09:08 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate
------------------------------------------------------------
revno: 4531
revision-id: john at arbash-meinel.com-20090708170903-nea7ru9bh2hdtf1w
parent: john at arbash-meinel.com-20090708154937-b0la0m1hqz39tveh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-rework-annotate
timestamp: Wed 2009-07-08 12:09:03 -0500
message:
Add support for compatibility with old '_break_annotation_tie' function.
-------------- next part --------------
=== modified file 'bzrlib/_annotator_py.py'
--- a/bzrlib/_annotator_py.py 2009-07-08 15:41:18 +0000
+++ b/bzrlib/_annotator_py.py 2009-07-08 17:09:03 +0000
@@ -16,6 +16,10 @@
"""Functionality for doing annotations in the 'optimal' way"""
+from bzrlib.lazy_import import lazy_import
+lazy_import(globals(), """
+from bzrlib import annotate # Must be lazy to avoid circular importing
+""")
from bzrlib import (
errors,
graph as _mod_graph,
@@ -266,6 +270,19 @@
self._heads_provider = _mod_graph.KnownGraph(self._parent_map)
return self._heads_provider
+ def _resolve_annotation_tie(self, the_heads, line, tiebreaker):
+ if tiebreaker is None:
+ head = sorted(the_heads)[0]
+ else:
+ # Backwards compatibility, break up the heads into pairs and
+ # resolve the result
+ next_head = iter(the_heads)
+ head = next_head.next()
+ for possible_head in next_head:
+ annotated_lines = ((head, line), (possible_head, line))
+ head = tiebreaker(annotated_lines)[0]
+ return head
+
def annotate_flat(self, key):
"""Determine the single-best-revision to source for each line.
@@ -273,6 +290,7 @@
:return: [(ann_key, line)]
A list of tuples with a single annotation key for each line.
"""
+ custom_tiebreaker = annotate._break_annotation_tie
annotations, lines = self.annotate(key)
assert len(annotations) == len(lines)
out = []
@@ -280,14 +298,13 @@
append = out.append
for annotation, line in zip(annotations, lines):
if len(annotation) == 1:
- append((annotation[0], line))
+ head = annotation[0]
else:
the_heads = heads(annotation)
if len(the_heads) == 1:
for head in the_heads: break # get the item out of the set
else:
- # We need to resolve the ambiguity, for now just pick the
- # sorted smallest
- head = sorted(the_heads)[0]
- append((head, line))
+ head = self._resolve_annotation_tie(the_heads, line,
+ custom_tiebreaker)
+ append((head, line))
return out
=== modified file 'bzrlib/_annotator_pyx.pyx'
--- a/bzrlib/_annotator_pyx.pyx 2009-07-08 15:49:37 +0000
+++ b/bzrlib/_annotator_pyx.pyx 2009-07-08 17:09:03 +0000
@@ -261,8 +261,11 @@
This is meant as a compatibility thunk to how annotate() used to work.
"""
cdef Py_ssize_t pos, num_lines
+
+ from bzrlib import annotate
+
+ custom_tiebreaker = annotate._break_annotation_tie
annotations, lines = self.annotate(key)
- assert len(annotations) == len(lines)
num_lines = len(lines)
out = []
heads = self._get_heads_provider().heads
@@ -278,6 +281,7 @@
else:
# We need to resolve the ambiguity, for now just pick the
# sorted smallest
- head = sorted(the_heads)[0]
+ head = self._resolve_annotation_tie(the_heads, line,
+ custom_tiebreaker)
PyList_Append(out, (head, line))
return out
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py 2009-06-24 20:44:46 +0000
+++ b/bzrlib/annotate.py 2009-07-08 17:09:03 +0000
@@ -313,7 +313,9 @@
return matcher.get_matching_blocks()
-def _break_annotation_tie(annotated_lines):
+_break_annotation_tie = None
+
+def _old_break_annotation_tie(annotated_lines):
"""Chose an attribution between several possible ones.
:param annotated_lines: A list of tuples ((file_id, rev_id), line) where
@@ -394,7 +396,11 @@
# If the result is not stable, there is a risk a
# performance degradation as criss-cross merges will
# flip-flop the attribution.
- output_append(_break_annotation_tie([left, right]))
+ if _break_annotation_tie is None:
+ output_append(
+ _old_break_annotation_tie([left, right]))
+ else:
+ output_append(_break_annotation_tie([left, right]))
last_child_idx = child_idx + match_len
=== modified file 'bzrlib/tests/test__annotator.py'
--- a/bzrlib/tests/test__annotator.py 2009-07-06 20:25:29 +0000
+++ b/bzrlib/tests/test__annotator.py 2009-07-08 17:09:03 +0000
@@ -17,6 +17,7 @@
"""Tests for Annotators."""
from bzrlib import (
+ annotate,
_annotator_py,
errors,
knit,
@@ -230,6 +231,35 @@
(self.fb_key, 'new content\n')],
self.ann.annotate_flat(self.ff_key))
+ def test_annotate_flat_respects_break_ann_tie(self):
+ tiebreaker = annotate._break_annotation_tie
+ try:
+ calls = []
+ def custom_tiebreaker(annotated_lines):
+ self.assertEqual(2, len(annotated_lines))
+ left = annotated_lines[0]
+ self.assertEqual(2, len(left))
+ self.assertEqual('new content\n', left[1])
+ right = annotated_lines[1]
+ self.assertEqual(2, len(right))
+ self.assertEqual('new content\n', right[1])
+ calls.append((left[0], right[0]))
+ # Our custom tiebreaker takes the *largest* value, rather than
+ # the *smallest* value
+ if left[0] < right[0]:
+ return right
+ else:
+ return left
+ annotate._break_annotation_tie = custom_tiebreaker
+ self.make_many_way_common_merge_text()
+ self.assertEqual([(self.fa_key, 'simple\n'),
+ (self.fe_key, 'new content\n')],
+ self.ann.annotate_flat(self.ff_key))
+ self.assertEqual([(self.fe_key, self.fc_key),
+ (self.fe_key, self.fb_key)], calls)
+ finally:
+ annotate._break_annotation_tie = tiebreaker
+
def test_needed_keys_simple(self):
self.make_simple_text()
More information about the bazaar-commits
mailing list