Review Request 115017: Remove libdiff2 from kdevplatform and use the copy from kdesdk instead

Jeremy Whiting jpwhiting at kde.org
Mon Apr 28 22:28:27 UTC 2014


It's been ported now, check the frameworks branch of libkomparediff2 git
repo. I'm attempting to clean it up further, but it builds and it's tests
pass, so should be usable now.


On Sat, Apr 5, 2014 at 3:49 PM, Aleix Pol Gonzalez <aleixpol at kde.org> wrote:

>    This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115017/
>
> On April 5th, 2014, 8:35 p.m. UTC, *Kevin Funk* wrote:
>
> Okay. I just had a look at this and actually wanted to integrate this patch, however:
>
> @Jeremey, there's no KF5-port of libkomparediff2 yet, right? I don't see a 'frameworks' branch in libkomparediff2.git, at least.
>
>  Yes, it's not ported AFAIK.
>
>
> - Aleix
>
> On March 6th, 2014, 5:29 a.m. UTC, Jeremy Whiting wrote:
>   Review request for KDevelop.
> By Jeremy Whiting.
>
> *Updated March 6, 2014, 5:29 a.m.*
>  *Repository: * kdevplatform
> Description
>
> This completes the unification of libdiff2 by using the libdiff2 from KDE SC 4.12 in kdevplatform.
>
>   Testing
>
> It builds.
>
>   Diffs
>
>    - plugins/patchreview/CMakeLists.txt
>    (9a117a7e71e2dc9ef7fab7407a4b033ab24bf18c)
>    - plugins/patchreview/libdiff2/CMakeLists.txt
>    (88c05163602afabc81c663eb0fd0b3db882b2a3b)
>    - plugins/patchreview/libdiff2/README
>    (e75c33e45e937c223b36cdfe22caf8604a7aff39)
>    - plugins/patchreview/libdiff2/cvsdiffparser.h
>    (a642fbd383d6506ec2b159816f773e065eaaab57)
>    - plugins/patchreview/libdiff2/cvsdiffparser.cpp
>    (5b9c25d8a5f33abf16aafacd55b5b8107dadc8f2)
>    - plugins/patchreview/libdiff2/diff2export.h
>    (9d5ebf888601fe5a8ecb788d59c22b48843a13d1)
>    - plugins/patchreview/libdiff2/difference.h
>    (b3885d8f613b172bb1690d3e52475d84d11270db)
>    - plugins/patchreview/libdiff2/difference.cpp
>    (db455e210ebc8408db98947c7989c14fa4ae1de1)
>    - plugins/patchreview/libdiff2/differencestringpair.h
>    (58fbf462e413dc53cf502ee792826528b0aadc8a)
>    - plugins/patchreview/libdiff2/diffexport.h
>    (f4448d04169e14e06c2e9811b8b6c99d1d262fe7)
>    - plugins/patchreview/libdiff2/diffhunk.h
>    (53dad24a8eb791f24ce92c6c5a9fef8cf4f7e50d)
>    - plugins/patchreview/libdiff2/diffhunk.cpp
>    (be2836bb13a5299534e0bcdddda482c379790f4b)
>    - plugins/patchreview/libdiff2/diffmodel.h
>    (201768ec41362ff56a1e9da18dec88ee62aaeb93)
>    - plugins/patchreview/libdiff2/diffmodel.cpp
>    (a42e82dc5248ba4fe1f52cebde6ad8deb576b010)
>    - plugins/patchreview/libdiff2/diffmodellist.h
>    (6633456c860480bcfbe5849344ae82c17aa6434c)
>    - plugins/patchreview/libdiff2/diffmodellist.cpp
>    (d76226f03ddcde34b35295027efa9063b38b777b)
>    - plugins/patchreview/libdiff2/diffparser.h
>    (ae7dc84b16d6293fdf9729277d66f16a612de890)
>    - plugins/patchreview/libdiff2/diffparser.cpp
>    (1bd8be613dc62d022b24e0636a505a5dc8d8b466)
>    - plugins/patchreview/libdiff2/kompare.h
>    (6f55c43deb61336221d2bbaa43ae18d712732143)
>    - plugins/patchreview/libdiff2/komparemodellist.h
>    (e62b2070b946390d0869a28da3b002f103eb2a1b)
>    - plugins/patchreview/libdiff2/komparemodellist.cpp
>    (e6d283d0be83dfa57b161567d2c033dd41c27db2)
>    - plugins/patchreview/libdiff2/kompareprocess.h
>    (907d0f7667a16a97f34fd25650154217b2de93d8)
>    - plugins/patchreview/libdiff2/kompareprocess.cpp
>    (8f50925845a883a33691c95f5e125c12b94c1b7a)
>    - plugins/patchreview/libdiff2/levenshteintable.h
>    (135ce28138010bbf49660ddad3753c80b277a701)
>    - plugins/patchreview/libdiff2/marker.h
>    (cd4ac62ea943b86243f2032cf8f3819459108170)
>    - plugins/patchreview/libdiff2/parser.h
>    (04630f9d5a0be6686cf340bc833d3654d8eb1cfb)
>    - plugins/patchreview/libdiff2/parser.cpp
>    (6e4327b150712bb13d2d88118a9d4ff7aace897f)
>    - plugins/patchreview/libdiff2/parserbase.h
>    (65097744453afa73b02952cea26e8d404e3a1af9)
>    - plugins/patchreview/libdiff2/parserbase.cpp
>    (9b04b85738e1e5ae7831c635cce5fe03435a5dc1)
>    - plugins/patchreview/libdiff2/perforceparser.h
>    (ac78aa61fb391e18b942d5d8ed815caad0115535)
>    - plugins/patchreview/libdiff2/perforceparser.cpp
>    (60060332e96577557e73b98c3a1bb496a0b6ec29)
>    - plugins/patchreview/libdiff2/stringlistpair.h
>    (bdbe2b2cb4198111d5dfb946fc2c21d4217c04ca)
>    - plugins/patchreview/libdiff2/stringlistpair.cpp
>    (3ef34d2476829dc871577c9b5702a2c280d96670)
>    - plugins/patchreview/libdiff2/tests/CMakeLists.txt
>    (30e6da412507555e32ed675cf597b402fbfd6e54)
>    - plugins/patchreview/libdiff2/tests/interactivedifftest.h
>    (800a8a7f07f5d46f17744c5a9a565bfa1d8344fc)
>    - plugins/patchreview/libdiff2/tests/interactivedifftest.cpp
>    (bb0661c1691ff3c58511b82750804f435a5bcc7a)
>    - plugins/patchreview/libdiff2/tests/levenshteintest.h
>    (b648fb702a276752ab5100fb1f9cfb5a6e33fc8b)
>    - plugins/patchreview/libdiff2/tests/levenshteintest.cpp
>    (f58b9d36d1975fb49e99ea01ae80858d5d4038b2)
>    - plugins/patchreview/patchhighlighter.cpp
>    (189a8a16adb60558831f0eece500a2c60f1d3217)
>    - plugins/patchreview/patchreview.h
>    (fe3958a064500b81d7a707d7755761b32b9ba079)
>    - plugins/patchreview/patchreview.cpp
>    (664fc94a18af900295cc102324aa34906ae0c858)
>    - plugins/patchreview/patchreviewtoolview.cpp
>    (15960e9ec6d6a29595fc035eb4f59708cd17b006)
>    - plugins/patchreview/settings/diffsettings.h
>    (28fe89af5065538841c2999067de0a70010f8001)
>    - plugins/patchreview/settings/diffsettings.cpp
>    (081798d34aa6a4d951f1dfd77ad027b39aa8ba4f)
>    - plugins/patchreview/settings/settingsbase.h
>    (81c39d4384794c75cdbfa5dc99f43898e3ed7f4c)
>    - plugins/patchreview/settings/settingsbase.cpp
>    (558b379d3e6861de97757a4dd3439bc7d53f1d09)
>
> View Diff <https://git.reviewboard.kde.org/r/115017/diff/>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20140428/e18ce538/attachment-0001.html>


More information about the KDevelop-devel mailing list