150650 2015-10-28 17:46:44 -0700 svn-apply should handle unified diffs 2015-11-02 10:48:04 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dburkart dburkart commit-queue dbates dburkart ddkilzer lforschler oldest_to_newest 1137381 0 dburkart 2015-10-28 17:46:44 -0700 When trying to apply a unified-style diff with svn-apply, I get this mysterious error: Parsed 0 diffs from patch file(s). No diff found. at /path/to/svn-apply line 126. I suspect that this might be failing due to a slightly different diff heading style than what svn-apply expects. In particular, diff chunks generated by `diff -u` generate headings which immediately start with: ---- a/b/c/d ++++ a/b/c/d Instead of something like: diff --git a/b/c/d index 1234..56787 100644 ---- a/b/c/d ++++ a/b/c/d 1137924 1 264408 dburkart 2015-10-30 12:30:18 -0700 Created attachment 264408 Patch Adds smarts to VCSUtils.pm to be able to apply standard unified patches produced by `diff u`. 1138615 2 dburkart 2015-11-02 10:48:04 -0800 Committed r191900. 264408 2015-10-30 12:30:18 -0700 2015-10-31 15:06:28 -0700 Patch 0001-svn-apply-should-handle-unified-diffs.patch text/plain 13452 dburkart RnJvbSBhOGIzZTdmMmI1MTIxYmIzNTcyN2M5NWM3ZDE0NTcyZDdlMTgwZDI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5hIEJ1cmthcnQgPGRidXJrYXJ0QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAzMCBPY3QgMjAxNSAxMjoyNToyNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIHN2bi1h cHBseSBzaG91bGQgaGFuZGxlIHVuaWZpZWQgZGlmZnMKIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTA2NTAKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBT Y3JpcHRzL1ZDU1V0aWxzLnBtOgoocGFyc2VVbmlmaWVkRGlmZkhlYWRlcik6ClRoaXMgbWV0aG9k IHBhcnNlcyBhIHVuaWZpZWQgZGlmZiBoZWFkZXIsIGFuZCByZXR1cm5zIGEgaW5mb3JtYXRpb24g aW4gdGhlCnN0eWxlIG9mIHBhcnNlR2l0RGlmZkhlYWRlciBhbmQgcGFyc2VTdm5EaWZmSGVhZGVy LgoKKHBhcnNlRGlmZkhlYWRlcik6ClRlYWNoIHBhcnNlRGlmZkhlYWRlciB0byByZWNvZ25pemUg dW5pZmllZCBkaWZmIGhlYWRlcnMuCgoocGFyc2VEaWZmKToKVGVhY2ggcGFyc2VEaWZmIHRvIHJl Y29nbml6ZSB1bmlmaWVkIGRpZmZzLgoKKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5p dHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBsOgoqIFNjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZVVuaWZpZWREaWZmSGVhZGVyLnBsOiBBZGRlZC4KLS0tCiBUb29scy9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAyMSArKysKIFRvb2xz L1NjcmlwdHMvVkNTVXRpbHMucG0gICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTA3ICsrKysr KysrKysrKwogLi4uL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZkhlYWRlci5wbCAgICAgICAg ICAgfCAgMjMgKysrCiAuLi4vVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VVbmlmaWVkRGlmZkhlYWRl ci5wbCAgICB8IDE5MCArKysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMzQx IGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBUb29scy9TY3JpcHRzL3dlYmtpdHBl cmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VVbmlmaWVkRGlmZkhlYWRlci5wbAoKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2MmI0MjFkLi4zODAz YzdlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTUtMTAtMzAgIERhbmEgQnVya2FydCAgPGRidXJrYXJ0QGFwcGxl LmNvbT4KKworICAgICAgICBzdm4tYXBwbHkgc2hvdWxkIGhhbmRsZSB1bmlmaWVkIGRpZmZzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2NTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv VkNTVXRpbHMucG06CisgICAgICAgIChwYXJzZVVuaWZpZWREaWZmSGVhZGVyKToKKyAgICAgICAg VGhpcyBtZXRob2QgcGFyc2VzIGEgdW5pZmllZCBkaWZmIGhlYWRlciwgYW5kIHJldHVybnMgYSBp bmZvcm1hdGlvbiBpbiB0aGUKKyAgICAgICAgc3R5bGUgb2YgcGFyc2VHaXREaWZmSGVhZGVyIGFu ZCBwYXJzZVN2bkRpZmZIZWFkZXIuCisKKyAgICAgICAgKHBhcnNlRGlmZkhlYWRlcik6CisgICAg ICAgIFRlYWNoIHBhcnNlRGlmZkhlYWRlciB0byByZWNvZ25pemUgdW5pZmllZCBkaWZmIGhlYWRl cnMuCisKKyAgICAgICAgKHBhcnNlRGlmZik6CisgICAgICAgIFRlYWNoIHBhcnNlRGlmZiB0byBy ZWNvZ25pemUgdW5pZmllZCBkaWZmcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9W Q1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGw6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlVW5pZmllZERpZmZIZWFkZXIucGw6IEFk ZGVkLgorCiAyMDE1LTEwLTI3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbGVha3MgaW4gZ2VuZXJhdGVXaGl0ZWxpc3QoKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNT VXRpbHMucG0KaW5kZXggZjU0ZTVhZS4uNTQ2MGI5MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9WQ1NVdGlscy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0xMDksNiAr MTA5LDcgQEAgbXkgJHN2blZlcnNpb247CiAjIFByb2plY3QgdGltZSB6b25lIGZvciBDdXBlcnRp bm8sIENBLCBVUwogbXkgJGNoYW5nZUxvZ1RpbWVab25lID0gIlBTVDhQRFQiOwogCitteSAkdW5p ZmllZERpZmZTdGFydFJlZ0V4ID0gcXIjXi0tLSAoW2FiY11cLyk/KFteXHJcbl0rKSM7CiBteSAk Z2l0RGlmZlN0YXJ0UmVnRXggPSBxciNeZGlmZiAtLWdpdCBbXlxyXG5dKyM7CiBteSAkZ2l0RGlm ZlN0YXJ0V2l0aFByZWZpeFJlZ0V4ID0gcXIjXmRpZmYgLS1naXQgXHcvKC4rKSBcdy8oW15cclxu XSspIzsgIyBXZSBzdXBwb3NlIHRoYXQgLS1zcmMtcHJlZml4IGFuZCAtLWRzdC1wcmVmaXggZG9u J3QgY29udGFpbiBhIG5vbi13b3JkIGNoYXJhY3RlciAoXFcpIGFuZCBlbmQgd2l0aCAnLycuCiBt eSAkZ2l0RGlmZlN0YXJ0V2l0aG91dFByZWZpeE5vU3BhY2VSZWdFeCA9IHFyI15kaWZmIC0tZ2l0 IChcUyspIChcUyspJCM7CkBAIC05NDEsNiArOTQyLDEwMyBAQCBzdWIgcGFyc2VTdm5EaWZmSGVh ZGVyKCQkKQogICAgIHJldHVybiAoXCVoZWFkZXIsICRfKTsKIH0KIAorIyBQYXJzZSB0aGUgbmV4 dCBVbmlmaWVkIGRpZmYgaGVhZGVyIGZyb20gdGhlIGdpdmVuIGZpbGUgaGFuZGxlLCBhbmQgYWR2 YW5jZQorIyB0aGUgaGFuZGxlIHNvIHRoZSBsYXN0IGxpbmUgcmVhZCBpcyB0aGUgZmlyc3QgbGlu ZSBhZnRlciB0aGUgaGVhZGVyLgorIworIyBUaGlzIHN1YnJvdXRpbmUgZGllcyBpZiBnaXZlbiBs ZWFkaW5nIGp1bmsuCisjCisjIEFyZ3M6CisjICAgJGZpbGVIYW5kbGU6IGFkdmFuY2VkIHNvIHRo ZSBsYXN0IGxpbmUgcmVhZCBmcm9tIHRoZSBoYW5kbGUgaXMgdGhlIGZpcnN0CisjICAgICAgICAg ICAgICAgIGxpbmUgb2YgdGhlIGhlYWRlciB0byBwYXJzZS4gIFRoaXMgc2hvdWxkIGJlIGEgbGlu ZQorIyAgICAgICAgICAgICAgICBiZWdpbm5pbmcgd2l0aCAiSW5kZXg6Ii4KKyMgICAkbGluZTog dGhlIGxpbmUgbGFzdCByZWFkIGZyb20gJGZpbGVIYW5kbGUKKyMKKyMgUmV0dXJucyAoJGhlYWRl ckhhc2hSZWYsICRsYXN0UmVhZExpbmUpOgorIyAgICRoZWFkZXJIYXNoUmVmOiBhIGhhc2ggcmVm ZXJlbmNlIHJlcHJlc2VudGluZyBhIGRpZmYgaGVhZGVyLCBhcyBmb2xsb3dzLS0KKyMgICAgIGlu ZGV4UGF0aDogdGhlIHBhdGggb2YgdGhlIHRhcmdldCBmaWxlLCB3aGljaCBpcyB0aGUgcGF0aCBm b3VuZCBpbgorIyAgICAgICAgICAgICAgICB0aGUgIkluZGV4OiIgbGluZS4KKyMgICAgIGlzTmV3 OiB0aGUgdmFsdWUgMSBpZiB0aGUgZGlmZiBpcyBmb3IgYSBuZXcgZmlsZS4KKyMgICAgIGlzRGVs ZXRpb246IHRoZSB2YWx1ZSAxIGlmIHRoZSBkaWZmIGlzIGEgZmlsZSBkZWxldGlvbi4KKyMgICAg IHN2bkNvbnZlcnRlZFRleHQ6IHRoZSBoZWFkZXIgdGV4dCBjb252ZXJ0ZWQgdG8gYSBoZWFkZXIg d2l0aCB0aGUgcGF0aHMKKyMgICAgICAgICAgICAgICAgICAgICAgIGluIHNvbWUgbGluZXMgY29y cmVjdGVkLgorIyAgICRsYXN0UmVhZExpbmU6IHRoZSBsaW5lIGxhc3QgcmVhZCBmcm9tICRmaWxl SGFuZGxlLgorc3ViIHBhcnNlVW5pZmllZERpZmZIZWFkZXIoJCQpCit7CisgICAgbXkgKCRmaWxl SGFuZGxlLCAkbGluZSkgPSBAXzsKKworICAgICRfID0gJGxpbmU7CisKKyAgICBteSAkY3VycmVu dFBvc2l0aW9uID0gdGVsbCgkZmlsZUhhbmRsZSk7CisgICAgbXkgJGluZGV4TGluZTsKKyAgICBt eSAkaW5kZXhQYXRoOworICAgIGlmICgvJHVuaWZpZWREaWZmU3RhcnRSZWdFeC8pIHsKKyAgICAg ICAgIyBVc2UgJFBPU1RNQVRDSCB0byBwcmVzZXJ2ZSB0aGUgZW5kLW9mLWxpbmUgY2hhcmFjdGVy LgorICAgICAgICBteSAkZW9sID0gJFBPU1RNQVRDSDsKKyAgICAgICAgCisgICAgICAgICRpbmRl eFBhdGggPSAkMjsKKworICAgICAgICAjIEluIHRoZSBjYXNlIG9mIGFuIGFkZGl0aW9uLCB3ZSBs b29rIGF0IHRoZSBuZXh0IGxpbmUgZm9yIHRoZSBpbmRleCBwYXRoCisgICAgICAgIGlmICgkaW5k ZXhQYXRoIGVxICIvZGV2L251bGwiKSB7CisgICAgICAgICAgICAkXyA9IDwkZmlsZUhhbmRsZT47 CisgICAgICAgICAgICBpZiAoL15cK1wrXCsgKFthYmNdXC8pPyhbXlx0XG5ccl0rKS8pIHsKKyAg ICAgICAgICAgICAgICAkaW5kZXhQYXRoID0gJDI7CisgICAgICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgICAgIGRpZSAiVW5yZWNvZ25pemVkIHVuaWZpZWQgZGlmZiBmb3JtYXQuIjsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICRfID0gJGxpbmU7CisgICAgICAgIH0KKworICAgICAg ICAkaW5kZXhMaW5lID0gIkluZGV4OiAkaW5kZXhQYXRoJGVvbCI7ICMgQ29udmVydCB0byBTVk4g Zm9ybWF0LgorICAgIH0gZWxzZSB7CisgICAgICAgIGRpZSgiQ291bGQgbm90IHBhcnNlIGxlYWRp bmcgXCItLS1cIiBsaW5lOiBcIiRsaW5lXCIuIik7CisgICAgfQorCisgICAgc2VlaygkZmlsZUhh bmRsZSwgJGN1cnJlbnRQb3NpdGlvbiwgMCk7CisKKyAgICBteSAkaXNEZWxldGlvbjsKKyAgICBt eSAkaXNIZWFkZXJFbmRpbmc7CisgICAgbXkgJGlzTmV3OworICAgIG15ICRzdm5Db252ZXJ0ZWRU ZXh0ID0gJGluZGV4TGluZTsKKyAgICB3aGlsZSAoMSkgeworICAgICAgICAjIFRlbXBvcmFyaWx5 IHN0cmlwIG9mZiBhbnkgZW5kLW9mLWxpbmUgY2hhcmFjdGVycyB0byBzaW1wbGlmeQorICAgICAg ICAjIHJlZ2V4IG1hdGNoaW5nIGJlbG93LgorICAgICAgICBzLyhbXG5ccl0rKSQvLzsKKyAgICAg ICAgbXkgJGVvbCA9ICQxOworICAgICAgICAKKyAgICAgICAgaWYgKC9eLS0tIFwvZGV2XC9udWxs LykgeworICAgICAgICAgICAgJGlzTmV3ID0gMTsKKyAgICAgICAgfSBlbHNpZiAoL15cK1wrXCsg XC9kZXZcL251bGwvKSB7CisgICAgICAgICAgICAkaXNEZWxldGlvbiA9IDE7CisgICAgICAgIH0K KyAgICAgICAgCisgICAgICAgIGlmICgvXigtLS18XCtcK1wrKSAoW2FiY11cLyk/KFteXHRcblxy XSspLykgeworICAgICAgICAgICAgaWYgKCQxIGVxICItLS0iKSB7CisgICAgICAgICAgICAgICAg bXkgJHByZXBlbmRUZXh0ID0gIiI7CisgICAgICAgICAgICAgICAgJHByZXBlbmRUZXh0ID0gIm5l dyBmaWxlIG1vZGUgMTAwNjQ0XG4iIGlmICRpc05ldzsKKyAgICAgICAgICAgICAgICAkXyA9ICIk e3ByZXBlbmRUZXh0fWluZGV4IDAwMDAwMDAuLjAwMDAwMDBcbiQxICQzIjsKKyAgICAgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICAgICAgJF8gPSAiJDEgJDMiOworICAgICAgICAgICAgICAg ICRpc0hlYWRlckVuZGluZyA9IDE7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgICRzdm5Db252ZXJ0ZWRUZXh0IC49ICIkXyRlb2wiOyAjIEFsc28gcmVzdG9yZSBl bmQtb2YtbGluZSBjaGFyYWN0ZXJzLgorICAgICAgICAKKyAgICAgICAgJGN1cnJlbnRQb3NpdGlv biA9IHRlbGwoJGZpbGVIYW5kbGUpOworICAgICAgICAkXyA9IDwkZmlsZUhhbmRsZT47ICMgTm90 IGRlZmluZWQgaWYgZW5kLW9mLWZpbGUgcmVhY2hlZC4KKyAgICAgICAgbGFzdCBpZiAoIWRlZmlu ZWQoJF8pIHx8IC8kdW5pZmllZERpZmZTdGFydFJlZ0V4LyB8fCAkaXNIZWFkZXJFbmRpbmcpOwor ICAgIH0KKyAgICAKKyAgICBteSAlaGVhZGVyOworICAgIAorICAgICRoZWFkZXJ7aW5kZXhQYXRo fSA9ICRpbmRleFBhdGg7CisgICAgJGhlYWRlcntpc0RlbGV0aW9ufSA9ICRpc0RlbGV0aW9uIGlm ICRpc0RlbGV0aW9uOworICAgICRoZWFkZXJ7aXNOZXd9ID0gJGlzTmV3IGlmICRpc05ldzsKKyAg ICAkaGVhZGVye3N2bkNvbnZlcnRlZFRleHR9ID0gJHN2bkNvbnZlcnRlZFRleHQ7CisKKyAgICBy ZXR1cm4gKFwlaGVhZGVyLCAkXyk7Cit9CisKICMgUGFyc2UgdGhlIG5leHQgZGlmZiBoZWFkZXIg ZnJvbSB0aGUgZ2l2ZW4gZmlsZSBoYW5kbGUsIGFuZCBhZHZhbmNlCiAjIHRoZSBoYW5kbGUgc28g dGhlIGxhc3QgbGluZSByZWFkIGlzIHRoZSBmaXJzdCBsaW5lIGFmdGVyIHRoZSBoZWFkZXIuCiAj CkBAIC05NzksNiArMTA3Nyw3IEBAIHN1YiBwYXJzZURpZmZIZWFkZXIoJCQpCiAgICAgbXkgJGhl YWRlcjsgICMgVGhpcyBpcyBhIGhhc2ggcmVmLgogICAgIG15ICRpc0dpdDsKICAgICBteSAkaXNT dm47CisgICAgbXkgJGlzVW5pZmllZDsKICAgICBteSAkbGFzdFJlYWRMaW5lOwogCiAgICAgaWYg KCRsaW5lID1+ICRzdm5EaWZmU3RhcnRSZWdFeCkgewpAQCAtOTg3LDEyICsxMDg2LDE2IEBAIHN1 YiBwYXJzZURpZmZIZWFkZXIoJCQpCiAgICAgfSBlbHNpZiAoJGxpbmUgPX4gJGdpdERpZmZTdGFy dFJlZ0V4KSB7CiAgICAgICAgICRpc0dpdCA9IDE7CiAgICAgICAgICgkaGVhZGVyLCAkbGFzdFJl YWRMaW5lKSA9IHBhcnNlR2l0RGlmZkhlYWRlcigkZmlsZUhhbmRsZSwgJGxpbmUpOworICAgIH0g ZWxzaWYgKCRsaW5lID1+ICR1bmlmaWVkRGlmZlN0YXJ0UmVnRXgpIHsKKyAgICAgICAgJGlzVW5p ZmllZCA9IDE7CisgICAgICAgICgkaGVhZGVyLCAkbGFzdFJlYWRMaW5lKSA9IHBhcnNlVW5pZmll ZERpZmZIZWFkZXIoJGZpbGVIYW5kbGUsICRsaW5lKTsKICAgICB9IGVsc2UgewogICAgICAgICBk aWUoIkZpcnN0IGxpbmUgb2YgZGlmZiBkb2VzIG5vdCBiZWdpbiB3aXRoIFwiSW5kZXg6XCIgb3Ig XCJkaWZmIC0tZ2l0XCI6IFwiJGxpbmVcIiIpOwogICAgIH0KIAogICAgICRoZWFkZXItPntpc0dp dH0gPSAkaXNHaXQgaWYgJGlzR2l0OwogICAgICRoZWFkZXItPntpc1N2bn0gPSAkaXNTdm4gaWYg JGlzU3ZuOworICAgICRoZWFkZXItPntpc1VuaWZpZWR9ID0gJGlzVW5pZmllZCBpZiAkaXNVbmlm aWVkOwogCiAgICAgcmV0dXJuICgkaGVhZGVyLCAkbGFzdFJlYWRMaW5lKTsKIH0KQEAgLTEwNzcs NiArMTE4MCwxMCBAQCBzdWIgcGFyc2VEaWZmKCQkOyQpCiAgICAgICAgICAgICAjIGFsbCBkaWZm cyBpbiB0aGUgcGF0Y2ggYXJlIGZvcm1hdHRlZCB0aGUgc2FtZSAoU1ZOIG9yIEdpdCkuCiAgICAg ICAgICAgICAkaGVhZGVyU3RhcnRSZWdFeCA9ICRnaXREaWZmU3RhcnRSZWdFeDsKICAgICAgICAg fQorICAgICAgICAKKyAgICAgICAgaWYgKCEkaGVhZGVySGFzaFJlZiAmJiAoJGxpbmUgPX4gJHVu aWZpZWREaWZmU3RhcnRSZWdFeCkpIHsKKyAgICAgICAgICAgICRoZWFkZXJTdGFydFJlZ0V4ID0g JHVuaWZpZWREaWZmU3RhcnRSZWdFeDsKKyAgICAgICAgfQogCiAgICAgICAgIGlmICgkbGluZSA9 fiAkc3ZuUHJvcGVydGllc1N0YXJ0UmVnRXgpIHsKICAgICAgICAgICAgIG15ICRwcm9wZXJ0eVBh dGggPSAkMTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGwgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBsCmluZGV4IDFlZDBmZDIuLmMyM2UwMDAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9w YXJzZURpZmZIZWFkZXIucGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxz X3VuaXR0ZXN0L3BhcnNlRGlmZkhlYWRlci5wbApAQCAtOTksNiArOTksMjkgQEAgRU5ECiB1bmRl Zl0sCiAgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKIH0sCisjIyMjCisjICAgIFVuaWZp ZWQgcGF0Y2ggY2FzZXMKKyMjCit7CisgICAgZGlmZk5hbWUgPT4gIlVuaWZpZWQ6IE1vZGlmaWVk IGZpbGUiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorLS0tIEZvby9iYXIuaAorKysrIEZv by9iYXIuaAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIHN2bkNvbnZlcnRl ZFRleHQgPT4gPDwnRU5EJywKK0luZGV4OiBGb28vYmFyLmgKK2luZGV4IDAwMDAwMDAuLjAwMDAw MDAKKy0tLSBGb28vYmFyLmgKKysrKyBGb28vYmFyLmgKK0VORAorICAgIGluZGV4UGF0aCA9PiAn Rm9vL2Jhci5oJywKKyAgICBpc1VuaWZpZWQgPT4gMSwKK30sCit1bmRlZl0sCisgICAgZXhwZWN0 ZWROZXh0TGluZSA9PiB1bmRlZiwKK30KICk7CiAKIG15ICR0ZXN0Q2FzZXNDb3VudCA9IEB0ZXN0 Q2FzZUhhc2hSZWZzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0 aWxzX3VuaXR0ZXN0L3BhcnNlVW5pZmllZERpZmZIZWFkZXIucGwgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VVbmlmaWVkRGlmZkhlYWRlci5wbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMjMyMmQyCi0tLSAvZGV2L251bGwKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlVW5pZmll ZERpZmZIZWFkZXIucGwKQEAgLTAsMCArMSwxOTAgQEAKKyMhL3Vzci9iaW4vcGVybCAtdworIwor IyBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMK KyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBD T05UUklCVVRPUlMgYGBBUyBJUycnIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorIyBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUwor IyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRV VEUgR09PRFMgT1IgU0VSVklDRVM7CisjIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTgorIyBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUworIyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIyBVbml0IHRlc3RzIGZv ciBwYXJzZVVuaWZpZWREaWZmSGVhZGVyKCkKKwordXNlIHN0cmljdDsKK3VzZSB3YXJuaW5nczsK KwordXNlIFRlc3Q6Ok1vcmU7Cit1c2UgVkNTVXRpbHM7CisKK215IEB0ZXN0Q2FzZUhhc2hSZWZz ID0gKAoreworICAgIGRpZmZOYW1lID0+ICJNb2RpZmllZCBmaWxlIiwKKyAgICBpbnB1dFRleHQg PT4gPDwnRU5EJywKKy0tLSBGb28vYmFyLmgKKysrKyBGb28vYmFyLmgKK0BAIC0zMDQsNiArMzA0 LDYgQEAgdm9pZCBzb21lS2luZE9mRnVuY3Rpb24oKQorbGVhZGluZwordGV4dAorY29udGV4dAor LWZpbGUgY29udGVudHMKKytuZXcgZmlsZSBjb250ZW50cwordHJhaWxpbmcKK3RleHRjb250ZXh0 CitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbCisgICAgeworICAgICAgICBzdm5Db252ZXJ0 ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogRm9vL2Jhci5oCitpbmRleCAwMDAwMDAwLi4wMDAw MDAwCistLS0gRm9vL2Jhci5oCisrKysgRm9vL2Jhci5oCitFTkQKKyAgICAgICAgaW5kZXhQYXRo ID0+ICdGb28vYmFyLmgnLAorICAgIH0sCisgICAgIkBAIC0zMDQsNiArMzA0LDYgQEAgdm9pZCBz b21lS2luZE9mRnVuY3Rpb24oKVxuIl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiAibGVhZGlu Z1xuIiwKK30sCit7CisgICAgZGlmZk5hbWUgPT4gIk1vZGlmaWVkIGZpbGUgd2l0aCBzcGFjZXMg aW4gbmFtZSIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCistLS0gRm9vL2JhciBiYXouaAor KysrIEZvby9iYXIgYmF6LmgKK0BAIC0zMDQsNiArMzA0LDYgQEAgdm9pZCBzb21lS2luZE9mRnVu Y3Rpb24oKQorbGVhZGluZwordGV4dAorY29udGV4dAorLWZpbGUgY29udGVudHMKKytuZXcgZmls ZSBjb250ZW50cwordHJhaWxpbmcKK3RleHRjb250ZXh0CitFTkQKKyAgICBleHBlY3RlZFJldHVy biA9PiBbCisgICAgeworICAgICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRl eDogRm9vL2JhciBiYXouaAoraW5kZXggMDAwMDAwMC4uMDAwMDAwMAorLS0tIEZvby9iYXIgYmF6 LmgKKysrKyBGb28vYmFyIGJhei5oCitFTkQKKyAgICAgICAgaW5kZXhQYXRoID0+ICdGb28vYmFy IGJhei5oJywKKyAgICB9LAorICAgICJAQCAtMzA0LDYgKzMwNCw2IEBAIHZvaWQgc29tZUtpbmRP ZkZ1bmN0aW9uKClcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gImxlYWRpbmdcbiIsCit9 LAoreworICAgIGRpZmZOYW1lID0+ICJNb2RpZmllZCBmaWxlIHdpdGggZ2l0LXN0eWxlIGluZGlj ZXMiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorLS0tIGEvRm9vL2Jhci5oCisrKysgYi9G b28vYmFyLmgKK0BAIC0zMDQsNiArMzA0LDYgQEAgdm9pZCBzb21lS2luZE9mRnVuY3Rpb24oKQor bGVhZGluZwordGV4dAorY29udGV4dAorLWZpbGUgY29udGVudHMKKytuZXcgZmlsZSBjb250ZW50 cwordHJhaWxpbmcKK3RleHRjb250ZXh0CitFTkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbCisg ICAgeworICAgICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogRm9vL2Jh ci5oCitpbmRleCAwMDAwMDAwLi4wMDAwMDAwCistLS0gRm9vL2Jhci5oCisrKysgRm9vL2Jhci5o CitFTkQKKyAgICAgICAgaW5kZXhQYXRoID0+ICdGb28vYmFyLmgnLAorICAgIH0sCisgICAgIkBA IC0zMDQsNiArMzA0LDYgQEAgdm9pZCBzb21lS2luZE9mRnVuY3Rpb24oKVxuIl0sCisgICAgZXhw ZWN0ZWROZXh0TGluZSA9PiAibGVhZGluZ1xuIiwKK30sCit7CisgICAgZGlmZk5hbWUgPT4gIkFk ZGVkIGZpbGUiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorLS0tIC9kZXYvbnVsbAorKysr IEZvby9iYXIuaAorQEAgLTAsMCArMSw2IEBACisrbGVhZGluZworK3RleHQKKytjb250ZXh0Cisr bmV3IGZpbGUgY29udGVudHMKKyt0cmFpbGluZworK3RleHRjb250ZXh0CitFTkQKKyAgICBleHBl Y3RlZFJldHVybiA9PiBbCisgICAgeworICAgICAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VO RCcsCitJbmRleDogRm9vL2Jhci5oCituZXcgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMDAwMDAw MC4uMDAwMDAwMAorLS0tIC9kZXYvbnVsbAorKysrIEZvby9iYXIuaAorRU5ECisgICAgICAgIGlu ZGV4UGF0aCA9PiAnRm9vL2Jhci5oJywKKyAgICAgICAgaXNOZXcgPT4gMSwKKyAgICB9LAorICAg ICJAQCAtMCwwICsxLDYgQEBcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gIitsZWFkaW5n XG4iLAorfSwKK3sKKyAgICBkaWZmTmFtZSA9PiAiUmVtb3ZlZCBmaWxlIiwKKyAgICBpbnB1dFRl eHQgPT4gPDwnRU5EJywKKy0tLSBGb28vYmFyLmgKKysrKyAvZGV2L251bGwKK0BAIC0wLDAgKzEs NiBAQAorLWxlYWRpbmcKKy10ZXh0CistY29udGV4dAorLW5ldyBmaWxlIGNvbnRlbnRzCistdHJh aWxpbmcKKy10ZXh0Y29udGV4dAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWworICAgIHsK KyAgICAgICAgc3ZuQ29udmVydGVkVGV4dCA9PiA8PCdFTkQnLAorSW5kZXg6IEZvby9iYXIuaAor aW5kZXggMDAwMDAwMC4uMDAwMDAwMAorLS0tIEZvby9iYXIuaAorKysrIC9kZXYvbnVsbAorRU5E CisgICAgICAgIGluZGV4UGF0aCA9PiAnRm9vL2Jhci5oJywKKyAgICAgICAgaXNEZWxldGlvbiA9 PiAxLAorICAgIH0sCisgICAgIkBAIC0wLDAgKzEsNiBAQFxuIl0sCisgICAgZXhwZWN0ZWROZXh0 TGluZSA9PiAiLWxlYWRpbmdcbiIsCit9LAorKTsKKworCitteSAkdGVzdENhc2VzQ291bnQgPSBA dGVzdENhc2VIYXNoUmVmczsKK3BsYW4odGVzdHMgPT4gMiAqICR0ZXN0Q2FzZXNDb3VudCk7ICMg VG90YWwgbnVtYmVyIG9mIGFzc2VydGlvbnMuCisKK2ZvcmVhY2ggbXkgJHRlc3RDYXNlIChAdGVz dENhc2VIYXNoUmVmcykgeworICAgIG15ICR0ZXN0TmFtZVN0YXJ0ID0gInBhcnNlVW5pZmllZERp ZmZIZWFkZXIoKTogJHRlc3RDYXNlLT57ZGlmZk5hbWV9OiBjb21wYXJpbmciOworCisgICAgbXkg JGZpbGVIYW5kbGU7CisgICAgb3BlbigkZmlsZUhhbmRsZSwgIjwiLCBcJHRlc3RDYXNlLT57aW5w dXRUZXh0fSk7CisgICAgbXkgJGxpbmUgPSA8JGZpbGVIYW5kbGU+OworCisgICAgbXkgQGdvdCA9 IFZDU1V0aWxzOjpwYXJzZVVuaWZpZWREaWZmSGVhZGVyKCRmaWxlSGFuZGxlLCAkbGluZSk7Cisg ICAgbXkgJGV4cGVjdGVkUmV0dXJuID0gJHRlc3RDYXNlLT57ZXhwZWN0ZWRSZXR1cm59OworCisg ICAgaXNfZGVlcGx5KFxAZ290LCAkZXhwZWN0ZWRSZXR1cm4sICIkdGVzdE5hbWVTdGFydCByZXR1 cm4gdmFsdWUuIik7CisKKyAgICBteSAkZ290TmV4dExpbmUgPSA8JGZpbGVIYW5kbGU+OworICAg IGlzKCRnb3ROZXh0TGluZSwgJHRlc3RDYXNlLT57ZXhwZWN0ZWROZXh0TGluZX0sICAiJHRlc3RO YW1lU3RhcnQgbmV4dCByZWFkIGxpbmUuIik7Cit9Ci0tIAoyLjQuNyAoQXBwbGUgR2l0LTU5KQoK