[meld] Remove sequence tagging of single changes in Differ
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Remove sequence tagging of single changes in Differ
- Date: Tue, 23 Mar 2010 22:43:50 +0000 (UTC)
commit 0a66e232251ec13f4cb2c8f49ae1c23800770962
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Mar 20 13:25:41 2010 +1000
Remove sequence tagging of single changes in Differ
This tagging used to be used in ignoring blank lines, but is no longer.
meld/diffutil.py | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/meld/diffutil.py b/meld/diffutil.py
index c634f1c..be344d7 100644
--- a/meld/diffutil.py
+++ b/meld/diffutil.py
@@ -271,13 +271,10 @@ class Differ(object):
seq = textindex/2
for cs in self._merge_cache:
if cs[seq]:
- yield reverse_chunk(cs[seq]) + (1,)
+ yield reverse_chunk(cs[seq])
else:
for cs in self._merge_cache:
- if cs[0]:
- yield cs[0] + (0,)
- elif cs[1]:
- yield cs[1] + (2,)
+ yield cs[0] or cs[1]
def sequences_identical(self):
return self.diffs == [[], []]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]