Hello community, here is the log from the commit of package libkomparediff2 for openSUSE:Factory checked in at 2016-05-31 12:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old) and /work/SRC/openSUSE:Factory/.libkomparediff2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2" Changes: -------- --- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes 2016-03-26 15:19:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkomparediff2.new/libkomparediff2.changes 2016-05-31 12:18:38.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:42:59 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:18:57 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:54:05 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- libkomparediff2-15.12.3.tar.xz New: ---- libkomparediff2-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkomparediff2.spec ++++++ --- /var/tmp/diff_new_pack.1cW9uv/_old 2016-05-31 12:18:39.000000000 +0200 +++ /var/tmp/diff_new_pack.1cW9uv/_new 2016-05-31 12:18:39.000000000 +0200 @@ -35,7 +35,7 @@ Summary: A library to compare files and strings License: (GPL-2.0+ and LGPL-2.0+) and BSD-2-Clause Group: Development/Libraries/KDE -Version: 15.12.3 +Version: 16.04.1 Release: 0 Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz ++++++ libkomparediff2-15.12.3.tar.xz -> libkomparediff2-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-15.12.3/CMakeLists.txt new/libkomparediff2-16.04.1/CMakeLists.txt --- old/libkomparediff2-15.12.3/CMakeLists.txt 2015-10-09 11:08:00.000000000 +0200 +++ new/libkomparediff2-16.04.1/CMakeLists.txt 2016-03-17 23:06:40.000000000 +0100 @@ -7,7 +7,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMSetupVersion) include(FeatureSummary) @@ -20,7 +20,7 @@ find_package(Qt5Test NO_MODULE) find_package(KF5 REQUIRED - CoreAddons Codecs Config XmlGui I18n KIO Parts + CoreAddons Codecs Config XmlGui I18n KIO ) set(KF5_VERSION "5.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-15.12.3/parserbase.cpp new/libkomparediff2-16.04.1/parserbase.cpp --- old/libkomparediff2-15.12.3/parserbase.cpp 2015-10-09 11:08:00.000000000 +0200 +++ new/libkomparediff2-16.04.1/parserbase.cpp 2016-03-17 23:06:40.000000000 +0100 @@ -99,7 +99,7 @@ m_normalHunkBodyRemoved.setPattern ( "< (.*)" ); m_normalHunkBodyAdded.setPattern ( "> (.*)" ); - m_normalHunkBodyDivider.setPattern ( "---" ); + m_normalHunkBodyDivider.setPattern ( "---\\n" ); m_unifiedDiffHeader1.setPattern ( "--- ([^\\t]+)(?:\\t([^\\t]+)(?:\\t?)(.*))?\\n" ); m_unifiedDiffHeader2.setPattern ( "\\+\\+\\+ ([^\\t]+)(?:\\t([^\\t]+)(?:\\t?)(.*))?\\n" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-15.12.3/tests/CMakeLists.txt new/libkomparediff2-16.04.1/tests/CMakeLists.txt --- old/libkomparediff2-15.12.3/tests/CMakeLists.txt 2015-10-09 11:08:00.000000000 +0200 +++ new/libkomparediff2-16.04.1/tests/CMakeLists.txt 2016-03-17 23:06:40.000000000 +0100 @@ -29,7 +29,6 @@ Qt5::Core Qt5::Test KF5::CoreAddons - KF5::Parts KF5::I18n KF5::XmlGui KF5::KIOCore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-15.12.3/tests/interactivedifftest.cpp new/libkomparediff2-16.04.1/tests/interactivedifftest.cpp --- old/libkomparediff2-15.12.3/tests/interactivedifftest.cpp 2015-10-09 11:08:00.000000000 +0200 +++ new/libkomparediff2-16.04.1/tests/interactivedifftest.cpp 2016-03-17 23:06:40.000000000 +0100 @@ -84,7 +84,9 @@ { QFETCH(QStringList, patch); Parser parser(0); - DiffModelList* models = parser.parse(patch); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); QCOMPARE(models->size(), 1); DiffModel* model = models->at(0); @@ -497,7 +499,9 @@ { QFETCH(QStringList, patch); Parser parser(0); - DiffModelList* models = parser.parse(patch); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); QCOMPARE(models->size(), 1); DiffModel* model = models->at(0); model->applyAllDifferences(true); @@ -641,7 +645,9 @@ "+insert6\n" << " line8\n"; Parser parser(0); - DiffModelList* models = parser.parse(patch); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); QCOMPARE(models->size(), 1); DiffModel* model = models->at(0); QCOMPARE(model->differenceCount(), 4); @@ -769,7 +775,9 @@ " m_sourceFile = m_source.mid( pos+1, m_source.length() - pos );\n" << " else\n"; Parser parser(0); - DiffModelList* models = parser.parse(patch); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); QCOMPARE(models->size(), 1); DiffModel* model = models->at(0); QCOMPARE(model->differenceCount(), 2); @@ -800,7 +808,9 @@ " m_sourceTimestamp( "" ),\n"; Parser parser(0); - DiffModelList* models = parser.parse(patch); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); QCOMPARE(models->size(), 1); DiffModel* model = models->at(0); QCOMPARE(model->differenceCount(), 1); @@ -816,4 +826,25 @@ contextDiff2(); } +void InteractiveDiffTest::testNormalDiff() +{ + QStringList patch; + patch << + "1c1\n" << + "< a\n" << + "---\n" << + "> b\n"; + Parser parser(0); + bool malformed; + DiffModelList* models = parser.parse(patch, &malformed); + QVERIFY(!malformed); + QCOMPARE(models->size(), 1); + DiffModel* model = models->at(0); + QCOMPARE(model->differenceCount(), 1); + model->applyAllDifferences(true); + QVERIFY(model->differenceAt(0)->applied()); + QCOMPARE(model->differenceAt(0)->sourceLineNumber(), 1); + QCOMPARE(model->differenceAt(0)->trackingDestinationLineNumber(), 1); +} + QTEST_GUILESS_MAIN(InteractiveDiffTest); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-15.12.3/tests/interactivedifftest.h new/libkomparediff2-16.04.1/tests/interactivedifftest.h --- old/libkomparediff2-15.12.3/tests/interactivedifftest.h 2015-10-09 11:08:00.000000000 +0200 +++ new/libkomparediff2-16.04.1/tests/interactivedifftest.h 2016-03-17 23:06:40.000000000 +0100 @@ -41,6 +41,7 @@ void testOneLineDeletionUnapplied(); void testApplyUnapply(); void testContextDiff(); + void testNormalDiff(); private: void CompareDifferenceStringList(const Diff2::DifferenceStringList& actual, const QStringList& expected); };
