[meld] Simplify composition of the change sequences
- From: Kai Willadsen <kaiw src gnome org>
- To: svn-commits-list gnome org
- Subject: [meld] Simplify composition of the change sequences
- Date: Tue, 30 Jun 2009 08:07:17 +0000 (UTC)
commit 0061ba1cf0b3a57a8a6fd460d71a2bfbe8afd77d
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon Oct 6 20:02:01 2008 +0200
Simplify composition of the change sequences
diffutil.py | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/diffutil.py b/diffutil.py
index 9866b06..99077a6 100644
--- a/diffutil.py
+++ b/diffutil.py
@@ -149,17 +149,14 @@ class Differ(object):
if textindex in (0,2):
seq = textindex/2
for cs in self.all_changes( texts ):
- c = cs[seq]
- if c:
- yield opcode_reverse[c[0]], c[3], c[4], c[1], c[2], 1
+ if cs[seq]:
+ yield reverse_chunk(cs[seq]) + (1,)
else:
for cs in self.all_changes( texts ):
if cs[0]:
- c = cs[0]
- yield c[0], c[1], c[2], c[3], c[4], 0
+ yield cs[0] + (0,)
elif cs[1]:
- c = cs[1]
- yield c[0], c[1], c[2], c[3], c[4], 2
+ yield cs[1] + (2,)
def _merge_blocks(self, using):
LO, HI = 1,2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]