GitLab

svn path=/trunk/KDE/kdesdk/kompare/; revision=1247596

CCBUG: 269299

svn path=/trunk/KDE/kdesdk/kompare/; revision=1238160

svn path=/trunk/KDE/kdesdk/kompare/; revision=1232058

svn path=/trunk/KDE/kdesdk/kompare/; revision=1231188

svn path=/trunk/KDE/kdesdk/kompare/; revision=1230860

svn path=/trunk/KDE/kdesdk/kompare/; revision=1229858

svn path=/trunk/KDE/kdesdk/kompare/; revision=1218850

svn path=/trunk/KDE/kdesdk/kompare/; revision=1218826

Difference::trackingDestinationLineNumber property added to track changes to a diff destination line 
when pieces are applied/unapplied.

LevenshteinTable class made generic.

DiffModel::linesChanged method handles insertion/deletion of text.

Unit tests added to kompare/libdiff2 directory.

svn path=/trunk/KDE/kdesdk/kompare/; revision=1218180

svn path=/trunk/KDE/kdesdk/kompare/; revision=1203111

svn path=/trunk/KDE/kdesdk/kompare/; revision=1201885

When rendering a text with multiple lines, it is usually
recommended to use lineSpacing() instead of height().

But the KompareListView renders each line individually with
a background rect that will overwrite any overhanging pixels
from the previous line. So use height() instead.

BUG: 234291
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdesdk/kompare/; revision=1201883

svn path=/trunk/KDE/kdesdk/kompare/; revision=1199334

Make the malformed diff check more tolerant to prevent choking on SVN-generated diffs or on diffs resulting from the use of diff >>.
It could probably use a better fix than such simple whitelisting, but this should fix the annoyance for now.
Tested on Fedora 13, kdelibs 4.5.2.

BUG: 249976

svn path=/trunk/KDE/kdesdk/kompare/; revision=1193415

svn path=/trunk/KDE/kdesdk/kompare/; revision=1188906

remove whitespace after -I, this will cause diff to parse the whitespace as the parameter instead of the actual regexp. spotted by thesteo82
Merge revision 1102932 by je4d from 3_way_kompare.

(This has been sitting in the branch for 7 months! Next time, if you fix something in a work branch, please also commit the fix to the trunk and the current release branch. Thanks in advance.)

CCMAIL: jeff@caffeinated.me.uk

svn path=/trunk/KDE/kdesdk/kompare/; revision=1188291

svn path=/trunk/KDE/kdesdk/kompare/; revision=1187509

so that they can be used even from a KDE running in another prefix (http://markmail.org/message/4p3krovtnzwx35zd)

svn path=/trunk/KDE/kdesdk/kompare/; revision=1182578

svn path=/trunk/KDE/kdesdk/kompare/; revision=1174794

svn path=/trunk/KDE/kdesdk/kompare/; revision=1166703

svn path=/trunk/KDE/kdesdk/doc/kompare/; revision=1153039

svn path=/trunk/KDE/kdesdk/kompare/; revision=1145483

Patch by mangus (from bugs.kde.org attachment).
BUG: 242192
CCMAIL: aleixpol@kde.org

svn path=/trunk/KDE/kdesdk/kompare/; revision=1145313

Kompare: Detect malformed diffs and display an error message to the user in that case. Still display what we can display, but tell the user that some lines will be missing.

Tested on Fedora 12, kdelibs 4.4.2.

BUG: 235503

svn path=/trunk/KDE/kdesdk/kompare/; revision=1128360

svn path=/trunk/KDE/kdesdk/kompare/; revision=1109778

kompare/libdiff2: Restore error handling for temporary file (using QFile::error instead of the Qt3Support QIODevice::status).

svn path=/trunk/KDE/kdesdk/kompare/; revision=1109777

svn path=/trunk/KDE/kdesdk/kompare/; revision=1091912

This eases the port to the library to KDevelop4. As far as I know it just works fine. If there's any problem, please tell me.

CCMAIL: bruggie@gmail.com

svn path=/trunk/KDE/kdesdk/kompare/; revision=1091068

svn path=/trunk/KDE/kdesdk/kompare/; revision=1090835

Patch by Jakub Wieczorek <faw217@gmail.com>
Regression confirmed fixed by me (Fedora 12, KDE 4.3.5, i686).

CCMAIL: faw217@gmail.com
CCMAIL: kompare-devel@kde.org

svn path=/trunk/KDE/kdesdk/kompare/; revision=1090782

Also fixes crashes with move diffs (kde#202457).
Patch by Jakub Wieczorek <faw217@gmail.com>.

BUG: 202457
CCMAIL: faw217@gmail.com
CCMAIL: kompare-devel@kde.org

svn path=/trunk/KDE/kdesdk/kompare/; revision=1090752

CCMAIL: faw217@gmail.com
CCMAIL: kompare-devel@kde.org

svn path=/trunk/KDE/kdesdk/kompare/; revision=1090722

* use QHash instead of Q3PtrDict
* use QList instead of Q3ValueList
* remove copied BubbleSort implementation of DiffModelList::sort(), instead use qSort with a custom comparison function which ensures the correct ordering (by value, not by pointer address)
* remove some unused Qt3Support #includes
* fix a leftover reference to K3Process in a comment

CCMAIL: faw217@gmail.com
CCMAIL: kompare-devel@kde.org

svn path=/trunk/KDE/kdesdk/kompare/; revision=1090720

svn path=/trunk/KDE/kdesdk/kompare/; revision=1085569

svn path=/trunk/KDE/kdesdk/kompare/; revision=1068964

svn path=/trunk/KDE/kdesdk/kompare/; revision=1051365

CCBUG: 139209

svn path=/trunk/KDE/kdesdk/kompare/; revision=1033954

track line counts so that we don't interpret a diff header (--- file...) as a removal if there's nothing separating it from the last hunk of the previous diff.
BUG: 139209

svn path=/trunk/KDE/kdesdk/kompare/; revision=1028515

Revert the fix for bug 139209 - the fix used caused bug 208688. 139209 needs to be fixed by counting lines instead.
BUG:208688
CCBUG:139209

svn path=/trunk/KDE/kdesdk/kompare/; revision=1028512

svn path=/trunk/KDE/kdesdk/kompare/; revision=1026032