38628 2010-05-05 22:36:42 -0700 svn-apply: should recognize "copy from" with similarity index 100% 2010-05-06 20:16:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 32834 1 cjerdonek cjerdonek abarth cjerdonek dbates eric kenneth oldest_to_newest 221511 0 cjerdonek 2010-05-05 22:36:42 -0700 For bug 32834, let's start out by adding support for "copy from" with similarity index 100%. Supporting "rename" (i.e. file moves) or copies with similarity index < 100% will require slightly more work. The reason is that with those, a single git diff will correspond to more than one operation. For example, a rename with s.i. 100% corresponds to a copy followed by a delete, a copy with s.i. < 100% corresponds to a copy followed by a modification, and a rename with s.i. < 100% corresponds to a copy followed by a delete followed by a modification. We can achieve the latter by having VCSUtil.pm's parseDiff() return an array of diff hashes rather than a single one. 221536 1 55207 cjerdonek 2010-05-06 00:30:32 -0700 Created attachment 55207 Proposed patch 221537 2 55208 cjerdonek 2010-05-06 00:33:08 -0700 Created attachment 55208 Proposed patch 2 Updated ChangeLog. 221688 3 55240 cjerdonek 2010-05-06 08:11:51 -0700 Created attachment 55240 Proposed patch 3 Updated the parseGitDiffHeader() code comment; fixed || expression. 222126 4 55240 dbates 2010-05-06 19:51:15 -0700 Comment on attachment 55240 Proposed patch 3 Can we just add a unit test for when similiarity-index is not equal to 100%? Looks good to me. 222132 5 cjerdonek 2010-05-06 20:03:36 -0700 (In reply to comment #4) > (From update of attachment 55240 [details]) > Can we just add a unit test for when similiarity-index is not equal to 100%? > > Looks good to me. Of course, will do. Thanks a lot for the review, Daniel. 222135 6 cjerdonek 2010-05-06 20:15:34 -0700 Committed: http://trac.webkit.org/changeset/58932 55207 2010-05-06 00:30:32 -0700 2010-05-06 00:33:08 -0700 Proposed patch _patch-38628-1.diff text/plain 4842 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NjA5MDUyLi5kZDg2Zjc1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUt MDYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHN2bi1hcHBseSBzY3JpcHQg bm93IHN1cHBvcnRzIHRoZSAiY29weSBmcm9tIiBzeW50YXggZm9yCisgICAgICAgIEdpdCBkaWZm cyB3aGVuIHRoZSBzaW1pbGFyaXR5IGluZGV4IGlzIDEwMCUuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NjI4CisKKyAgICAgICAgKiBTY3JpcHRz L1ZDU1V0aWxzLnBtOgorICAgICAgICAqIFNjcmlwdHMvc3ZuLXVuYXBwbHk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlR2l0RGlmZkhlYWRlci5w bDoKKwogMjAxMC0wNS0wNCAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBt CmluZGV4IGQwYWE0MjYuLmNhNDBiZGMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv VkNTVXRpbHMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtNDQy LDE2ICs0NDIsMjEgQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkKICAgICBteSAkaGVhZGVy U3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPyguKykgKFx3Lyk/KFteXHJcbl0rKSM7 CiAgICAgbXkgJGluZGV4UGF0aDsKICAgICBpZiAoLyRoZWFkZXJTdGFydFJlZ0V4LykgewotICAg ICAgICAkaW5kZXhQYXRoID0gJDI7CisgICAgICAgICMgVGhlIGZpcnN0IGFuZCBzZWNvbmQgcGF0 aHMgY2FuIGRpZmZlciBpbiB0aGUgY2FzZSBvZiBjb3BpZXMKKyAgICAgICAgIyBhbmQgcmVuYW1l cy4gIFdlIHVzZSB0aGUgc2Vjb25kIGZpbGUgcGF0aCBiZWNhdXNlIGl0IGlzIHRoZQorICAgICAg ICAjIGRlc3RpbmF0aW9uIHBhdGguCisgICAgICAgICRpbmRleFBhdGggPSAkNDsKICAgICAgICAg IyBVc2UgJFBPU1RNQVRDSCB0byBwcmVzZXJ2ZSB0aGUgZW5kLW9mLWxpbmUgY2hhcmFjdGVyLgog ICAgICAgICAkXyA9ICJJbmRleDogJGluZGV4UGF0aCRQT1NUTUFUQ0giOyAjIENvbnZlcnQgdG8g U1ZOIGZvcm1hdC4KICAgICB9IGVsc2UgewogICAgICAgICBkaWUoIkNvdWxkIG5vdCBwYXJzZSBs ZWFkaW5nIFwiZGlmZiAtLWdpdFwiIGxpbmU6IFwiJGxpbmVcIi4iKTsKICAgICB9CiAKKyAgICBt eSAkY29waWVkRnJvbVBhdGg7CiAgICAgbXkgJGZvdW5kSGVhZGVyRW5kaW5nOwogICAgIG15ICRu ZXdFeGVjdXRhYmxlQml0ID0gMDsKICAgICBteSAkb2xkRXhlY3V0YWJsZUJpdCA9IDA7CisgICAg bXkgJHNpbWlsYXJpdHlJbmRleDsKICAgICBteSAkc3ZuQ29udmVydGVkVGV4dDsKICAgICB3aGls ZSAoMSkgewogICAgICAgICAjIFRlbXBvcmFyaWx5IHN0cmlwIG9mZiBhbnkgZW5kLW9mLWxpbmUg Y2hhcmFjdGVycyB0byBzaW1wbGlmeQpAQCAtNDY4LDYgKzQ3MywxMCBAQCBzdWIgcGFyc2VHaXRE aWZmSGVhZGVyKCQkKQogICAgICAgICB9IGVsc2lmICgvXlwrXCtcKyBcUysvKSB7CiAgICAgICAg ICAgICAkXyA9ICIrKysgJGluZGV4UGF0aCI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0LgogICAg ICAgICAgICAgJGZvdW5kSGVhZGVyRW5kaW5nID0gMTsKKyAgICAgICAgfSBlbHNpZiAoL15zaW1p bGFyaXR5IGluZGV4IChcZCspJS8pIHsKKyAgICAgICAgICAgICRzaW1pbGFyaXR5SW5kZXggPSAk MTsKKyAgICAgICAgfSBlbHNpZiAoL15jb3B5IGZyb20gKFxTKykvKSB7CisgICAgICAgICAgICAk Y29waWVkRnJvbVBhdGggPSAkMTsKICAgICAgICAgIyBUaGUgImdpdCBkaWZmIiBjb21tYW5kIGlu Y2x1ZGVzIGEgbGluZSBvZiB0aGUgZm9ybSAiQmluYXJ5IGZpbGVzCiAgICAgICAgICMgPHBhdGgx PiBhbmQgPHBhdGgyPiBkaWZmZXIiIGlmIHRoZSAtLWJpbmFyeSBmbGFnIGlzIG5vdCB1c2VkLgog ICAgICAgICB9IGVsc2lmICgvXkJpbmFyeSBmaWxlcyAvICkgewpAQCAtNDg5LDYgKzQ5OCw3IEBA IHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAKICAgICBteSAlaGVhZGVyOwogCisgICAgJGhl YWRlcntjb3BpZWRGcm9tUGF0aH0gPSAkY29waWVkRnJvbVBhdGggaWYgKCRjb3BpZWRGcm9tUGF0 aCAmJiAkc2ltaWxhcml0eUluZGV4ID09IDEwMCk7CiAgICAgJGhlYWRlcntleGVjdXRhYmxlQml0 RGVsdGF9ID0gJGV4ZWN1dGFibGVCaXREZWx0YTsKICAgICAkaGVhZGVye2luZGV4UGF0aH0gPSAk aW5kZXhQYXRoOwogICAgICRoZWFkZXJ7c3ZuQ29udmVydGVkVGV4dH0gPSAkc3ZuQ29udmVydGVk VGV4dDsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5CmluZGV4IDQ2NWFkNTcuLmIzYjM5ODcgMTAwNzU1 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9zdm4tdW5hcHBseQpAQCAtMTUwLDcgKzE1MCw3IEBAIHN1YiBwYXRjaCgkKQogCiAg ICAgIyBGSVhNRTogVGhpcyBpbmZvcm1hdGlvbiBzaG91bGQgYmUgZXh0cmFjdGVkIGZyb20gdGhl IGRpZmYgZmlsZSBhcwogICAgICMgICAgICAgIHBhcnQgb2YgdGhlIHBhcnNpbmcgc3RhZ2UsIGku ZS4gdGhlIGNhbGwgdG8gcGFyc2VQYXRjaCgpLgotICAgICRhZGRpdGlvbiA9IDEgaWYgKCRwYXRj aCA9fiAvXG4tLS0gLitcKHJldmlzaW9uIDBcKVxuLyB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAu KiBAQC8pOworICAgICRhZGRpdGlvbiA9IDEgaWYgKCRwYXRjaCA9fiAvXG4tLS0gLitcKHJldmlz aW9uIDBcKVxuLyB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8pIHx8ICRkaWZmSGFzaFJl Zi0+e2NvcGllZEZyb21QYXRofTsKICAgICAkZGVsZXRpb24gPSAxIGlmICRwYXRjaCA9fiAvXG5A QCAuKiBcKzAsMCBAQC87CiAgICAgJGlzQmluYXJ5ID0gMSBpZiAkcGF0Y2ggPX4gL1xuQ2Fubm90 IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGVcLi87CiAKQEAgLTE5OCw2ICsx OTgsMTAgQEAgc3ViIHBhdGNoKCQpCiAgICAgICAgICAgICBzeXN0ZW0gInN2biIsICJzdGF0Iiwg JGZ1bGxQYXRoOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgIyBSZXZlcnNlIGFkZGl0 aW9uCisgICAgICAgICAgICAjCisgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2Ug dGhlIHNhbWUgbG9naWMgYXMgc3ZuLWFwcGx5J3MgZGVsZXRpb24KKyAgICAgICAgICAgICMgICAg ICAgIGNvZGUuICBJbiBwYXJ0aWN1bGFyLCBzdm4tYXBwbHkncyBzY21SZW1vdmUoKSBzdWJyb3V0 aW5lCisgICAgICAgICAgICAjICAgICAgICBzaG91bGQgYmUgdXNlZCBoZXJlLgogICAgICAgICAg ICAgdW5hcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoLCBbIi0tZm9yY2UiXSk7CiAgICAgICAg ICAgICB1bmxpbmsoJGZ1bGxQYXRoKSBpZiAteiAkZnVsbFBhdGg7CiAgICAgICAgICAgICBzeXN0 ZW0gInN2biIsICJyZXZlcnQiLCAkZnVsbFBhdGg7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBs IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNl R2l0RGlmZkhlYWRlci5wbAppbmRleCAwNGM3NTcyLi5mZGZlYjQzIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZm SGVhZGVyLnBsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZUdpdERpZmZIZWFkZXIucGwKQEAgLTEwOCw2ICsxMDgsMzQgQEAgRU5ECiAg ICAgZXhwZWN0ZWROZXh0TGluZSA9PiAiK2NvbnRlbnRzXG4iLAogfSwKICMjIyMKKyMgICAgQ29w eSBvcGVyYXRpb25zCisjIworeyAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiY29weSAo d2l0aCBzaW1pbGFyaXR5IGluZGV4IDEwMCUpIiwKKyAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywK K2RpZmYgLS1naXQgYS9mb28gYi9mb29fbmV3CitzaW1pbGFyaXR5IGluZGV4IDEwMCUKK2NvcHkg ZnJvbSBmb28KK2NvcHkgdG8gZm9vX25ldworZGlmZiAtLWdpdCBhL2JhciBiL2JhcgoraW5kZXgg ZDQ1ZGQ0MC4uMzQ5NDUyNiAxMDA2NDQKK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKK3sK KyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogZm9vX25ldworc2ltaWxh cml0eSBpbmRleCAxMDAlCitjb3B5IGZyb20gZm9vCitjb3B5IHRvIGZvb19uZXcKK0VORAorICAg IGNvcGllZEZyb21QYXRoID0+ICJmb28iLAorICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9PiAwLAor ICAgIGluZGV4UGF0aCA9PiAiZm9vX25ldyIsCit9LAorImRpZmYgLS1naXQgYS9iYXIgYi9iYXJc biJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gImluZGV4IGQ0NWRkNDAuLjM0OTQ1MjYgMTAw NjQ0XG4iLAorfSwKKyMjIyMKICMgICAgQmluYXJ5IGZpbGUgdGVzdCBjYXNlcwogIyMKIHsK 55208 2010-05-06 00:33:08 -0700 2010-05-06 08:11:51 -0700 Proposed patch 2 _patch-38628-2.diff text/plain 5133 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NjA5MDUyLi5mYjdkOTc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDUt MDYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc3ZuLWFwcGx5IG5vdyB1bmRlcnN0 YW5kcyB0aGUgR2l0IGRpZmYgImNvcHkgZnJvbSIgc3ludGF4IHdoZW4gdGhlCisgICAgICAgIHNp bWlsYXJpdHkgaW5kZXggaXMgMTAwJS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MjgKKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06 CisgICAgICAgICAgLSBBZGp1c3RlZCBwYXJzZUdpdERpZmZIZWFkZXIoKSB0byBwYXJzZSB0aGUg ImNvcHkgZnJvbSIgYW5kCisgICAgICAgICAgICAic2ltaWxhcml0eSBpbmRleCIgbGluZXMuCisK KyAgICAgICAgKiBTY3JpcHRzL3N2bi11bmFwcGx5OgorICAgICAgICAgIC0gQWRqdXN0ZWQgdGhl IHBhdGNoKCkgc3Vicm91dGluZSBzbyB0aGF0IGNvcGllcyBhcmUgcmVjb2duaXplZAorICAgICAg ICAgICAgYXMgZmlsZSBhZGRpdGlvbnMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gQWRk ZWQgYSB1bml0IHRlc3QgZm9yIHRoZSBjYXNlIG9mIGEgY29weSB3aXRoIHNpbWlsYXJpdHkgaW5k ZXggMTAwJS4KKwogMjAxMC0wNS0wNCAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtCmluZGV4IGQwYWE0MjYuLmNhNDBiZGMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpA QCAtNDQyLDE2ICs0NDIsMjEgQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkKICAgICBteSAk aGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPyguKykgKFx3Lyk/KFteXHJc bl0rKSM7CiAgICAgbXkgJGluZGV4UGF0aDsKICAgICBpZiAoLyRoZWFkZXJTdGFydFJlZ0V4Lykg ewotICAgICAgICAkaW5kZXhQYXRoID0gJDI7CisgICAgICAgICMgVGhlIGZpcnN0IGFuZCBzZWNv bmQgcGF0aHMgY2FuIGRpZmZlciBpbiB0aGUgY2FzZSBvZiBjb3BpZXMKKyAgICAgICAgIyBhbmQg cmVuYW1lcy4gIFdlIHVzZSB0aGUgc2Vjb25kIGZpbGUgcGF0aCBiZWNhdXNlIGl0IGlzIHRoZQor ICAgICAgICAjIGRlc3RpbmF0aW9uIHBhdGguCisgICAgICAgICRpbmRleFBhdGggPSAkNDsKICAg ICAgICAgIyBVc2UgJFBPU1RNQVRDSCB0byBwcmVzZXJ2ZSB0aGUgZW5kLW9mLWxpbmUgY2hhcmFj dGVyLgogICAgICAgICAkXyA9ICJJbmRleDogJGluZGV4UGF0aCRQT1NUTUFUQ0giOyAjIENvbnZl cnQgdG8gU1ZOIGZvcm1hdC4KICAgICB9IGVsc2UgewogICAgICAgICBkaWUoIkNvdWxkIG5vdCBw YXJzZSBsZWFkaW5nIFwiZGlmZiAtLWdpdFwiIGxpbmU6IFwiJGxpbmVcIi4iKTsKICAgICB9CiAK KyAgICBteSAkY29waWVkRnJvbVBhdGg7CiAgICAgbXkgJGZvdW5kSGVhZGVyRW5kaW5nOwogICAg IG15ICRuZXdFeGVjdXRhYmxlQml0ID0gMDsKICAgICBteSAkb2xkRXhlY3V0YWJsZUJpdCA9IDA7 CisgICAgbXkgJHNpbWlsYXJpdHlJbmRleDsKICAgICBteSAkc3ZuQ29udmVydGVkVGV4dDsKICAg ICB3aGlsZSAoMSkgewogICAgICAgICAjIFRlbXBvcmFyaWx5IHN0cmlwIG9mZiBhbnkgZW5kLW9m LWxpbmUgY2hhcmFjdGVycyB0byBzaW1wbGlmeQpAQCAtNDY4LDYgKzQ3MywxMCBAQCBzdWIgcGFy c2VHaXREaWZmSGVhZGVyKCQkKQogICAgICAgICB9IGVsc2lmICgvXlwrXCtcKyBcUysvKSB7CiAg ICAgICAgICAgICAkXyA9ICIrKysgJGluZGV4UGF0aCI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0 LgogICAgICAgICAgICAgJGZvdW5kSGVhZGVyRW5kaW5nID0gMTsKKyAgICAgICAgfSBlbHNpZiAo L15zaW1pbGFyaXR5IGluZGV4IChcZCspJS8pIHsKKyAgICAgICAgICAgICRzaW1pbGFyaXR5SW5k ZXggPSAkMTsKKyAgICAgICAgfSBlbHNpZiAoL15jb3B5IGZyb20gKFxTKykvKSB7CisgICAgICAg ICAgICAkY29waWVkRnJvbVBhdGggPSAkMTsKICAgICAgICAgIyBUaGUgImdpdCBkaWZmIiBjb21t YW5kIGluY2x1ZGVzIGEgbGluZSBvZiB0aGUgZm9ybSAiQmluYXJ5IGZpbGVzCiAgICAgICAgICMg PHBhdGgxPiBhbmQgPHBhdGgyPiBkaWZmZXIiIGlmIHRoZSAtLWJpbmFyeSBmbGFnIGlzIG5vdCB1 c2VkLgogICAgICAgICB9IGVsc2lmICgvXkJpbmFyeSBmaWxlcyAvICkgewpAQCAtNDg5LDYgKzQ5 OCw3IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAKICAgICBteSAlaGVhZGVyOwogCisg ICAgJGhlYWRlcntjb3BpZWRGcm9tUGF0aH0gPSAkY29waWVkRnJvbVBhdGggaWYgKCRjb3BpZWRG cm9tUGF0aCAmJiAkc2ltaWxhcml0eUluZGV4ID09IDEwMCk7CiAgICAgJGhlYWRlcntleGVjdXRh YmxlQml0RGVsdGF9ID0gJGV4ZWN1dGFibGVCaXREZWx0YTsKICAgICAkaGVhZGVye2luZGV4UGF0 aH0gPSAkaW5kZXhQYXRoOwogICAgICRoZWFkZXJ7c3ZuQ29udmVydGVkVGV4dH0gPSAkc3ZuQ29u dmVydGVkVGV4dDsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5CmluZGV4IDQ2NWFkNTcuLmIzYjM5ODcg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQpAQCAtMTUwLDcgKzE1MCw3IEBAIHN1YiBwYXRjaCgk KQogCiAgICAgIyBGSVhNRTogVGhpcyBpbmZvcm1hdGlvbiBzaG91bGQgYmUgZXh0cmFjdGVkIGZy b20gdGhlIGRpZmYgZmlsZSBhcwogICAgICMgICAgICAgIHBhcnQgb2YgdGhlIHBhcnNpbmcgc3Rh Z2UsIGkuZS4gdGhlIGNhbGwgdG8gcGFyc2VQYXRjaCgpLgotICAgICRhZGRpdGlvbiA9IDEgaWYg KCRwYXRjaCA9fiAvXG4tLS0gLitcKHJldmlzaW9uIDBcKVxuLyB8fCAkcGF0Y2ggPX4gL1xuQEAg LTAsMCAuKiBAQC8pOworICAgICRhZGRpdGlvbiA9IDEgaWYgKCRwYXRjaCA9fiAvXG4tLS0gLitc KHJldmlzaW9uIDBcKVxuLyB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8pIHx8ICRkaWZm SGFzaFJlZi0+e2NvcGllZEZyb21QYXRofTsKICAgICAkZGVsZXRpb24gPSAxIGlmICRwYXRjaCA9 fiAvXG5AQCAuKiBcKzAsMCBAQC87CiAgICAgJGlzQmluYXJ5ID0gMSBpZiAkcGF0Y2ggPX4gL1xu Q2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGVcLi87CiAKQEAgLTE5 OCw2ICsxOTgsMTAgQEAgc3ViIHBhdGNoKCQpCiAgICAgICAgICAgICBzeXN0ZW0gInN2biIsICJz dGF0IiwgJGZ1bGxQYXRoOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgIyBSZXZlcnNl IGFkZGl0aW9uCisgICAgICAgICAgICAjCisgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3Vs ZCB1c2UgdGhlIHNhbWUgbG9naWMgYXMgc3ZuLWFwcGx5J3MgZGVsZXRpb24KKyAgICAgICAgICAg ICMgICAgICAgIGNvZGUuICBJbiBwYXJ0aWN1bGFyLCBzdm4tYXBwbHkncyBzY21SZW1vdmUoKSBz dWJyb3V0aW5lCisgICAgICAgICAgICAjICAgICAgICBzaG91bGQgYmUgdXNlZCBoZXJlLgogICAg ICAgICAgICAgdW5hcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoLCBbIi0tZm9yY2UiXSk7CiAg ICAgICAgICAgICB1bmxpbmsoJGZ1bGxQYXRoKSBpZiAteiAkZnVsbFBhdGg7CiAgICAgICAgICAg ICBzeXN0ZW0gInN2biIsICJyZXZlcnQiLCAkZnVsbFBhdGg7CmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVh ZGVyLnBsIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0 L3BhcnNlR2l0RGlmZkhlYWRlci5wbAppbmRleCAwNGM3NTcyLi5mZGZlYjQzIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VH aXREaWZmSGVhZGVyLnBsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NV dGlsc191bml0dGVzdC9wYXJzZUdpdERpZmZIZWFkZXIucGwKQEAgLTEwOCw2ICsxMDgsMzQgQEAg RU5ECiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiAiK2NvbnRlbnRzXG4iLAogfSwKICMjIyMKKyMg ICAgQ29weSBvcGVyYXRpb25zCisjIworeyAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAi Y29weSAod2l0aCBzaW1pbGFyaXR5IGluZGV4IDEwMCUpIiwKKyAgICBpbnB1dFRleHQgPT4gPDwn RU5EJywKK2RpZmYgLS1naXQgYS9mb28gYi9mb29fbmV3CitzaW1pbGFyaXR5IGluZGV4IDEwMCUK K2NvcHkgZnJvbSBmb28KK2NvcHkgdG8gZm9vX25ldworZGlmZiAtLWdpdCBhL2JhciBiL2Jhcgor aW5kZXggZDQ1ZGQ0MC4uMzQ5NDUyNiAxMDA2NDQKK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+ IFsKK3sKKyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogZm9vX25ldwor c2ltaWxhcml0eSBpbmRleCAxMDAlCitjb3B5IGZyb20gZm9vCitjb3B5IHRvIGZvb19uZXcKK0VO RAorICAgIGNvcGllZEZyb21QYXRoID0+ICJmb28iLAorICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9 PiAwLAorICAgIGluZGV4UGF0aCA9PiAiZm9vX25ldyIsCit9LAorImRpZmYgLS1naXQgYS9iYXIg Yi9iYXJcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gImluZGV4IGQ0NWRkNDAuLjM0OTQ1 MjYgMTAwNjQ0XG4iLAorfSwKKyMjIyMKICMgICAgQmluYXJ5IGZpbGUgdGVzdCBjYXNlcwogIyMK IHsK 55240 2010-05-06 08:11:51 -0700 2010-05-06 20:16:13 -0700 Proposed patch 3 _patch-38628-3.diff text/plain 5613 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NjA5MDUyLi5mYjdkOTc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDUt MDYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc3ZuLWFwcGx5IG5vdyB1bmRlcnN0 YW5kcyB0aGUgR2l0IGRpZmYgImNvcHkgZnJvbSIgc3ludGF4IHdoZW4gdGhlCisgICAgICAgIHNp bWlsYXJpdHkgaW5kZXggaXMgMTAwJS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MjgKKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06 CisgICAgICAgICAgLSBBZGp1c3RlZCBwYXJzZUdpdERpZmZIZWFkZXIoKSB0byBwYXJzZSB0aGUg ImNvcHkgZnJvbSIgYW5kCisgICAgICAgICAgICAic2ltaWxhcml0eSBpbmRleCIgbGluZXMuCisK KyAgICAgICAgKiBTY3JpcHRzL3N2bi11bmFwcGx5OgorICAgICAgICAgIC0gQWRqdXN0ZWQgdGhl IHBhdGNoKCkgc3Vicm91dGluZSBzbyB0aGF0IGNvcGllcyBhcmUgcmVjb2duaXplZAorICAgICAg ICAgICAgYXMgZmlsZSBhZGRpdGlvbnMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gQWRk ZWQgYSB1bml0IHRlc3QgZm9yIHRoZSBjYXNlIG9mIGEgY29weSB3aXRoIHNpbWlsYXJpdHkgaW5k ZXggMTAwJS4KKwogMjAxMC0wNS0wNCAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtCmluZGV4IGQwYWE0MjYuLmE4M2ZkMWMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpA QCAtNDI1LDYgKzQyNSw3IEBAIHN1YiBpc0V4ZWN1dGFibGUoJCkKICMKICMgUmV0dXJucyAoJGhl YWRlckhhc2hSZWYsICRsYXN0UmVhZExpbmUpOgogIyAgICRoZWFkZXJIYXNoUmVmOiBhIGhhc2gg cmVmZXJlbmNlIHJlcHJlc2VudGluZyBhIGRpZmYgaGVhZGVyLCBhcyBmb2xsb3dzLS0KKyMgICAg IGNvcGllZEZyb21QYXRoOiBpZiBhIGZpbGUgY29weSwgdGhlIHBhdGggZnJvbSB3aGljaCB0aGUg ZmlsZSB3YXMgY29waWVkLgogIyAgICAgZXhlY3V0YWJsZUJpdERlbHRhOiBhbiBpbnRlZ2VyIC0x LCAwLCBvciAxLCBkZXBlbmRpbmcgb24gd2hldGhlciB0aGUKICMgICAgICAgICAgICAgICAgICAg ICAgICAgZXhlY3V0YWJsZSBiaXQgd2FzIGFkZGVkLCByZW1haW5lZCB0aGUgc2FtZSwgb3Igd2Fz CiAjICAgICAgICAgICAgICAgICAgICAgICAgIHJlbW92ZWQuICBGb3IgbmV3IGFuZCBkZWxldGVk IGZpbGVzLCB0aGUgdmFsdWUgaXMgMApAQCAtNDQyLDE2ICs0NDMsMjEgQEAgc3ViIHBhcnNlR2l0 RGlmZkhlYWRlcigkJCkKICAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0 IChcdy8pPyguKykgKFx3Lyk/KFteXHJcbl0rKSM7CiAgICAgbXkgJGluZGV4UGF0aDsKICAgICBp ZiAoLyRoZWFkZXJTdGFydFJlZ0V4LykgewotICAgICAgICAkaW5kZXhQYXRoID0gJDI7CisgICAg ICAgICMgVGhlIGZpcnN0IGFuZCBzZWNvbmQgcGF0aHMgY2FuIGRpZmZlciBpbiB0aGUgY2FzZSBv ZiBjb3BpZXMKKyAgICAgICAgIyBhbmQgcmVuYW1lcy4gIFdlIHVzZSB0aGUgc2Vjb25kIGZpbGUg cGF0aCBiZWNhdXNlIGl0IGlzIHRoZQorICAgICAgICAjIGRlc3RpbmF0aW9uIHBhdGguCisgICAg ICAgICRpbmRleFBhdGggPSAkNDsKICAgICAgICAgIyBVc2UgJFBPU1RNQVRDSCB0byBwcmVzZXJ2 ZSB0aGUgZW5kLW9mLWxpbmUgY2hhcmFjdGVyLgogICAgICAgICAkXyA9ICJJbmRleDogJGluZGV4 UGF0aCRQT1NUTUFUQ0giOyAjIENvbnZlcnQgdG8gU1ZOIGZvcm1hdC4KICAgICB9IGVsc2Ugewog ICAgICAgICBkaWUoIkNvdWxkIG5vdCBwYXJzZSBsZWFkaW5nIFwiZGlmZiAtLWdpdFwiIGxpbmU6 IFwiJGxpbmVcIi4iKTsKICAgICB9CiAKKyAgICBteSAkY29waWVkRnJvbVBhdGg7CiAgICAgbXkg JGZvdW5kSGVhZGVyRW5kaW5nOwogICAgIG15ICRuZXdFeGVjdXRhYmxlQml0ID0gMDsKICAgICBt eSAkb2xkRXhlY3V0YWJsZUJpdCA9IDA7CisgICAgbXkgJHNpbWlsYXJpdHlJbmRleDsKICAgICBt eSAkc3ZuQ29udmVydGVkVGV4dDsKICAgICB3aGlsZSAoMSkgewogICAgICAgICAjIFRlbXBvcmFy aWx5IHN0cmlwIG9mZiBhbnkgZW5kLW9mLWxpbmUgY2hhcmFjdGVycyB0byBzaW1wbGlmeQpAQCAt NDY4LDYgKzQ3NCwxMCBAQCBzdWIgcGFyc2VHaXREaWZmSGVhZGVyKCQkKQogICAgICAgICB9IGVs c2lmICgvXlwrXCtcKyBcUysvKSB7CiAgICAgICAgICAgICAkXyA9ICIrKysgJGluZGV4UGF0aCI7 ICMgQ29udmVydCB0byBTVk4gZm9ybWF0LgogICAgICAgICAgICAgJGZvdW5kSGVhZGVyRW5kaW5n ID0gMTsKKyAgICAgICAgfSBlbHNpZiAoL15zaW1pbGFyaXR5IGluZGV4IChcZCspJS8pIHsKKyAg ICAgICAgICAgICRzaW1pbGFyaXR5SW5kZXggPSAkMTsKKyAgICAgICAgfSBlbHNpZiAoL15jb3B5 IGZyb20gKFxTKykvKSB7CisgICAgICAgICAgICAkY29waWVkRnJvbVBhdGggPSAkMTsKICAgICAg ICAgIyBUaGUgImdpdCBkaWZmIiBjb21tYW5kIGluY2x1ZGVzIGEgbGluZSBvZiB0aGUgZm9ybSAi QmluYXJ5IGZpbGVzCiAgICAgICAgICMgPHBhdGgxPiBhbmQgPHBhdGgyPiBkaWZmZXIiIGlmIHRo ZSAtLWJpbmFyeSBmbGFnIGlzIG5vdCB1c2VkLgogICAgICAgICB9IGVsc2lmICgvXkJpbmFyeSBm aWxlcyAvICkgewpAQCAtNDg5LDYgKzQ5OSw3IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQp CiAKICAgICBteSAlaGVhZGVyOwogCisgICAgJGhlYWRlcntjb3BpZWRGcm9tUGF0aH0gPSAkY29w aWVkRnJvbVBhdGggaWYgKCRjb3BpZWRGcm9tUGF0aCAmJiAkc2ltaWxhcml0eUluZGV4ID09IDEw MCk7CiAgICAgJGhlYWRlcntleGVjdXRhYmxlQml0RGVsdGF9ID0gJGV4ZWN1dGFibGVCaXREZWx0 YTsKICAgICAkaGVhZGVye2luZGV4UGF0aH0gPSAkaW5kZXhQYXRoOwogICAgICRoZWFkZXJ7c3Zu Q29udmVydGVkVGV4dH0gPSAkc3ZuQ29udmVydGVkVGV4dDsKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvc3ZuLXVuYXBwbHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5 CmluZGV4IDQ2NWFkNTcuLmY2YWYxOWIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv c3ZuLXVuYXBwbHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQpAQCAtMTUw LDcgKzE1MCw3IEBAIHN1YiBwYXRjaCgkKQogCiAgICAgIyBGSVhNRTogVGhpcyBpbmZvcm1hdGlv biBzaG91bGQgYmUgZXh0cmFjdGVkIGZyb20gdGhlIGRpZmYgZmlsZSBhcwogICAgICMgICAgICAg IHBhcnQgb2YgdGhlIHBhcnNpbmcgc3RhZ2UsIGkuZS4gdGhlIGNhbGwgdG8gcGFyc2VQYXRjaCgp LgotICAgICRhZGRpdGlvbiA9IDEgaWYgKCRwYXRjaCA9fiAvXG4tLS0gLitcKHJldmlzaW9uIDBc KVxuLyB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8pOworICAgICRhZGRpdGlvbiA9IDEg aWYgKCRkaWZmSGFzaFJlZi0+e2NvcGllZEZyb21QYXRofSB8fCAkcGF0Y2ggPX4gL1xuLS0tIC4r XChyZXZpc2lvbiAwXClcbi8gfHwgJHBhdGNoID1+IC9cbkBAIC0wLDAgLiogQEAvKTsKICAgICAk ZGVsZXRpb24gPSAxIGlmICRwYXRjaCA9fiAvXG5AQCAuKiBcKzAsMCBAQC87CiAgICAgJGlzQmlu YXJ5ID0gMSBpZiAkcGF0Y2ggPX4gL1xuQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEg YmluYXJ5IHR5cGVcLi87CiAKQEAgLTE5OCw2ICsxOTgsMTAgQEAgc3ViIHBhdGNoKCQpCiAgICAg ICAgICAgICBzeXN0ZW0gInN2biIsICJzdGF0IiwgJGZ1bGxQYXRoOwogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgIyBSZXZlcnNlIGFkZGl0aW9uCisgICAgICAgICAgICAjCisgICAgICAg ICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgdGhlIHNhbWUgbG9naWMgYXMgc3ZuLWFwcGx5 J3MgZGVsZXRpb24KKyAgICAgICAgICAgICMgICAgICAgIGNvZGUuICBJbiBwYXJ0aWN1bGFyLCBz dm4tYXBwbHkncyBzY21SZW1vdmUoKSBzdWJyb3V0aW5lCisgICAgICAgICAgICAjICAgICAgICBz aG91bGQgYmUgdXNlZCBoZXJlLgogICAgICAgICAgICAgdW5hcHBseVBhdGNoKCRwYXRjaCwgJGZ1 bGxQYXRoLCBbIi0tZm9yY2UiXSk7CiAgICAgICAgICAgICB1bmxpbmsoJGZ1bGxQYXRoKSBpZiAt eiAkZnVsbFBhdGg7CiAgICAgICAgICAgICBzeXN0ZW0gInN2biIsICJyZXZlcnQiLCAkZnVsbFBh dGg7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNf dW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlR2l0RGlmZkhlYWRlci5wbAppbmRleCAwNGM3 NTcyLi5mZGZlYjQzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsCisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZUdpdERpZmZIZWFkZXIu cGwKQEAgLTEwOCw2ICsxMDgsMzQgQEAgRU5ECiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiAiK2Nv bnRlbnRzXG4iLAogfSwKICMjIyMKKyMgICAgQ29weSBvcGVyYXRpb25zCisjIworeyAgICMgTmV3 IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiY29weSAod2l0aCBzaW1pbGFyaXR5IGluZGV4IDEwMCUp IiwKKyAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywKK2RpZmYgLS1naXQgYS9mb28gYi9mb29fbmV3 CitzaW1pbGFyaXR5IGluZGV4IDEwMCUKK2NvcHkgZnJvbSBmb28KK2NvcHkgdG8gZm9vX25ldwor ZGlmZiAtLWdpdCBhL2JhciBiL2JhcgoraW5kZXggZDQ1ZGQ0MC4uMzQ5NDUyNiAxMDA2NDQKK0VO RAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKK3sKKyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8 J0VORCcsCitJbmRleDogZm9vX25ldworc2ltaWxhcml0eSBpbmRleCAxMDAlCitjb3B5IGZyb20g Zm9vCitjb3B5IHRvIGZvb19uZXcKK0VORAorICAgIGNvcGllZEZyb21QYXRoID0+ICJmb28iLAor ICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9PiAwLAorICAgIGluZGV4UGF0aCA9PiAiZm9vX25ldyIs Cit9LAorImRpZmYgLS1naXQgYS9iYXIgYi9iYXJcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUg PT4gImluZGV4IGQ0NWRkNDAuLjM0OTQ1MjYgMTAwNjQ0XG4iLAorfSwKKyMjIyMKICMgICAgQmlu YXJ5IGZpbGUgdGVzdCBjYXNlcwogIyMKIHsK