After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 578303 - Fix highliting in the last line of text
Fix highliting in the last line of text
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
git master
Other All
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2009-04-07 21:49 UTC by Piotr Piastucki
Modified: 2009-04-20 20:14 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Patch to fix highlighting (1.44 KB, patch)
2009-04-07 21:51 UTC, Piotr Piastucki
committed Details | Review
Wrong patch - see next attachment instead (611 bytes, patch)
2009-04-09 07:59 UTC, Piotr Piastucki
none Details | Review
Patch to fix change_sequence (520 bytes, patch)
2009-04-09 08:16 UTC, Piotr Piastucki
none Details | Review
Fix change_sequence() not to change sequence size twice (891 bytes, patch)
2009-04-15 09:58 UTC, Piotr Piastucki
committed Details | Review

Description Piotr Piastucki 2009-04-07 21:49:32 UTC
This patch fixes the highlighting of changes that end in the last line.
Comment 1 Piotr Piastucki 2009-04-07 21:51:01 UTC
Created attachment 132298 [details] [review]
Patch to fix highlighting
Comment 2 Piotr Piastucki 2009-04-09 07:59:25 UTC
Created attachment 132391 [details] [review]
Wrong patch - see next attachment instead

Another patch to fix the way end of file is handled. This time there was a bug in Differ that changed sequence length twice when the text in middle pane was modified.
Comment 3 Piotr Piastucki 2009-04-09 08:06:11 UTC
Comment on attachment 132391 [details] [review]
Wrong patch - see next attachment instead
Comment 4 Piotr Piastucki 2009-04-09 08:13:23 UTC
Comment on attachment 132391 [details] [review]
Wrong patch - see next attachment instead

Index: diffutil.py
===================================================================
--- diffutil.py	(revision 1329)
+++ diffutil.py	(working copy)
@@ -76,6 +76,7 @@
         else: # sequence==1:
             changes[0] = self._change_sequence(         0, sequence, startidx, sizechange, texts)
             if self.num_sequences == 3:
+                self.seqlength[sequence] -= sizechange
                 changes[1] = self._change_sequence(     1, sequence, startidx, sizechange, texts)
         return changes
Comment 5 Piotr Piastucki 2009-04-09 08:16:25 UTC
Created attachment 132392 [details] [review]
Patch to fix change_sequence

Change change_sequence so that size change is not applied twice for the middle pane.
Comment 6 Piotr Piastucki 2009-04-15 09:58:44 UTC
Created attachment 132682 [details] [review]
Fix change_sequence() not to change sequence size twice
Comment 8 Vincent Legoll 2009-04-16 23:01:02 UTC
probably
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=465804
too
Comment 9 Vincent Legoll 2009-04-16 23:11:12 UTC
and
http://bugzilla.gnome.org/show_bug.cgi?id=484177
Comment 10 Stephen Kennedy 2009-04-17 22:10:06 UTC
Thanks Piotr, thats great to have two long standing bugs solved.
Comment 11 Vincent Legoll 2009-04-20 18:55:25 UTC
Where are those patches committed, I can't see them...
Comment 12 Piotr Piastucki 2009-04-20 20:01:27 UTC
Take a look at git repository :)
Comment 13 Vincent Legoll 2009-04-20 20:14:45 UTC
WHAT ?!?

There's a git repository ?
Where is that, I can't see it advertised on meld.sf.net
web site, nor anywhere else...

I found it: http://git.gnome.org/cgit/meld

Argh, I was maintaning a huge pile of patches against
svn trunk when I could have done it with git... :-\

Thanks for the hint BTW...