252359 2010-09-25 17:55:00 +0000 Kompare could not parse some patch files 2022-10-17 05:17:15 +0000 1 1 2 Applications kompare general unspecified PiSi Linux Linux RESOLVED WORKSFORME NOR normal --- 0 gokcen.eraslan kompare-bugs-null markus.heidelberg Mathias.Homann scarpino 0 oldest_to_newest 1023999 0 51981 gokcen.eraslan 2010-09-25 17:55:00 +0000 Created attachment 51981 Patch file that kompare cannot parse Version: unspecified (using KDE 4.5.1) OS: Linux Kompare cannot parse the patch attached. Reproducible: Always Steps to Reproduce: 1. Enter command 'kompare kdelibs-kiconloader-cache_returned_pixmaps.patch' Actual Results: Kompare says 'Could not parse diff output' Expected Results: Kompare must show the patch. (Problem can be reproduced in both KDE 4.5 and 4.4. But since I have packages built with debug support only for KDE4.4, output below is from Kompare of KDE 4.4) Here is the command output: gokcen@melmac ~ $ kompare kdelibs-kiconloader-cache_returned_pixmaps.patch kompare(2004)/kdecore (trader): query for mimeType "text/x-patch" , "Kompare/ViewPart" : returning 1 offers kompare(2004)/kdecore (KLibrary): plugins should not have a 'lib' prefix: "libkomparepart.so" kompare(2004)/kompare (libs) Diff2::KompareModelList::KompareModelList: Show me the arguments: 0x8ab9368 , KompareSplitter(0x8ab8f18) , KomparePart(0x8736848) , komparemodellist kompare(2004)/kparts KParts::ReadWritePart::setModified: setModified( false ) kompare(2004)/kdecore (KLibrary): plugins should not have a 'lib' prefix: "libkomparenavtreepart.so" kompare(2004) main: Arg Count = 1 kompare(2004) main: Argument 1 : "kdelibs-kiconloader-cache_returned_pixmaps.patch" kompare(2004) main: Single file. so openDiff/openStdin is only possible... kompare(2004)/kompare (shell) KompareShell::openDiff: Url = "file:///home/gokcen/kdelibs-kiconloader-cache_returned_pixmaps.patch" kompare(2004)/kompare (part) KomparePart::openDiff: Url = "file:///home/gokcen/kdelibs-kiconloader-cache_returned_pixmaps.patch" kompare(2004)/kompare (part) KomparePart::openDiff: Download succeeded kompare(2004)/kompare (libs) Diff2::KompareModelList::openDiff: Stupid :) Url = "/home/gokcen/kdelibs-kiconloader-cache_returned_pixmaps.patch" kompare(2004)/kompare (libs) Diff2::KompareModelList::readFile: Codec = 0x0 kompare(2004)/kompare (nav view) KompareNavTreePart::slotModelsChanged: Models ( 0x0 ) have changed... scanning the models... kompare(2004)/kompare (libs) Diff2::KompareModelList::parseDiffOutput: KompareModelList::parseDiffOutput kompare(2004)/kompare (libs) Diff2::Parser::determineGenerator: Diff is a CVSDiff kompare(2004)/kompare (libs) Diff2::Parser::parse: Cleaned up 0 line(s) of crap from the diff... kompare(2004)/kompare (libs) Diff2::Parser::parse: It is a CVS generated diff... kompare(2004)/kompare (libs) Diff2::KompareModelList::parseDiffOutput: Now i'll be damned, there should be models here !!! 1024001 1 gokcen.eraslan 2010-09-25 18:00:56 +0000 Changing the summary. Now it's better. When I remove index line from the patch, kompare works fine. 1024014 2 51982 gokcen.eraslan 2010-09-25 18:43:18 +0000 Created attachment 51982 Patch file generated via SVN, makes Kompare say "This diff is malformed" This patch file is generated with command: svn di -c 1128360 svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/ > second.diff and kompare says "This diff is malformed." for that patch. Amazing thing is, the commit that makes kompare give this warning is the patch itself :) The string "This diff is malformed" is added in this commit. 1024015 3 gokcen.eraslan 2010-09-25 18:44:34 +0000 Adding kkofler to CC since those messages may be related to his commits. 1024016 4 kevin.kofler 2010-09-25 18:47:54 +0000 I'm already subscribed to kompare-devel, I don't need 2 copies of all the bug messages. ;-) 1024019 5 kevin.kofler 2010-09-25 18:55:35 +0000 So the idea behind that patch was that malformed diffs with incorrect line counts were being accepted without any complaints, and some parts of the diffs were just interpreted as comments and not shown. For example, in this testcase: http://ktown.kde.org/~fredrik/folderview.diff where the line counts "@@ -57,8 +56,10 @@" are incorrect (should be "@@ -57,8 +56,9 @@"), it was just eating the second hunk without warning. So I made that change to not just skip random junk, but complain about it. That patch will NOT make Kompare reject a patch entirely though (it'll only complain), and it's also only in 4.5, not 4.4, so this is not the patch which is causing your original bug, it's a separate issue. 1024023 6 kevin.kofler 2010-09-25 18:59:01 +0000 The cause of the original bug is ancient code which thinks that any patch from Index: line was generated by CVS. Your diff was actually generated by SVN, which must be using a subtly different format, and so it fails to parse. 1024036 7 gokcen.eraslan 2010-09-25 19:36:49 +0000 (In reply to comment #5) > So the idea behind that patch was that malformed diffs with incorrect line > counts were being accepted without any complaints, and some parts of the diffs > were just interpreted as comments and not shown. For example, in this testcase: > http://ktown.kde.org/~fredrik/folderview.diff > where the line counts "@@ -57,8 +56,10 @@" are incorrect (should be "@@ -57,8 > +56,9 @@"), it was just eating the second hunk without warning. So I made that > change to not just skip random junk, but complain about it. > > That patch will NOT make Kompare reject a patch entirely though (it'll only > complain), and it's also only in 4.5, not 4.4, so this is not the patch which > is causing your original bug, it's a separate issue. So I'll issue a new bug about the wrong "This diff output is malformed" warnings and attach the second.diff patch (second attachment of this report) to the new bug. 1024038 8 51984 gokcen.eraslan 2010-09-25 19:40:36 +0000 Created attachment 51984 Another svn-generated patch file which is shown by Kompare successfully This patch file is also generated via SVN and starts with an "Index: " line. But Kompare can show this file successfully. 1041058 9 kevin.kofler 2010-11-06 17:59:14 +0000 So the diff from comment #2 should now work, as per the fix for bug #249976. The first attached diff still fails though and I'm not sure why. 1263713 10 Mathias.Homann 2012-06-08 22:49:56 +0000 KDE 4.8.3, Kompare 4.1.1, and I still get "Malformed diff" popups, which make me wonder if I really see all the differences that I need to see... 1263714 11 Mathias.Homann 2012-06-08 22:51:21 +0000 KDE 4.8.3, Kompare 4.1.1, and I still get "Malformed diff" popups, which make me wonder if I really see all the differences that I need to see... 1466201 12 88286 markus.heidelberg 2014-08-17 22:34:10 +0000 Created attachment 88286 Fixes unified diff parsing for Aegis generated patches This patch fixes unified diff parsing for Aegis generated patches and also makes the patch in the first attachment (51981) of this bugreport work with kompare now. Example patch: aegis.sourceforge.net/cgi-bin/aeget/srecord.1.64.C15/?aepatch+compat=4.25.C681 I have changed the tab character to be optional, but it could have been ignored completely. I just kept it to not lose information. On the other hand I don't know what's the point about being so strict with diff parsing. This looks like having to run after every possible new diff format variant. It seems that there is no fallback for unknown formats, but an abort. 1466202 13 88287 markus.heidelberg 2014-08-17 22:39:07 +0000 Created attachment 88287 Unified diff file from Aegis (simplified) I have simplified an Aegis generated diff file to a minimal size because for this bug only the lines "Index: ", "--- " and "+++ " are meaningful. 1477338 14 89242 markus.heidelberg 2014-10-21 19:16:40 +0000 Created attachment 89242 regression test for unified Aegis diff 1477339 15 markus.heidelberg 2014-10-21 19:19:50 +0000 Any response? Can this simple fix be included? 1481413 16 cfeck 2014-11-16 17:43:06 +0000 Kevin, the patch in comment #12 is a one-line change, but I have no idea if it is safe to apply (or if it breaks yet another corner case). 1481515 17 kevin.kofler 2014-11-17 01:33:47 +0000 It might be good enough, but as I said in comment #6, I need to look into whether we need a specialized parser for "CVS diffs" at all, which then thinks any diff with an "Index:" line is from CVS, which is just not true. (I don't doubt that this one-character change probably fixes the mentioned test cases, but I think there are probably other assumptions in the "CVS diff" parser which are not true for those other-SCM-generated diffs.) I'll try to have a closer look this week. 2161925 18 justin.zobel 2022-10-17 00:40:50 +0000 Thank you for reporting this bug in KDE software. As it has been a while since this issue was reported, can we please ask you to see if you can reproduce the issue with a recent software version? If you can reproduce the issue, please change the status to "CONFIRMED" when replying. Thank you! 2162026 19 Mathias.Homann 2022-10-17 05:17:15 +0000 There are still cases when kompare chokes on a diff - mainly when there's non-english errors embedded in it. but that's just a question of what options to pass to the diff command. 51981 2010-09-25 17:55:00 +0000 2010-09-25 17:55:00 +0000 Patch file that kompare cannot parse kdelibs-kiconloader-cache_returned_pixmaps.patch text/plain 670 gokcen.eraslan SW5kZXg6IGtkZXVpL2ljb25zL2tpY29ubG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrZGV1aS9p Y29ucy9raWNvbmxvYWRlci5jcHAgKHJldmlzaW9uIDExNzI4ODYpCisrKyBrZGV1aS9pY29ucy9r aWNvbmxvYWRlci5jcHAgKHdvcmtpbmcgY29weSkKQEAgLTg4NSw2ICs4ODUsMTMgQEAKICAgICAg ICAgICAgIGRhdGEgPSB0ZW1wUGl4bWFwOwogICAgICAgICAgICAgcGF0aCA9IHRlbXBQYXRoOwog CisgICAgICAgICAgICAvLyBTaW5jZSB3ZSdyZSBoZXJlIHdlIGRpZG4ndCBoYXZlIGEgUVBpeG1h cCBjYWNoZSBlbnRyeSwgYWRkIG9uZSBub3cuCisgICAgICAgICAgICBQaXhtYXBXaXRoUGF0aCAq bmV3UGl4bWFwV2l0aFBhdGggPSBuZXcgUGl4bWFwV2l0aFBhdGg7CisgICAgICAgICAgICBuZXdQ aXhtYXBXaXRoUGF0aC0+cGl4bWFwID0gZGF0YTsKKyAgICAgICAgICAgIG5ld1BpeG1hcFdpdGhQ YXRoLT5wYXRoID0gcGF0aDsKKworICAgICAgICAgICAgbVBpeG1hcENhY2hlLmluc2VydChrZXks IG5ld1BpeG1hcFdpdGhQYXRoLCBkYXRhLndpZHRoKCkgKiBkYXRhLmhlaWdodCgpICsgMSk7CisK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQ== 51982 2010-09-25 18:43:18 +0000 2010-09-25 18:43:18 +0000 Patch file generated via SVN, makes Kompare say "This diff is malformed" second.diff text/plain 7389 gokcen.eraslan SW5kZXg6IGtvbXBhcmUvbGliZGlmZjIvcGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga29tcGFyZS9s aWJkaWZmMi9wYXJzZXIuaAkocmV2aXNpb24gMTEyODM1OSkKKysrIGtvbXBhcmUvbGliZGlmZjIv cGFyc2VyLmgJKHJldmlzaW9uIDExMjgzNjApCkBAIC0zLDYgKzMsNyBAQAogKiogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAtLS0tLS0tLQogKiogICAgICBiZWdpbiAgICAgICAgICAgICAg ICAgICA6IFR1ZSBKdWwgMzAgMjM6NTM6NTIgMjAwMgogKiogICAgICBDb3B5cmlnaHQgMjAwMi0y MDA0IE90dG8gQnJ1Z2dlbWFuIDxvdHRvLmJydWdnZW1hbkBob21lLm5sPgorKiogICAgICBDb3B5 cmlnaHQgMjAxMCBLZXZpbiBLb2ZsZXIgICA8a2V2aW4ua29mbGVyQGNoZWxsby5hdD4KICoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICoqCkBAIC0zMiw3ICszMyw3IEBA CiAJflBhcnNlcigpOwogCiBwdWJsaWM6Ci0JRGlmZk1vZGVsTGlzdCogcGFyc2UoIFFTdHJpbmdM aXN0JiBkaWZmTGluZXMgKTsKKwlEaWZmTW9kZWxMaXN0KiBwYXJzZSggUVN0cmluZ0xpc3QmIGRp ZmZMaW5lcywgYm9vbCogbWFsZm9ybWVkID0gMCApOwogCiAJZW51bSBLb21wYXJlOjpHZW5lcmF0 b3IgZ2VuZXJhdG9yKCkgY29uc3QgeyByZXR1cm4gbV9nZW5lcmF0b3I7IH07CiAJZW51bSBLb21w YXJlOjpGb3JtYXQgICAgZm9ybWF0KCkgY29uc3QgICAgeyByZXR1cm4gbV9mb3JtYXQ7IH07Cklu ZGV4OiBrb21wYXJlL2xpYmRpZmYyL2tvbXBhcmVtb2RlbGxpc3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IGtvbXBhcmUvbGliZGlmZjIva29tcGFyZW1vZGVsbGlzdC5jcHAJKHJldmlzaW9uIDExMjgzNTkp CisrKyBrb21wYXJlL2xpYmRpZmYyL2tvbXBhcmVtb2RlbGxpc3QuY3BwCShyZXZpc2lvbiAxMTI4 MzYwKQpAQCAtODgxLDcgKzg4MSw4IEBACiAJUVN0cmluZ0xpc3QgZGlmZkxpbmVzID0gc3BsaXQo IGRpZmYgKTsKIAogCVBhcnNlciogcGFyc2VyID0gbmV3IFBhcnNlciggdGhpcyApOwotCW1fbW9k ZWxzID0gcGFyc2VyLT5wYXJzZSggZGlmZkxpbmVzICk7CisJYm9vbCBtYWxmb3JtZWQgPSBmYWxz ZTsKKwltX21vZGVscyA9IHBhcnNlci0+cGFyc2UoIGRpZmZMaW5lcywgJm1hbGZvcm1lZCApOwog CiAJbV9pbmZvLT5nZW5lcmF0b3IgPSBwYXJzZXItPmdlbmVyYXRvcigpOwogCW1faW5mby0+Zm9y bWF0ICAgID0gcGFyc2VyLT5mb3JtYXQoKTsKQEAgLTg5MCw2ICs4OTEsMTIgQEAKIAogCWlmICgg bV9tb2RlbHMgKQogCXsKKwkJaWYgKCBtYWxmb3JtZWQgKQorCQl7CisJCQlrRGVidWcoODEwMSkg PDwgIk1hbGZvcm1lZCBkaWZmIiA8PCBlbmRsOworCQkJZW1pdCBlcnJvciggaTE4biggIlRoZSBk aWZmIGlzIG1hbGZvcm1lZC4gU29tZSBsaW5lcyBjb3VsZCBub3QgYmUgcGFyc2VkIGFuZCB3aWxs IG5vdCBiZSBkaXNwbGF5ZWQgaW4gdGhlIGRpZmYgdmlldy4iICkgKTsKKwkJCS8vIHByb2NlZWQg YW55d2F5IHdpdGggdGhlIGxpbmVzIHdoaWNoIGhhdmUgYmVlbiBwYXJzZWQKKwkJfQogCQltX3Nl bGVjdGVkTW9kZWwgPSBmaXJzdE1vZGVsKCk7CiAJCWtEZWJ1Zyg4MTAxKSA8PCAiT2sgdGhlcmUg YXJlIGRpZmZlcmVuY2VzLi4uIiA8PCBlbmRsOwogCQltX3NlbGVjdGVkRGlmZmVyZW5jZSA9IG1f c2VsZWN0ZWRNb2RlbC0+Zmlyc3REaWZmZXJlbmNlKCk7CkluZGV4OiBrb21wYXJlL2xpYmRpZmYy L3BhcnNlcmJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtvbXBhcmUvbGliZGlmZjIvcGFyc2VyYmFz ZS5jcHAJKHJldmlzaW9uIDExMjgzNTkpCisrKyBrb21wYXJlL2xpYmRpZmYyL3BhcnNlcmJhc2Uu Y3BwCShyZXZpc2lvbiAxMTI4MzYwKQpAQCAtMyw3ICszLDcgQEAKICoqICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAtLS0tLS0tLS0tLS0tLQogKiogICAgICBiZWdpbiAgICAgICAgICAgICAg ICAgICA6IFN1biBBdWcgIDQgMTU6MDU6MzUgMjAwMgogKiogICAgICBDb3B5cmlnaHQgMjAwMi0y MDA0LDIwMDkgT3R0byBCcnVnZ2VtYW4gPGJydWdnaWVAZ21haWwuY29tPgotKiogICAgICBDb3B5 cmlnaHQgMjAwNyAgICAgIEtldmluIEtvZmxlciAgIDxrZXZpbi5rb2ZsZXJAY2hlbGxvLmF0Pgor KiogICAgICBDb3B5cmlnaHQgMjAwNywyMDEwIEtldmluIEtvZmxlciAgIDxrZXZpbi5rb2ZsZXJA Y2hlbGxvLmF0PgogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogKioK QEAgLTMzLDYgKzMzLDcgQEAKICAgICBtX21vZGVscyggMCApLAogICAgIG1fZGlmZkl0ZXJhdG9y KCBtX2RpZmZMaW5lcy5iZWdpbigpICksCiAgICAgbV9zaW5nbGVGaWxlRGlmZiggZmFsc2UgKSwK KyAgICBtX21hbGZvcm1lZCggZmFsc2UgKSwKICAgICBtX2xpc3QoIGxpc3QgKQogewogLy8Ja0Rl YnVnKDgxMDEpIDw8IGRpZmYgPDwgZW5kbDsKQEAgLTgzLDIzICs4NCwzNyBAQAogCXJldHVybiBL b21wYXJlOjpVbmtub3duRm9ybWF0OwogfQogCi1EaWZmTW9kZWxMaXN0KiBQYXJzZXJCYXNlOjpw YXJzZSgpCitEaWZmTW9kZWxMaXN0KiBQYXJzZXJCYXNlOjpwYXJzZSggYm9vbCogbWFsZm9ybWVk ICkKIHsKKwlEaWZmTW9kZWxMaXN0KiByZXN1bHQ7CiAJc3dpdGNoKCBkZXRlcm1pbmVGb3JtYXQo KSApCiAJewogCQljYXNlIEtvbXBhcmU6OkNvbnRleHQgOgotCQkJcmV0dXJuIHBhcnNlQ29udGV4 dCgpOworCQkJcmVzdWx0ID0gcGFyc2VDb250ZXh0KCk7CisJCQlicmVhazsKIAkJY2FzZSBLb21w YXJlOjpFZCA6Ci0JCQlyZXR1cm4gcGFyc2VFZCgpOworCQkJcmVzdWx0ID0gcGFyc2VFZCgpOwor CQkJYnJlYWs7CiAJCWNhc2UgS29tcGFyZTo6Tm9ybWFsIDoKLQkJCXJldHVybiBwYXJzZU5vcm1h bCgpOworCQkJcmVzdWx0ID0gcGFyc2VOb3JtYWwoKTsKKwkJCWJyZWFrOwogCQljYXNlIEtvbXBh cmU6OlJDUyA6Ci0JCQlyZXR1cm4gcGFyc2VSQ1MoKTsKKwkJCXJlc3VsdCA9IHBhcnNlUkNTKCk7 CisJCQlicmVhazsKIAkJY2FzZSBLb21wYXJlOjpVbmlmaWVkIDoKLQkJCXJldHVybiBwYXJzZVVu aWZpZWQoKTsKKwkJCXJlc3VsdCA9IHBhcnNlVW5pZmllZCgpOworCQkJYnJlYWs7CiAJCWRlZmF1 bHQ6IC8vIFVua25vd24gYW5kIFNpZGVCeVNpZGUgZm9yIG5vdwotCQkJcmV0dXJuIDBMOworCQkJ cmVzdWx0ID0gMDsKKwkJCWJyZWFrOwogCX0KKworCS8vICptYWxmb3JtZWQgaXMgc2V0IHRvIHRy dWUgaWYgc29tZSBodW5rcyBvciBwYXJ0cyBvZiBodW5rcyB3ZXJlCisJLy8gcHJvYmFibHkgbWlz c2VkIGR1ZSB0byBhIG1hbGZvcm1lZCBkaWZmCisJaWYgKCBtYWxmb3JtZWQgKQorCQkqbWFsZm9y bWVkID0gbV9tYWxmb3JtZWQ7CisKKwlyZXR1cm4gcmVzdWx0OwogfQogCiBib29sIFBhcnNlckJh c2U6OnBhcnNlQ29udGV4dERpZmZIZWFkZXIoKQpAQCAtNjE4LDYgKzYzMywxMyBAQAogCXJldHVy biB0cnVlOwogfQogCit2b2lkIFBhcnNlckJhc2U6OmNoZWNrSGVhZGVyKCBjb25zdCBRUmVnRXhw JiBoZWFkZXIgKQoreworCWlmICggbV9kaWZmSXRlcmF0b3IgIT0gbV9kaWZmTGluZXMuZW5kKCkK KwkgICAgICYmICFoZWFkZXIuZXhhY3RNYXRjaCggKm1fZGlmZkl0ZXJhdG9yICkgKQorCQltX21h bGZvcm1lZCA9IHRydWU7Cit9CisKIERpZmZNb2RlbExpc3QqIFBhcnNlckJhc2U6OnBhcnNlQ29u dGV4dCgpCiB7CiAJd2hpbGUgKCBwYXJzZUNvbnRleHREaWZmSGVhZGVyKCkgKQpAQCAtNjI2LDYg KzY0OCw3IEBACiAJCQlwYXJzZUNvbnRleHRIdW5rQm9keSgpOwogCQlpZiAoIG1fY3VycmVudE1v ZGVsLT5kaWZmZXJlbmNlQ291bnQoKSA+IDAgKQogCQkJbV9tb2RlbHMtPmFwcGVuZCggbV9jdXJy ZW50TW9kZWwgKTsKKwkJY2hlY2tIZWFkZXIoIG1fY29udGV4dERpZmZIZWFkZXIxICk7CiAJfQog CiAJbV9tb2RlbHMtPnNvcnQoKTsKQEAgLTY3Miw2ICs2OTUsNyBAQAogCQkJcGFyc2VOb3JtYWxI dW5rQm9keSgpOwogCQlpZiAoIG1fY3VycmVudE1vZGVsLT5kaWZmZXJlbmNlQ291bnQoKSA+IDAg KQogCQkJbV9tb2RlbHMtPmFwcGVuZCggbV9jdXJyZW50TW9kZWwgKTsKKwkJY2hlY2tIZWFkZXIo IG1fbm9ybWFsRGlmZkhlYWRlciApOwogCX0KIAogCWlmICggbV9zaW5nbGVGaWxlRGlmZiApCkBA IC02ODAsNiArNzA0LDggQEAKIAkJCXBhcnNlTm9ybWFsSHVua0JvZHkoKTsKIAkJaWYgKCBtX2N1 cnJlbnRNb2RlbC0+ZGlmZmVyZW5jZUNvdW50KCkgPiAwICkKIAkJCW1fbW9kZWxzLT5hcHBlbmQo IG1fY3VycmVudE1vZGVsICk7CisJCWlmICggbV9kaWZmSXRlcmF0b3IgIT0gbV9kaWZmTGluZXMu ZW5kKCkgKQorCQkJbV9tYWxmb3JtZWQgPSB0cnVlOwogCX0KIAogCW1fbW9kZWxzLT5zb3J0KCk7 CkBAIC03MjgsNiArNzU0LDcgQEAKIC8vCQlrRGVidWcoODEwMSkgPDwgIiBkaWZmZXJlbmNlQ291 bnQoKSA9PSAiIDw8IG1fY3VycmVudE1vZGVsLT5kaWZmZXJlbmNlQ291bnQoKSA8PCBlbmRsOwog CQlpZiAoIG1fY3VycmVudE1vZGVsLT5kaWZmZXJlbmNlQ291bnQoKSA+IDAgKQogCQkJbV9tb2Rl bHMtPmFwcGVuZCggbV9jdXJyZW50TW9kZWwgKTsKKwkJY2hlY2tIZWFkZXIoIG1fdW5pZmllZERp ZmZIZWFkZXIxICk7CiAJfQogCiAJbV9tb2RlbHMtPnNvcnQoKTsKSW5kZXg6IGtvbXBhcmUvbGli ZGlmZjIvcGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrb21wYXJlL2xpYmRpZmYyL3BhcnNlci5j cHAJKHJldmlzaW9uIDExMjgzNTkpCisrKyBrb21wYXJlL2xpYmRpZmYyL3BhcnNlci5jcHAJKHJl dmlzaW9uIDExMjgzNjApCkBAIC0zLDYgKzMsNyBAQAogKiogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC0tLS0tLS0tLS0KICoqICAgICAgYmVnaW4gICAgICAgICAgICAgICAgICAgOiBTdW4g QXVnICA0IDE1OjA1OjM1IDIwMDIKICoqICAgICAgQ29weXJpZ2h0IDIwMDItMjAwNCBPdHRvIEJy dWdnZW1hbiA8b3R0by5icnVnZ2VtYW5AaG9tZS5ubD4KKyoqICAgICAgQ29weXJpZ2h0IDIwMTAg S2V2aW4gS29mbGVyICAgPGtldmluLmtvZmxlckBjaGVsbG8uYXQ+CiAqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KiovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCiAqKgpAQCAtNTgsNyArNTksNyBAQAogCXJldHVybiBu b2w7CiB9IAogCi1EaWZmTW9kZWxMaXN0KiBQYXJzZXI6OnBhcnNlKCBRU3RyaW5nTGlzdCYgZGlm ZkxpbmVzICkKK0RpZmZNb2RlbExpc3QqIFBhcnNlcjo6cGFyc2UoIFFTdHJpbmdMaXN0JiBkaWZm TGluZXMsIGJvb2wqIG1hbGZvcm1lZCApCiB7CiAJLyogQmFzaWNhbGx5IGRldGVybWluZSB0aGUg Z2VuZXJhdG9yIHRoZW4gY2FsbCB0aGUgcGFyc2UgbWV0aG9kICovCiAJUGFyc2VyQmFzZSogcGFy c2VyOwpAQCAtODgsNyArODksNyBAQAogCX0KIAogCW1fZm9ybWF0ID0gcGFyc2VyLT5mb3JtYXQo KTsKLQlEaWZmTW9kZWxMaXN0KiBtb2RlbExpc3QgPSBwYXJzZXItPnBhcnNlKCk7CisJRGlmZk1v ZGVsTGlzdCogbW9kZWxMaXN0ID0gcGFyc2VyLT5wYXJzZSggbWFsZm9ybWVkICk7CiAJaWYgKCBt b2RlbExpc3QgKQogCXsKIAkJa0RlYnVnKDgxMDEpIDw8ICJNb2RlbGNvdW50OiAiIDw8IG1vZGVs TGlzdC0+Y291bnQoKSA8PCBlbmRsOwpJbmRleDoga29tcGFyZS9saWJkaWZmMi9wYXJzZXJiYXNl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0ga29tcGFyZS9saWJkaWZmMi9wYXJzZXJiYXNlLmgJKHJldmlzaW9u IDExMjgzNTkpCisrKyBrb21wYXJlL2xpYmRpZmYyL3BhcnNlcmJhc2UuaAkocmV2aXNpb24gMTEy ODM2MCkKQEAgLTMsNiArMyw3IEBACiAqKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0t LS0tLS0tLS0tLQogKiogICAgICBiZWdpbiAgICAgICAgICAgICAgICAgICA6IFR1ZSBKdWwgMzAg MjM6NTM6NTIgMjAwMgogKiogICAgICBDb3B5cmlnaHQgMjAwMi0yMDA0IE90dG8gQnJ1Z2dlbWFu IDxvdHRvLmJydWdnZW1hbkBob21lLm5sPgorKiogICAgICBDb3B5cmlnaHQgMjAxMCBLZXZpbiBL b2ZsZXIgICA8a2V2aW4ua29mbGVyQGNoZWxsby5hdD4KICoqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8q KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioKICoqCkBAIC0zOCw3ICszOSw3IEBACiAKIHB1YmxpYzoKIAllbnVt IEtvbXBhcmU6OkZvcm1hdCBmb3JtYXQoKSB7IHJldHVybiBkZXRlcm1pbmVGb3JtYXQoKTsgfTsK LQlEaWZmTW9kZWxMaXN0KiBwYXJzZSgpOworCURpZmZNb2RlbExpc3QqIHBhcnNlKCBib29sKiBt YWxmb3JtZWQgPSAwICk7CiAKIHByb3RlY3RlZDoKIAl2aXJ0dWFsIGJvb2wgcGFyc2VDb250ZXh0 RGlmZkhlYWRlcigpOwpAQCAtNjcsNiArNjgsNyBAQAogCiBwcm90ZWN0ZWQ6IC8vIEhlbHBlciBt ZXRob2RzIHRvIHNwZWVkIHRoaW5ncyB1cAogCWJvb2wgbWF0Y2hlc1VuaWZpZWRIdW5rTGluZSgg UVN0cmluZyBsaW5lICkgY29uc3Q7CisJdm9pZCBjaGVja0hlYWRlciggY29uc3QgUVJlZ0V4cCYg aGVhZGVyICk7CiAKIHByb3RlY3RlZDoKIAkvKiogV2hhdCBpcyBmb3JtYXQgb2YgdGhlIGRpZmYg Ki8KQEAgLTEyMSw2ICsxMjMsNyBAQAogCVFTdHJpbmdMaXN0OjpDb25zdEl0ZXJhdG9yIG1fZGlm Zkl0ZXJhdG9yOwogCiAJYm9vbCAgICAgICAgICAgICAgICAgICAgICAgbV9zaW5nbGVGaWxlRGlm ZjsKKwlib29sICAgICAgICAgICAgICAgICAgICAgICBtX21hbGZvcm1lZDsKIAogcHJvdGVjdGVk OgogCWNvbnN0IEtvbXBhcmVNb2RlbExpc3QqIG1fbGlzdDsK 51984 2010-09-25 19:40:36 +0000 2010-09-25 19:40:36 +0000 Another svn-generated patch file which is shown by Kompare successfully first.diff text/plain 738 gokcen.eraslan SW5kZXg6IGtvbXBhcmUvbGliZGlmZjIva29tcGFyZW1vZGVsbGlzdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0ga29tcGFyZS9saWJkaWZmMi9rb21wYXJlbW9kZWxsaXN0LmNwcAkocmV2aXNpb24gMTE0NTMx MikKKysrIGtvbXBhcmUvbGliZGlmZjIva29tcGFyZW1vZGVsbGlzdC5jcHAJKHJldmlzaW9uIDEx NDUzMTMpCkBAIC0yNzgsOSArMjc4LDggQEAKIAkJcmV0dXJuIHRydWU7CiAKIAlLVGVtcG9yYXJ5 RmlsZSB0ZW1wOwotCWJvb2wgY29ycmVjdD10ZW1wLm9wZW4oKTsKLQotCWlmKCBjb3JyZWN0ICkg eworCQorCWlmKCAhdGVtcC5vcGVuKCkgKSB7CiAJCWVtaXQgZXJyb3IoIGkxOG4oICJDb3VsZCBu b3Qgb3BlbiBhIHRlbXBvcmFyeSBmaWxlLiIgKSApOwogCQl0ZW1wLnJlbW92ZSgpOwogCQlyZXR1 cm4gZmFsc2U7CkBAIC01OTEsOSArNTkwLDggQEAKIAogCW1fZGlmZlRlbXAgPSBuZXcgS1RlbXBv cmFyeUZpbGUoKTsKIAltX2RpZmZVUkwgPSB1cmw7Ci0gICAgYm9vbCBvcGVuZWQ9bV9kaWZmVGVt cC0+b3BlbigpOwogCi0JaWYoIG9wZW5lZCApIHsKKwlpZiggIW1fZGlmZlRlbXAtPm9wZW4oKSAp IHsKIAkJZW1pdCBlcnJvciggaTE4biggIkNvdWxkIG5vdCBvcGVuIGEgdGVtcG9yYXJ5IGZpbGUu IiApICk7CiAJCW1fZGlmZlRlbXAtPnJlbW92ZSgpOwogCQlkZWxldGUgbV9kaWZmVGVtcDsK 88286 2014-08-17 22:34:10 +0000 2014-08-17 22:34:10 +0000 Fixes unified diff parsing for Aegis generated patches 0001-Fix-unified-diff-parsing-for-Aegis-generated-patches.patch text/plain 1163 markus.heidelberg RnJvbSA5Y2ViZWM0NGYzZGUxY2I0NDg0N2Q3ODRmNWY0YTZhNjU3YjQ2MDJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrdXMgSGVpZGVsYmVyZyA8bWFya3VzLmhlaWRlbGJlcmdA d2ViLmRlPgpEYXRlOiBTdW4sIDE3IEF1ZyAyMDE0IDE0OjExOjMyICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gRml4IHVuaWZpZWQgZGlmZiBwYXJzaW5nIGZvciBBZWdpcyBnZW5lcmF0ZWQgcGF0Y2hl cwoKSW4gY29udHJhc3QgdG8gQ1ZTIGdlbmVyYXRlZCBkaWZmIGZpbGVzLCAtLS0gYW5kICsrKyBs aW5lcyBvbmx5IGNvbnRhaW4KdGhlIGZpbGVuYW1lIGFuZCBubyBhZGRpdGlvbmFsIGluZm9ybWF0 aW9uIHNlcGFyYXRlZCBieSBhIHRhYiBjaGFyYWN0ZXIuCgpLb21wYXJlIGNvbXBsYWluZWQgd2l0 aCAiQ291bGQgbm90IHBhcnNlIGRpZmYgb3V0cHV0LiIKCkV4YW1wbGUgcGF0Y2g6CmFlZ2lzLnNv dXJjZWZvcmdlLm5ldC9jZ2ktYmluL2FlZ2V0L3NyZWNvcmQuMS42NC5DMTUvP2FlcGF0Y2grY29t cGF0PTQuMjUuQzY4MQotLS0KIGN2c2RpZmZwYXJzZXIuY3BwIHwgMiArLQogMSBmaWxlIGNoYW5n ZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvY3ZzZGlmZnBh cnNlci5jcHAgYi9jdnNkaWZmcGFyc2VyLmNwcAppbmRleCBiYzQ1YTEyLi4yYThiNTI4IDEwMDY0 NAotLS0gYS9jdnNkaWZmcGFyc2VyLmNwcAorKysgYi9jdnNkaWZmcGFyc2VyLmNwcApAQCAtNDIs NyArNDIsNyBAQCBlbnVtIEtvbXBhcmU6OkZvcm1hdCBDVlNEaWZmUGFyc2VyOjpkZXRlcm1pbmVG b3JtYXQoKQogLy8Ja0RlYnVnKDgxMDEpIDw8ICJEZXRlcm1pbmluZyB0aGUgZm9ybWF0IG9mIHRo ZSBDVlNEaWZmIjsKIAogCVFSZWdFeHAgbm9ybWFsUkUgKCAiWzAtOV0rWzAtOSxdKlthY2RdWzAt OV0rWzAtOSxdKiIgKTsKLQlRUmVnRXhwIHVuaWZpZWRSRSggIl4tLS0gW15cXHRdK1xcdCIgKTsK KwlRUmVnRXhwIHVuaWZpZWRSRSggIl4tLS0gW15cXHRdK1xcdD8iICk7CiAJUVJlZ0V4cCBjb250 ZXh0UkUoICJeXFwqXFwqXFwqIFteXFx0XStcXHQiICk7CiAJUVJlZ0V4cCByY3NSRSAgICAoICJe W2FjZF1bMC05XSsgWzAtOV0rIiApOwogCVFSZWdFeHAgZWRSRSAgICAgKCAiXlswLTldK1swLTks XSpbYWNkXSIgKTsKLS0gCjIuMC40Cgo= 88287 2014-08-17 22:39:07 +0000 2014-08-17 22:39:07 +0000 Unified diff file from Aegis (simplified) unified.diff text/plain 74 markus.heidelberg SW5kZXg6IGRpci9maWxlCi0tLSBkaXIvZmlsZQorKysgZGlyL2ZpbGUKQEAgLTEgKzEgQEAKLW9s ZCBsaW5lCituZXcgbGluZQo= 89242 2014-10-21 19:16:40 +0000 2014-10-21 19:16:40 +0000 regression test for unified Aegis diff 0001-add-a-test-for-Aegis-generated-unified-diffs.patch text/plain 1886 markus.heidelberg RnJvbSBjOWYyNjc0YmVhZWY0OTUzMzE0MGFlODEzNjIwM2IzNWUwYzg4MzNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrdXMgSGVpZGVsYmVyZyA8bWFya3VzLmhlaWRlbGJlcmdA d2ViLmRlPgpEYXRlOiBUdWUsIDIxIE9jdCAyMDE0IDIwOjM1OjU1ICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gYWRkIGEgdGVzdCBmb3IgQWVnaXMgZ2VuZXJhdGVkIHVuaWZpZWQgZGlmZnMKCi0tLQog dGVzdHMvaW50ZXJhY3RpdmVkaWZmdGVzdC5jcHAgfCAyNCArKysrKysrKysrKysrKysrKysrKysr KysKIHRlc3RzL2ludGVyYWN0aXZlZGlmZnRlc3QuaCAgIHwgIDEgKwogMiBmaWxlcyBjaGFuZ2Vk LCAyNSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvdGVzdHMvaW50ZXJhY3RpdmVkaWZmdGVz dC5jcHAgYi90ZXN0cy9pbnRlcmFjdGl2ZWRpZmZ0ZXN0LmNwcAppbmRleCA0NWJjODk0Li43Njdl YTBiIDEwMDY0NAotLS0gYS90ZXN0cy9pbnRlcmFjdGl2ZWRpZmZ0ZXN0LmNwcAorKysgYi90ZXN0 cy9pbnRlcmFjdGl2ZWRpZmZ0ZXN0LmNwcApAQCAtODE2LDQgKzgxNiwyOCBAQCB2b2lkIEludGVy YWN0aXZlRGlmZlRlc3Q6OnRlc3RDb250ZXh0RGlmZigpCiAgICAgY29udGV4dERpZmYyKCk7CiB9 CiAKK3ZvaWQgSW50ZXJhY3RpdmVEaWZmVGVzdDo6dGVzdFVuaWZpZWREaWZmKCkKK3sKKyAgICBR U3RyaW5nTGlzdCBwYXRjaDsKKworICAgIC8vIEFlZ2lzIGdlbmVyYXRlZCBkaWZmIChzaW1wbGlm aWVkKQorICAgIHBhdGNoIDw8CisgICAgIkluZGV4OiBkaXIvZmlsZVxuIiA8PAorICAgICItLS0g ZGlyL2ZpbGVcbiIgPDwgLy8gbm8gYWRkaXRpb25hbCBpbmZvcm1hdGlvbiBzZXBhcmF0ZWQgYnkg YSB0YWIgY2hhcmFjdGVyCisgICAgIisrKyBkaXIvZmlsZVxuIiA8PAorICAgICJAQCAtMSArMSBA QFxuIiA8PAorICAgICItb2xkIGxpbmVcbiIgPDwKKyAgICAiK25ldyBsaW5lXG4iOworCisgICAg UGFyc2VyIHBhcnNlcigwKTsKKyAgICBEaWZmTW9kZWxMaXN0KiBtb2RlbHMgPSBwYXJzZXIucGFy c2UocGF0Y2gpOworICAgIFFDT01QQVJFKG1vZGVscy0+c2l6ZSgpLCAxKTsKKyAgICBEaWZmTW9k ZWwqIG1vZGVsID0gbW9kZWxzLT5hdCgwKTsKKyAgICBRQ09NUEFSRShtb2RlbC0+ZGlmZmVyZW5j ZUNvdW50KCksIDEpOworICAgIG1vZGVsLT5hcHBseUFsbERpZmZlcmVuY2VzKHRydWUpOworICAg IFFWRVJJRlkobW9kZWwtPmRpZmZlcmVuY2VBdCgwKS0+YXBwbGllZCgpKTsKKyAgICBRQ09NUEFS RShtb2RlbC0+ZGlmZmVyZW5jZUF0KDApLT5zb3VyY2VMaW5lTnVtYmVyKCksIDEpOworICAgIFFD T01QQVJFKG1vZGVsLT5kaWZmZXJlbmNlQXQoMCktPnRyYWNraW5nRGVzdGluYXRpb25MaW5lTnVt YmVyKCksIDEpOworfQorCiBRVEVTVF9NQUlOKEludGVyYWN0aXZlRGlmZlRlc3QpOwpkaWZmIC0t Z2l0IGEvdGVzdHMvaW50ZXJhY3RpdmVkaWZmdGVzdC5oIGIvdGVzdHMvaW50ZXJhY3RpdmVkaWZm dGVzdC5oCmluZGV4IGQyMjZjMTMuLjdkYjFhYzkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ludGVyYWN0 aXZlZGlmZnRlc3QuaAorKysgYi90ZXN0cy9pbnRlcmFjdGl2ZWRpZmZ0ZXN0LmgKQEAgLTQxLDYg KzQxLDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHRlc3RPbmVMaW5lRGVsZXRpb25VbmFw cGxpZWQoKTsKICAgICB2b2lkIHRlc3RBcHBseVVuYXBwbHkoKTsKICAgICB2b2lkIHRlc3RDb250 ZXh0RGlmZigpOworICAgIHZvaWQgdGVzdFVuaWZpZWREaWZmKCk7CiBwcml2YXRlOgogICAgIHZv aWQgQ29tcGFyZURpZmZlcmVuY2VTdHJpbmdMaXN0KGNvbnN0IERpZmYyOjpEaWZmZXJlbmNlU3Ry aW5nTGlzdCYgYWN0dWFsLCBjb25zdCBRU3RyaW5nTGlzdCYgZXhwZWN0ZWQpOwogfTsKLS0gCjIu MS4yCgo=