Rev 4527: Start working on supporting _break_annotation_tie. in http://bazaar.launchpad.net/~jameinel/bzr/1.17-annotate-updates

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.17-annotate-updates

------------------------------------------------------------
revno: 4527
revision-id: john at arbash-meinel.com-20090707025650-wsdth2t0qrur1hr2
parent: john at arbash-meinel.com-20090707025325-bf2s89nclg19pibu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-annotate-updates
timestamp: Mon 2009-07-06 21:56:50 -0500
message:
  Start working on supporting _break_annotation_tie.
-------------- next part --------------
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py	2009-06-24 20:44:46 +0000
+++ b/bzrlib/annotate.py	2009-07-07 02:56:50 +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:
+                            res = _old_break_annotation_tie([left, right])
+                        else:
+                            res = _break_annotation_tie([left, right])
+                        output_append(res)
         last_child_idx = child_idx + match_len