[meld] Remove texts from set_sequences_iter arguments



commit 9d6a6f9d8d97209c47ab5703111b780384209b5e
Author: Piotr Piastucki <the_leech users berlios de>
Date:   Tue Jul 14 18:46:47 2009 +0200

    Remove texts from set_sequences_iter arguments

 diffutil.py |    4 ++--
 filediff.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/diffutil.py b/diffutil.py
index 3da1c1a..08b8470 100644
--- a/diffutil.py
+++ b/diffutil.py
@@ -248,7 +248,7 @@ class Differ(object):
                 for c in self._auto_merge(using, texts):
                     yield c
 
-    def set_sequences_iter(self, sequences, texts):
+    def set_sequences_iter(self, sequences):
         assert 0 <= len(sequences) <= 3
         self.diffs = [[], []]
         self.num_sequences = len(sequences)
@@ -260,6 +260,6 @@ class Differ(object):
             while work.next() == None:
                 yield None
             self.diffs[i] = matcher.get_difference_opcodes()
-        self._update_merge_cache(texts)
+        self._update_merge_cache(sequences)
         yield 1
 
diff --git a/filediff.py b/filediff.py
index 5e9441b..acc1546 100644
--- a/filediff.py
+++ b/filediff.py
@@ -591,7 +591,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         yield _("[%s] Computing differences") % self.label_text
         panetext = [self._filter_text(p) for p in panetext]
         lines = map(lambda x: x.split("\n"), panetext)
-        step = self.linediffer.set_sequences_iter(lines, self._get_texts())
+        step = self.linediffer.set_sequences_iter(lines)
         while step.next() == None:
             yield 1
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]