45236 2010-09-04 16:18:42 -0700 Teach svn-apply/unapply about svn:mergeinfo 2010-09-04 18:12:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates cjerdonek eric kbalazs oldest_to_newest 274399 0 dbates 2010-09-04 16:18:42 -0700 Following up from comment 7 in bug 44336 <https://bugs.webkit.org/show_bug.cgi?id=44336#c7>, we should implement support for recognizing the svn:mergeinfo property so that patches that contain such information can be applied. 274404 1 66594 dbates 2010-09-04 16:41:05 -0700 Created attachment 66594 Patch with unit tests Adds support for recognizing the svn:mergeinfo property and ignore it. Because svn:mergeinfo is metadata that is used only by SVN and tends to be error-prone and/or nuisance (see remark (*)), we will ignore it for now. That is, when applying a patch that contains svn:mergeinfo info the changes to the svn:mergeinfo property will not be applied. (*) See "Parting Thoughts" of <http://www.collab.net/community/subversion/articles/merge-info.html>. 274405 2 dbates 2010-09-04 16:50:21 -0700 I should add that I don't really use svn merge and hence could be biased on its benefit. I am open to suggestions on whether we should keep this information. 274406 3 66594 mrobinson 2010-09-04 17:03:54 -0700 Comment on attachment 66594 Patch with unit tests Looks sane. 274412 4 66594 dbates 2010-09-04 18:12:25 -0700 Comment on attachment 66594 Patch with unit tests Clearing flags on attachment: 66594 Committed r66800: <http://trac.webkit.org/changeset/66800> 274413 5 dbates 2010-09-04 18:12:32 -0700 All reviewed patches have been landed. Closing bug. 66594 2010-09-04 16:41:05 -0700 2010-09-04 18:12:25 -0700 Patch with unit tests Bug45236_1.patch text/plain 11450 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY2Nzk3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTAtMDktMDQgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlYWNoIHN2bi1hcHBseS91bmFwcGx5IGFib3V0IHN2bjptZXJnZWluZm8KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MjM2CisKKyAgICAg ICAgUmVjb2duaXplIHRoZSBzdm46bWVyZ2VpbmZvIHByb3BlcnR5IGFuZCBpZ25vcmUgaXQgZm9y IG5vdy4KKworICAgICAgICBDdXJyZW50bHksIHN2bi1hcHBseS91bmFwcGx5IHJlY29nbml6ZSBv bmx5ICcrJyBhbmQgJy0nCisgICAgICAgIHByb3BlcnR5IGNoYW5nZXMgd2l0aGluIGEgZGlmZi4g V2Ugc2hvdWxkIGFkZCBzdXBwb3J0CisgICAgICAgIHRvIHJlY29nbml6ZSAiTWVyZ2VkIiBhbmQg IlJldmVyc2UtbWVyZ2VkIiBjaGFuZ2VzIGFzIHdlbGwuCisgICAgICAgIEJlY2F1c2Ugc3ZuOm1l cmdlaW5mbyBpcyBtZXRhZGF0YSB0aGF0IGlzIHVzZWQgb25seSBieSBTVk4KKyAgICAgICAgYW5k IHRlbmRzIHRvIGJlIGVycm9yLXByb25lIGFuZC9vciBudWlzYW5jZSAoKiksIHdlIHdpbGwgaWdu b3JlCisgICAgICAgIGl0IGZvciBub3cuCisgICAgICAgICgqKSBTZWUgIlBhcnRpbmcgVGhvdWdo dHMiIG9mIDxodHRwOi8vd3d3LmNvbGxhYi5uZXQvY29tbXVuaXR5L3N1YnZlcnNpb24vYXJ0aWNs ZXMvbWVyZ2UtaW5mby5odG1sPi4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06Cisg ICAgICAgICAgLSBNb2RpZmllZCBwYXJzZVN2blByb3BlcnR5KCkgdG8gcmVjb2duaXplICJNZXJn ZWQiIGFuZAorICAgICAgICAgICAgIlJldmVyc2UtbWVyZ2VkIiBhcyB0aGUgc3RhcnQgb2YgYSBw cm9wZXJ0eSB2YWx1ZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5p dHRlc3QvcGFyc2VTdm5EaWZmRm9vdGVyLnBsOgorICAgICAgICAgIC0gQWRkZWQgdGhlIGZvbGxv d2luZyB1bml0IHRlc3RzOgorICAgICAgICAgICAgInNpbXBsZTogYWRkIHN2bjptZXJnZWluZm8i CisgICAgICAgICAgICAic2ltcGxlOiBkZWxldGUgc3ZuOm1lcmdlaW5mbyIKKyAgICAgICAgICAg ICJzaW1wbGU6IG1vZGlmaWVkIHN2bjptZXJnZWluZm8iCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuUHJvcGVydHkucGw6CisgICAgICAgICAg LSBBZGRlZCB0aGUgZm9sbG93aW5nIHVuaXQgdGVzdHM6CisgICAgICAgICAgICAic2ltcGxlOiBh ZGQgc3ZuOm1lcmdlaW5mbyIKKyAgICAgICAgICAgICJzaW1wbGU6IGRlbGV0ZSBzdm46bWVyZ2Vp bmZvIgorICAgICAgICAgICAgInNpbXBsZTogbW9kaWZpZWQgc3ZuOm1lcmdlaW5mbyIKKyAgICAg ICAgICAgICJzaW1wbGU6IG1vZGlmaWVkIHN2bjptZXJnZWluZm8gdXNpbmcgU1ZOIDEuNCBzeW50 YXgiCisgICAgICAgICAgICAiJ01lcmdlZCcgY2hhbmdlIGZvbGxvd2VkIGJ5ICdNZXJnZWQnIGNo YW5nZSIKKyAgICAgICAgICAgICInUmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSBmb2xsb3dlZCBieSAn UmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSIKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5Qcm9wZXJ0eVZhbHVlLnBsOgorICAgICAgICAgIC0gQWRk ZWQgdGhlIGZvbGxvd2luZyB1bml0IHRlc3RzOgorICAgICAgICAgICAgIidNZXJnZWQnIGNoYW5n ZSIKKyAgICAgICAgICAgICInUmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSIKKyAgICAgICAgICAgICIn UmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSBmb2xsb3dlZCBieSAnTWVyZ2UnIGNoYW5nZSIKKyAgICAg ICAgICAgICInTWVyZ2VkJyBjaGFuZ2UgZm9sbG93ZWQgYnkgJ01lcmdlJyBjaGFuZ2UiCisgICAg ICAgICAgICAiJ1JldmVyc2UtbWVyZ2VkJyBjaGFuZ2UgZm9sbG93ZWQgYnkgJ1JldmVyc2UtbWVy Z2VkJyBjaGFuZ2UiCisgICAgICAgICAgICAiJ1JldmVyc2UtbWVyZ2VkJyBjaGFuZ2UgZm9sbG93 ZWQgYnkgJ1JldmVyc2UtbWVyZ2VkJyBjaGFuZ2UgZm9sbG93ZWQgYnkgJ01lcmdlZCcgY2hhbmdl IgorCiAyMDEwLTA5LTA0ICBMdWNhcyBEZSBNYXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNp b24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQkocmV2aXNpb24gNjY3OTYpCisrKyBXZWJL aXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCw3 IEBAIG15ICRnaXREaWZmU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0ICgKIG15ICRzdm5EaWZm U3RhcnRSZWdFeCA9IHFyI15JbmRleDogKFteXHJcbl0rKSM7CiBteSAkc3ZuUHJvcGVydGllc1N0 YXJ0UmVnRXggPSBxciNeUHJvcGVydHkgY2hhbmdlcyBvbjogKFteXHJcbl0rKSM7ICMgJDEgaXMg bm9ybWFsbHkgdGhlIHNhbWUgYXMgdGhlIGluZGV4IHBhdGguCiBteSAkc3ZuUHJvcGVydHlTdGFy dFJlZ0V4ID0gcXIjXihNb2RpZmllZHxOYW1lfEFkZGVkfERlbGV0ZWQpOiAoW15cclxuXSspIzsg IyAkMiBpcyB0aGUgbmFtZSBvZiB0aGUgcHJvcGVydHkuCi1teSAkc3ZuUHJvcGVydHlWYWx1ZVN0 YXJ0UmVnRXggPSBxciNeICAgKFwrfC0pIChbXlxyXG5dKykjOyAjICQyIGlzIHRoZSBzdGFydCBv ZiB0aGUgcHJvcGVydHkncyB2YWx1ZSAod2hpY2ggbWF5IHNwYW4gbXVsdGlwbGUgbGluZXMpLgor bXkgJHN2blByb3BlcnR5VmFsdWVTdGFydFJlZ0V4ID0gcXIjXiAgIChcK3wtfE1lcmdlZHxSZXZl cnNlLW1lcmdlZCkgKFteXHJcbl0rKSM7ICMgJDIgaXMgdGhlIHN0YXJ0IG9mIHRoZSBwcm9wZXJ0 eSdzIHZhbHVlICh3aGljaCBtYXkgc3BhbiBtdWx0aXBsZSBsaW5lcykuCiAKICMgVGhpcyBtZXRo b2QgaXMgZm9yIHBvcnRhYmlsaXR5LiBSZXR1cm4gdGhlIHN5c3RlbS1hcHByb3ByaWF0ZSBleGl0 CiAjIHN0YXR1cyBvZiBhIGNoaWxkIHByb2Nlc3MuCkBAIC0xMDM3LDkgKzEwMzcsOSBAQCBzdWIg cGFyc2VTdm5Qcm9wZXJ0eSgkJCkKICAgICB9CiAKICAgICBteSAkcHJvcGVydHlDaGFuZ2VEZWx0 YTsKLSAgICBpZiAoJHByb3BlcnR5VmFsdWVUeXBlIGVxICcrJykgeworICAgIGlmICgkcHJvcGVy dHlWYWx1ZVR5cGUgZXEgIisiIHx8ICRwcm9wZXJ0eVZhbHVlVHlwZSBlcSAiTWVyZ2VkIikgewog ICAgICAgICAkcHJvcGVydHlDaGFuZ2VEZWx0YSA9IDE7Ci0gICAgfSBlbHNpZiAoJHByb3BlcnR5 VmFsdWVUeXBlIGVxICctJykgeworICAgIH0gZWxzaWYgKCRwcm9wZXJ0eVZhbHVlVHlwZSBlcSAi LSIgfHwgJHByb3BlcnR5VmFsdWVUeXBlIGVxICJSZXZlcnNlLW1lcmdlZCIpIHsKICAgICAgICAg JHByb3BlcnR5Q2hhbmdlRGVsdGEgPSAtMTsKICAgICB9IGVsc2UgewogICAgICAgICBkaWUoIk5v dCByZWFjaGVkLiIpOwpAQCAtMTA5Myw3ICsxMDkzLDcgQEAgc3ViIHBhcnNlU3ZuUHJvcGVydHlW YWx1ZSgkJCkKICAgICAgICAgJHByb3BlcnR5VmFsdWUgPSAkMjsgIyBEb2VzIG5vdCBpbmNsdWRl IHRoZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXIocykuCiAgICAgICAgICRlb2wgPSAkUE9TVE1BVENI OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGRpZSgiRmFpbGVkIHRvIGZpbmQgcHJvcGVydHkgdmFs dWUgYmVnaW5uaW5nIHdpdGggJysnIG9yICctJzogXCIkX1wiLiIpOworICAgICAgICBkaWUoIkZh aWxlZCB0byBmaW5kIHByb3BlcnR5IHZhbHVlIGJlZ2lubmluZyB3aXRoICcrJywgJy0nLCAnTWVy Z2VkJywgb3IgJ1JldmVyc2UtbWVyZ2VkJzogXCIkX1wiLiIpOwogICAgIH0KIAogICAgIHdoaWxl ICg8JGZpbGVIYW5kbGU+KSB7CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5EaWZmRm9vdGVyLnBsCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZVN2bkRp ZmZGb290ZXIucGwJKHJldmlzaW9uIDY2Nzk2KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuRGlmZkZvb3Rlci5wbAkod29ya2luZyBj b3B5KQpAQCAtNjAsNiArNjAsNTUgQEAgdW5kZWZdLAogfSwKIHsKICAgICAjIE5ldyB0ZXN0Cisg ICAgZGlmZk5hbWUgPT4gInNpbXBsZTogYWRkIHN2bjptZXJnZWluZm8iLAorICAgIGlucHV0VGV4 dCA9PiA8PCdFTkQnLAorUHJvcGVydHkgY2hhbmdlcyBvbjogTWFrZWZpbGUKK19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K K0FkZGVkOiBzdm46bWVyZ2VpbmZvCisgICBNZXJnZWQgL3RydW5rL01ha2VmaWxlOnIzMzAyMAor RU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIHByb3BlcnR5UGF0aCA9PiAiTWFr ZWZpbGUiLAorfSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwK K3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gInNpbXBsZTogZGVsZXRlIHN2bjpt ZXJnZWluZm8iLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorUHJvcGVydHkgY2hhbmdlcyBv bjogTWFrZWZpbGUKK19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KK0RlbGV0ZWQ6IHN2bjptZXJnZWluZm8KKyAgIFJldmVy c2UtbWVyZ2VkIC90cnVuay9NYWtlZmlsZTpyMzMwMjAKK0VORAorICAgIGV4cGVjdGVkUmV0dXJu ID0+IFsKK3sKKyAgICBwcm9wZXJ0eVBhdGggPT4gIk1ha2VmaWxlIiwKK30sCit1bmRlZl0sCisg ICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBOZXcgdGVzdAorICAg IGRpZmZOYW1lID0+ICJzaW1wbGU6IG1vZGlmaWVkIHN2bjptZXJnZWluZm8iLAorICAgIGlucHV0 VGV4dCA9PiA8PCdFTkQnLAorUHJvcGVydHkgY2hhbmdlcyBvbjogTWFrZWZpbGUKK19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KK01vZGlmaWVkOiBzdm46bWVyZ2VpbmZvCisgICBSZXZlcnNlLW1lcmdlZCAvdHJ1bmsvTWFr ZWZpbGU6cjMzMDIwCisgICBNZXJnZWQgL3RydW5rL01ha2VmaWxlOnI0MTY5NworRU5ECisgICAg ZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIHByb3BlcnR5UGF0aCA9PiAiTWFrZWZpbGUiLAor fSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAj IE5ldyB0ZXN0CiAgICAgZGlmZk5hbWUgPT4gInNpbXBsZTogZGVsZXRlIHN2bjpleGVjdXRhYmxl IiwKICAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywKIFByb3BlcnR5IGNoYW5nZXMgb246IEZpbGVB CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3Qv cGFyc2VTdm5Qcm9wZXJ0eS5wbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5Qcm9wZXJ0eS5wbAkocmV2aXNpb24g NjY3OTYpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRl c3QvcGFyc2VTdm5Qcm9wZXJ0eS5wbAkod29ya2luZyBjb3B5KQpAQCAtNzMsMTEgKzczLDc3IEBA IEVORAogdW5kZWZdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCiB9LAoreworICAg ICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAic2ltcGxlOiBhZGQgc3ZuOm1lcmdlaW5mbyIs CisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCitBZGRlZDogc3ZuOm1lcmdlaW5mbworICAgTWVy Z2VkIC90cnVuay9NYWtlZmlsZTpyMzMwMjAKK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsK K3sKKyAgICBuYW1lID0+ICJzdm46bWVyZ2VpbmZvIiwKKyAgICBwcm9wZXJ0eUNoYW5nZURlbHRh ID0+IDEsCisgICAgdmFsdWUgPT4gIi90cnVuay9NYWtlZmlsZTpyMzMwMjAiLAorfSwKK3VuZGVm XSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAjIE5ldyB0ZXN0 CisgICAgZGlmZk5hbWUgPT4gInNpbXBsZTogZGVsZXRlIHN2bjptZXJnZWluZm8iLAorICAgIGlu cHV0VGV4dCA9PiA8PCdFTkQnLAorRGVsZXRlZDogc3ZuOm1lcmdlaW5mbworICAgUmV2ZXJzZS1t ZXJnZWQgL3RydW5rL01ha2VmaWxlOnIzMzAyMAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4g WworeworICAgIG5hbWUgPT4gInN2bjptZXJnZWluZm8iLAorICAgIHByb3BlcnR5Q2hhbmdlRGVs dGEgPT4gLTEsCisgICAgdmFsdWUgPT4gIi90cnVuay9NYWtlZmlsZTpyMzMwMjAiLAorfSwKK3Vu ZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAjIE5ldyB0 ZXN0CisgICAgZGlmZk5hbWUgPT4gInNpbXBsZTogbW9kaWZpZWQgc3ZuOm1lcmdlaW5mbyIsCisg ICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCitNb2RpZmllZDogc3ZuOm1lcmdlaW5mbworICAgUmV2 ZXJzZS1tZXJnZWQgL3RydW5rL01ha2VmaWxlOnIzMzAyMAorICAgTWVyZ2VkIC90cnVuay9NYWtl ZmlsZTpyNDE2OTcKK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKK3sKKyAgICBuYW1lID0+ ICJzdm46bWVyZ2VpbmZvIiwKKyAgICBwcm9wZXJ0eUNoYW5nZURlbHRhID0+IDEsCisgICAgdmFs dWUgPT4gIi90cnVuay9NYWtlZmlsZTpyNDE2OTciLAorfSwKK3VuZGVmXSwKKyAgICBleHBlY3Rl ZE5leHRMaW5lID0+IHVuZGVmLAorfSwKICMjIyMKICMgVXNpbmcgU1ZOIDEuNCBzeW50YXgKICMj CiB7CiAgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ICJzaW1wbGU6IG1vZGlmaWVkIHN2 bjptZXJnZWluZm8gdXNpbmcgU1ZOIDEuNCBzeW50YXgiLAorICAgIGlucHV0VGV4dCA9PiA8PCdF TkQnLAorTmFtZTogc3ZuOm1lcmdlaW5mbworICAgUmV2ZXJzZS1tZXJnZWQgL3RydW5rL01ha2Vm aWxlOnIzMzAyMAorICAgTWVyZ2VkIC90cnVuay9NYWtlZmlsZTpyNDE2OTcKK0VORAorICAgIGV4 cGVjdGVkUmV0dXJuID0+IFsKK3sKKyAgICBuYW1lID0+ICJzdm46bWVyZ2VpbmZvIiwKKyAgICBw cm9wZXJ0eUNoYW5nZURlbHRhID0+IDEsCisgICAgdmFsdWUgPT4gIi90cnVuay9NYWtlZmlsZTpy NDE2OTciLAorfSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwK K3sKKyAgICAjIE5ldyB0ZXN0CiAgICAgZGlmZk5hbWUgPT4gInNpbXBsZTogZGVsZXRlIHN2bjpl eGVjdXRhYmxlIHVzaW5nIFNWTiAxLjQgc3ludGF4IiwKICAgICBpbnB1dFRleHQgPT4gPDwnRU5E JywKIE5hbWU6IHN2bjpleGVjdXRhYmxlCkBAIC00NTksNiArNTI1LDQwIEBAIEVORAogIkFkZGVk OiBzdm46ZXhlY3V0YWJsZVxuIl0sCiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiAiICAgKyAqXG4i LAogfSwKK3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gIidNZXJnZWQnIGNoYW5n ZSBmb2xsb3dlZCBieSAnTWVyZ2VkJyBjaGFuZ2UiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQn LAorQWRkZWQ6IHN2bjptZXJnZWluZm8KKyAgIE1lcmdlZCAvdHJ1bmsvTWFrZWZpbGU6cjMzMDIw CisgICBNZXJnZWQgL3RydW5rL01ha2VmaWxlLnNoYXJlZDpyNTgzNTAKK0VORAorICAgIGV4cGVj dGVkUmV0dXJuID0+IFsKK3sKKyAgICBuYW1lID0+ICJzdm46bWVyZ2VpbmZvIiwKKyAgICBwcm9w ZXJ0eUNoYW5nZURlbHRhID0+IDEsCisgICAgdmFsdWUgPT4gIi90cnVuay9NYWtlZmlsZS5zaGFy ZWQ6cjU4MzUwIiwKK30sCit1bmRlZl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwK K30sCit7CisgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ICInUmV2ZXJzZS1tZXJnZWQn IGNoYW5nZSBmb2xsb3dlZCBieSAnUmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSIsCisgICAgaW5wdXRU ZXh0ID0+IDw8J0VORCcsCitEZWxldGVkOiBzdm46bWVyZ2VpbmZvCisgICBSZXZlcnNlLW1lcmdl ZCAvdHJ1bmsvTWFrZWZpbGU6cjMzMDIwCisgICBSZXZlcnNlLW1lcmdlZCAvdHJ1bmsvTWFrZWZp bGUuc2hhcmVkOnI1ODM1MAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIG5h bWUgPT4gInN2bjptZXJnZWluZm8iLAorICAgIHByb3BlcnR5Q2hhbmdlRGVsdGEgPT4gLTEsCisg ICAgdmFsdWUgPT4gIi90cnVuay9NYWtlZmlsZS5zaGFyZWQ6cjU4MzUwIiwKK30sCit1bmRlZl0s CisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCiAjIyMjCiAjIFByb3BlcnR5IHZh bHVlcyB3aXRoIHRyYWlsaW5nIG5ldyBsaW5lcy4KICMjCkluZGV4OiBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5Qcm9wZXJ0eVZhbHVlLnBs Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZVN2blByb3BlcnR5VmFsdWUucGwJKHJldmlzaW9uIDY2Nzk2KQorKysgV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuUHJv cGVydHlWYWx1ZS5wbAkod29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgsMjQgQEAgRU5ECiB9LAog ewogICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiJ01lcmdlZCcgY2hhbmdlIiwKKyAg ICBpbnB1dFRleHQgPT4gPDwnRU5EJywKKyAgIE1lcmdlZCAvdHJ1bmsvTWFrZWZpbGU6cjMzMDIw CitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbIi90cnVuay9NYWtlZmlsZTpyMzMwMjAiLCB1 bmRlZl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBOZXcg dGVzdAorICAgIGRpZmZOYW1lID0+ICInUmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSIsCisgICAgaW5w dXRUZXh0ID0+IDw8J0VORCcsCisgICBSZXZlcnNlLW1lcmdlZCAvdHJ1bmsvTWFrZWZpbGU6cjMz MDIwCitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbIi90cnVuay9NYWtlZmlsZTpyMzMwMjAi LCB1bmRlZl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBO ZXcgdGVzdAogICAgIGRpZmZOYW1lID0+ICJzaW5nbGUtbGluZSAnLScgY2hhbmdlIGZvbGxvd2Vk IGJ5IGVtcHR5IGxpbmUgd2l0aCBVbml4IGxpbmUgZW5kaW5ncyIsCiAgICAgaW5wdXRUZXh0ID0+ IDw8J0VORCcsCiAgICAtICoKQEAgLTE1Miw2ICsxNzAsNDcgQEAgRU5ECiAgICAgZXhwZWN0ZWRS ZXR1cm4gPT4gWyJBXG5sb25nIHNlbnRlbmNlIHRoYXQgc3BhbnNcbm11bHRpcGxlIGxpbmVzLiIs ICIgICArIEFub3RoZXJcbiJdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gImxvbmcgc2VudGVu Y2UgdGhhdCBzcGFuc1xuIiwKIH0sCit7CisgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ ICInUmV2ZXJzZS1tZXJnZWQnIGNoYW5nZSBmb2xsb3dlZCBieSAnTWVyZ2UnIGNoYW5nZSIsCisg ICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCisgICBSZXZlcnNlLW1lcmdlZCAvdHJ1bmsvTWFrZWZp bGU6cjMzMDIwCisgICBNZXJnZWQgL3RydW5rL01ha2VmaWxlOnI0MTY5NworRU5ECisgICAgZXhw ZWN0ZWRSZXR1cm4gPT4gWyIvdHJ1bmsvTWFrZWZpbGU6cjMzMDIwIiwgIiAgIE1lcmdlZCAvdHJ1 bmsvTWFrZWZpbGU6cjQxNjk3XG4iXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAor fSwKK3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gIidNZXJnZWQnIGNoYW5nZSBm b2xsb3dlZCBieSAnTWVyZ2UnIGNoYW5nZSIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCisg ICBNZXJnZWQgL3RydW5rL01ha2VmaWxlOnIzMzAyMAorICAgTWVyZ2VkIC90cnVuay9NYWtlZmls ZS5zaGFyZWQ6cjU4MzUwCitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbIi90cnVuay9NYWtl ZmlsZTpyMzMwMjAiLCAiICAgTWVyZ2VkIC90cnVuay9NYWtlZmlsZS5zaGFyZWQ6cjU4MzUwXG4i XSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAjIE5ldyB0ZXN0 CisgICAgZGlmZk5hbWUgPT4gIidSZXZlcnNlLW1lcmdlZCcgY2hhbmdlIGZvbGxvd2VkIGJ5ICdS ZXZlcnNlLW1lcmdlZCcgY2hhbmdlIiwKKyAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywKKyAgIFJl dmVyc2UtbWVyZ2VkIC90cnVuay9NYWtlZmlsZTpyMzMwMjAKKyAgIFJldmVyc2UtbWVyZ2VkIC90 cnVuay9NYWtlZmlsZS5zaGFyZWQ6cjU4MzUwCitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBb Ii90cnVuay9NYWtlZmlsZTpyMzMwMjAiLCAiICAgUmV2ZXJzZS1tZXJnZWQgL3RydW5rL01ha2Vm aWxlLnNoYXJlZDpyNTgzNTBcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCit9 LAoreworICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiJ1JldmVyc2UtbWVyZ2VkJyBj aGFuZ2UgZm9sbG93ZWQgYnkgJ1JldmVyc2UtbWVyZ2VkJyBjaGFuZ2UgZm9sbG93ZWQgYnkgJ01l cmdlZCcgY2hhbmdlIiwKKyAgICBpbnB1dFRleHQgPT4gPDwnRU5EJywKKyAgIFJldmVyc2UtbWVy Z2VkIC90cnVuay9NYWtlZmlsZTpyMzMwMjAKKyAgIFJldmVyc2UtbWVyZ2VkIC90cnVuay9NYWtl ZmlsZS5zaGFyZWQ6cjU4MzUwCisgICBNZXJnZWQgL3RydW5rL0NoYW5nZUxvZzpyNjQxOTAKK0VO RAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsiL3RydW5rL01ha2VmaWxlOnIzMzAyMCIsICIgICBS ZXZlcnNlLW1lcmdlZCAvdHJ1bmsvTWFrZWZpbGUuc2hhcmVkOnI1ODM1MFxuIl0sCisgICAgZXhw ZWN0ZWROZXh0TGluZSA9PiAiICAgTWVyZ2VkIC90cnVuay9DaGFuZ2VMb2c6cjY0MTkwXG4iLAor fSwKICk7CiAKIG15ICR0ZXN0Q2FzZXNDb3VudCA9IEB0ZXN0Q2FzZUhhc2hSZWZzOwo=