[patch] Fix applying changes at EOF

[Piotr Piastucki-2]

Hi,

There is one more (hopefully the last one :)) issue with applying insertions at EOF that results in unexpected line concatenation.
The attached patch fixes the issue by prepending a newline character. See http://piastucki.bdl.pl/meld/apply_change_at_eof.png for a screenshot.

Cheers,
Piotr

[0001-Fix-applying-changes-at-EOF.patch]

---

From a0159bb4422cb5dc2eee64df4d74c3a338732b22 Mon Sep 17 00:00:00 2001
From: ppiastucki <ppiastucki@...>
Date: Thu, 23 Jul 2009 08:57:06 +0200
Subject: [PATCH] Fix applying changes at EOF

---
 filediff.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/filediff.py b/filediff.py
index a7aa8ae..1e77fb1 100644
--- a/filediff.py
+++ b/filediff.py
@@ -51,6 +51,11 @@ def get_iter_at_line_or_eof(buffer, line):
         return buffer.get_end_iter()
     return buffer.get_iter_at_line(line)
 
+def insert_with_tags_by_name(buffer, line, text, tag):
+ if line >= buffer.get_line_count():
+ text = "\n" + text
+ buffer.insert_with_tags_by_name(get_iter_at_line_or_eof(buffer, line), text, tag)
+
 class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
     """Two or three way diff of text files.
     """
@@ -1281,14 +1286,14 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                     elif self.keymask & MASK_CTRL: # copy up or down
                         t0 = b0.get_text( get_iter_at_line_or_eof(b0, chunk[0]), get_iter_at_line_or_eof(b0, chunk[1]), 0)
                         if event.y - rect[1] < 0.5 * rect[3]: # copy up
-                            b1.insert_with_tags_by_name(get_iter_at_line_or_eof(b1, chunk[2]), t0, "edited line")
+                            insert_with_tags_by_name(b1, chunk[2], t0, "edited line")
                         else: # copy down
-                            b1.insert_with_tags_by_name(get_iter_at_line_or_eof(b1, chunk[3]), t0, "edited line")
+                            insert_with_tags_by_name(b1, chunk[3], t0, "edited line")
                     else: # replace
                         t0 = b0.get_text( get_iter_at_line_or_eof(b0, chunk[0]), get_iter_at_line_or_eof(b0, chunk[1]), 0)
                         self.on_textbuffer__begin_user_action()
                         b1.delete(get_iter_at_line_or_eof(b1, chunk[2]), get_iter_at_line_or_eof(b1, chunk[3]))
-                        b1.insert_with_tags_by_name(get_iter_at_line_or_eof(b1, chunk[2]), t0, "edited line")
+                        insert_with_tags_by_name(b1, chunk[2], t0, "edited line")
                         self.on_textbuffer__end_user_action()
             return True
         return False
--
1.6.0.4

---

_______________________________________________
meld-list mailing list
meld-list@...
http://mail.gnome.org/mailman/listinfo/meld-list

[Kai Willadsen-2]

2009/7/23 Piotr Piastucki <leech.miranda@...>:
> Hi,
>
> There is one more (hopefully the last one :)) issue with applying insertions
> at EOF that results in unexpected line concatenation.
> The attached patch fixes the issue by prepending a newline character. See
> http://piastucki.bdl.pl/meld/apply_change_at_eof.png for a screenshot.

Thanks - committed.

Kai
_______________________________________________
meld-list mailing list
meld-list@...
http://mail.gnome.org/mailman/listinfo/meld-list