135527 2014-08-01 15:55:40 -0700 commit-log-editor uses a non-standard message format when git index contains no ChangeLog changes 2014-08-01 16:11:21 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz simon.fraser thorton oldest_to_newest 1026370 0 mitz 2014-08-01 15:55:40 -0700 In a git repository, if the git index contains no changes to ChanegLog files, commit-log-editor prepares a commit message that is straight prepare-ChangeLog output, including 8-space indentation and date + author headers. 1026377 1 235918 mitz 2014-08-01 16:05:23 -0700 Created attachment 235918 Apply commit message formatting to prepared ChangeLog entries 1026378 2 235918 thorton 2014-08-01 16:06:57 -0700 Comment on attachment 235918 Apply commit message formatting to prepared ChangeLog entries View in context: https://bugs.webkit.org/attachment.cgi?id=235918&action=review > Tools/ChangeLog:10 > + the --delimiters option the prepare-ChangeLog, then process each entry in the output using s/the/to/? 1026383 3 mitz 2014-08-01 16:10:36 -0700 (In reply to comment #2) > (From update of attachment 235918 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=235918&action=review > > > Tools/ChangeLog:10 > > + the --delimiters option the prepare-ChangeLog, then process each entry in the output using > > s/the/to/? Yes! 1026384 4 mitz 2014-08-01 16:11:21 -0700 Fixed in <http://trac.webkit.org/r171954>. 235918 2014-08-01 16:05:23 -0700 2014-08-01 16:06:57 -0700 Apply commit message formatting to prepared ChangeLog entries bug-135527-20140801160511.patch text/plain 13009 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MTk1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE0LTA4LTAxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgY29tbWl0LWxvZy1lZGl0b3IgdXNlcyBhIG5vbi1zdGFuZGFyZCBtZXNzYWdlIGZv cm1hdCB3aGVuIGdpdCBpbmRleCBjb250YWlucyBubyBDaGFuZ2VMb2cgY2hhbmdlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NTI3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvbW1p dC1sb2ctZWRpdG9yOgorICAgICAgICBJbiB0aGUgY2FzZSBvZiBhIGdpdCByZXBvc2l0b3J5IHdo ZW4gdGhlcmUgYXJlIG5vIGNoYW5nZWQgQ2hhbmdlTG9nIGZpbGVzLCBjaGFuZ2VkIHRvIHBhc3MK KyAgICAgICAgdGhlIC0tZGVsaW1pdGVycyBvcHRpb24gdGhlIHByZXBhcmUtQ2hhbmdlTG9nLCB0 aGVuIHByb2Nlc3MgZWFjaCBlbnRyeSBpbiB0aGUgb3V0cHV0IHVzaW5nCisgICAgICAgIGNvbW1p dE1lc3NhZ2VGcm9tQ2hhbmdlTG9nRW50cnkuCisgICAgICAgIChjb21taXRNZXNzYWdlRnJvbUNo YW5nZUxvZ0VudHJ5KTogRmFjdG9yZWQgb3V0IGZyb20gY3JlYXRlQ29tbWl0TWVzc2FnZS4KKyAg ICAgICAgKHNvcnRLZXkpOiBGYWN0b3JlZCBvdXQgZnJvbSBjcmVhdGVDb21taXRNZXNzYWdlLgor ICAgICAgICAoY3JlYXRlQ29tbWl0TWVzc2FnZSk6IENoYW5nZWQgdG8gdXNlIG5ldyBzb3J0S2V5 IGFuZCBjb21taXRNZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5CisgICAgICAgIHN1YnJvdXRpbmVz LgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKG1haW4p OiBQYXJzZSBuZXcgLS1kZWxpbWl0ZXJzIG9wdGlvbi4KKyAgICAgICAgKGdlbmVyYXRlTmV3Q2hh bmdlTG9ncyk6IFdoZW4gLS1uby13cml0ZSBhbmQgLS1kZWxpbWl0ZXJzIGFyZSBib3RoIHNwZWNp ZmllZCwgYWx3YXlzIHByaW50CisgICAgICAgIHRoZSBsYWJlbCBiZWZvcmUgZWFjaCBjaGFuZ2Ug bG9nIGVudHJ5LCBhbmQgYSAifiIgZGVsaW1pdGVyIG9uIGEgbmV3IGxpbmUgYWZ0ZXIgZWFjaCBl bnRyeS4KKwogMjAxNC0wOC0wMSAgQmVhciBUcmF2aXMgIDxiZXRyYXZpc0BhZG9iZS5jb20+CiAK ICAgICAgICAgW0ZlYXR1cmUgUXVlcmllc10gRW5hYmxlIEZlYXR1cmUgUXVlcmllcyBvbiBFRkwv R1RLCkluZGV4OiBUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IJKHJldmlzaW9uIDE3MTkzNCkKKysrIFRv b2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4 LDggQEAgdXNlIGxpYiAkRmluZEJpbjo6QmluOwogdXNlIFZDU1V0aWxzOwogdXNlIHdlYmtpdGRp cnM7CiAKK3N1YiBjb21taXRNZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5KCQpOworc3ViIHNvcnRL ZXkoJCk7CiBzdWIgY3JlYXRlQ29tbWl0TWVzc2FnZShAKTsKIHN1YiBsb2FkVGVybVJlYWRLZXko KTsKIHN1YiBub3JtYWxpemVMaW5lRW5kaW5ncygkJCk7CkBAIC0xNzYsMTEgKzE3OCwzNCBAQCBp ZiAoaXNHaXQoKSAmJiBAY2hhbmdlTG9ncyA9PSAwKSB7CiAgICAgICAgIGNob21wKCR3ZWJraXRH ZW5lcmF0ZUNvbW1pdE1lc3NhZ2UgPSBgZ2l0IGNvbmZpZyAtLWJvb2wgY29yZS53ZWJraXRHZW5l cmF0ZUNvbW1pdE1lc3NhZ2VgKTsKICAgICB9CiAgICAgaWYgKCR3ZWJraXRHZW5lcmF0ZUNvbW1p dE1lc3NhZ2UgbmUgImZhbHNlIikgewotICAgICAgICBvcGVuIENIQU5HRUxPR19FTlRSSUVTLCAi LXwiLCAiJEZpbmRCaW46OkJpbi9wcmVwYXJlLUNoYW5nZUxvZyAtLWdpdC1pbmRleCAtLW5vLXdy aXRlIC0tbm8tc3R5bGUiIG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5cbiI7 Ci0gICAgICAgIHdoaWxlICg8Q0hBTkdFTE9HX0VOVFJJRVM+KSB7Ci0gICAgICAgICAgICBwcmlu dCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoJF8sICRlbmRsKTsKKyAgICAgICAgbXkgJWNo YW5nZUxvZ1NvcnQ7CisgICAgICAgIG15ICVjaGFuZ2VMb2dDb250ZW50czsKKyAgICAgICAgb3Bl biBteSAkY2hhbmdlTG9nRW50cmllcywgIi18IiwgIiRGaW5kQmluOjpCaW4vcHJlcGFyZS1DaGFu Z2VMb2cgLS1naXQtaW5kZXggLS1uby13cml0ZSAtLW5vLXN0eWxlIC0tZGVsaW1pdGVycyIgb3Ig ZGllICJwcmVwYXJlLUNoYW5nZUxvZyBmYWlsZWQ6ICQhLlxuIjsKKworICAgICAgICB3aGlsZSAo IWVvZigkY2hhbmdlTG9nRW50cmllcykpIHsKKyAgICAgICAgICAgIG15ICRsYWJlbCA9IDwkY2hh bmdlTG9nRW50cmllcz47CisgICAgICAgICAgICBjaG9tcCAkbGFiZWw7CisgICAgICAgICAgICAk bGFiZWwgPX4gcy86JC8vOworICAgICAgICAgICAgKCRjaGFuZ2VMb2dDb250ZW50c3skbGFiZWx9 KSA9IGNvbW1pdE1lc3NhZ2VGcm9tQ2hhbmdlTG9nRW50cnkoJGNoYW5nZUxvZ0VudHJpZXMpOwor ICAgICAgICAgICAgJGNoYW5nZUxvZ1NvcnR7c29ydEtleSgkbGFiZWwpfSA9ICRsYWJlbDsKICAg ICAgICAgfQotICAgICAgICBjbG9zZSBDSEFOR0VMT0dfRU5UUklFUzsKKyAgICAgICAgY2xvc2Ug JGNoYW5nZUxvZ0VudHJpZXM7CisKKyAgICAgICAgbXkgJGNvbW1vblByZWZpeCA9IHJlbW92ZUxv bmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoJWNoYW5nZUxvZ0NvbnRlbnRzKTsKKwor ICAgICAgICBteSBAcmVzdWx0OworICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVF bmRpbmdzKCRjb21tb25QcmVmaXgsICRlbmRsKTsKKyAgICAgICAgZm9yIG15ICRzb3J0S2V5IChz b3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKKyAgICAgICAgICAgIG15ICRsYWJlbCA9ICRjaGFu Z2VMb2dTb3J0eyRzb3J0S2V5fTsKKyAgICAgICAgICAgIG5leHQgaWYgKCRjaGFuZ2VMb2dDb250 ZW50c3skbGFiZWx9IGVxICJcbiIpOworICAgICAgICAgICAgaWYgKGtleXMgJWNoYW5nZUxvZ1Nv cnQgPiAxKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5k aW5ncygiXG4iLCAkZW5kbCk7CisgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxp emVMaW5lRW5kaW5ncygiJGxhYmVsOiAiLCAkZW5kbCk7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50 c3skbGFiZWx9LCAkZW5kbCk7CisgICAgICAgIH0KKworICAgICAgICBwcmludCBORVdMT0cgam9p biAnJywgQHJlc3VsdDsKICAgICB9CiB9IGVsc2UgewogICAgIHByaW50IE5FV0xPRyBjcmVhdGVD b21taXRNZXNzYWdlKEBjaGFuZ2VMb2dzKTsKQEAgLTIwOSw2ICsyMzQsNzcgQEAgaWYgKCRmb3Vu ZENvbW1lbnQpIHsKIAogdW5saW5rICIkbG9nLmVkaXQiOwogCitzdWIgY29tbWl0TWVzc2FnZUZy b21DaGFuZ2VMb2dFbnRyeSgkKQoreworICAgIG15ICgkY2hhbmdlTG9nKSA9IEBfOworCisgICAg bXkgJGNvbW1pdE1lc3NhZ2UgPSAiIjsKKyAgICBteSAkYmxhbmtMaW5lcyA9ICIiOworICAgIG15 ICRsaW5lQ291bnQgPSAwOworICAgIG15ICRkYXRlID0gIiI7CisgICAgbXkgJGF1dGhvciA9ICIi OworICAgIG15ICRlbWFpbCA9ICIiOworICAgIG15ICRoYXNBdXRob3JJbmZvVG9Xcml0ZSA9IDA7 CisKKyAgICB3aGlsZSAoPCRjaGFuZ2VMb2c+KSB7CisgICAgICAgIGlmICgvXlxTLykgeworICAg ICAgICAgICAgbGFzdCBpZiAkY29tbWl0TWVzc2FnZTsKKyAgICAgICAgfQorICAgICAgICBpZiAo L1xTLykgeworICAgICAgICAgICAgJGNvbW1pdE1lc3NhZ2UgLj0gJGJsYW5rTGluZXMgaWYgJGNv bW1pdE1lc3NhZ2U7CisgICAgICAgICAgICAkYmxhbmtMaW5lcyA9ICIiOworCisgICAgICAgICAg ICBteSAkbGluZSA9ICRfOworICAgICAgICAgICAgIyBSZW1vdmUgaW5kZW50YXRpb24gc3BhY2Vz CisgICAgICAgICAgICAkbGluZSA9fiBzL14gezh9Ly87CisKKyAgICAgICAgICAgICMgR3JhYiB0 aGUgYXV0aG9yIGFuZCB0aGUgZGF0ZSBsaW5lCisgICAgICAgICAgICBpZiAoJGxpbmUgPX4gbS9e KFswLTldezR9LVswLTldezJ9LVswLTldezJ9KVxzKyguKlteXHNdKVxzKzwoLiopPi8gJiYgJGxp bmVDb3VudCA9PSAwKSB7CisgICAgICAgICAgICAgICAgJGRhdGUgPSAkMTsKKyAgICAgICAgICAg ICAgICAkYXV0aG9yID0gJDI7CisgICAgICAgICAgICAgICAgJGVtYWlsID0gJDM7CisgICAgICAg ICAgICAgICAgJGhhc0F1dGhvckluZm9Ub1dyaXRlID0gMTsKKyAgICAgICAgICAgICAgICBuZXh0 OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoJGhhc0F1dGhvckluZm9Ub1dyaXRl KSB7CisgICAgICAgICAgICAgICAgbXkgJGlzUmV2aWV3ZWRCeUxpbmUgPSAkbGluZSA9fiBtL14o PzpSZXZpZXdlZHxSdWJiZXJbIFwtXT9zdGFtcGVkKSBieS87CisgICAgICAgICAgICAgICAgbXkg JGlzTW9kaWZpZWRGaWxlTGluZSA9ICRsaW5lID1+IG0vXlwqIC4qOi87CisKKyAgICAgICAgICAg ICAgICAjIEluc2VydCB0aGUgYXV0aG9yc2hpcCBsaW5lIGlmIG5lZWRlZCBqdXN0IGFib3ZlIHRo ZSAiUmV2aWV3ZWQgYnkiIGxpbmUgb3IgdGhlCisgICAgICAgICAgICAgICAgIyBmaXJzdCBtb2Rp ZmllZCBmaWxlICh3aGljaGV2ZXIgY29tZXMgZmlyc3QpLgorICAgICAgICAgICAgICAgIGlmICgk aXNSZXZpZXdlZEJ5TGluZSB8fCAkaXNNb2RpZmllZEZpbGVMaW5lKSB7CisgICAgICAgICAgICAg ICAgICAgICRoYXNBdXRob3JJbmZvVG9Xcml0ZSA9IDA7CisgICAgICAgICAgICAgICAgICAgIG15 ICRhdXRob3JzaGlwU3RyaW5nID0gcGF0Y2hBdXRob3JzaGlwU3RyaW5nKCRhdXRob3IsICRlbWFp bCwgJGRhdGUpOworICAgICAgICAgICAgICAgICAgICBpZiAoJGF1dGhvcnNoaXBTdHJpbmcpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgICRjb21taXRNZXNzYWdlIC49ICIkYXV0aG9yc2hpcFN0 cmluZ1xuIjsKKyAgICAgICAgICAgICAgICAgICAgICAgICRjb21taXRNZXNzYWdlIC49ICJcbiIg aWYgJGlzTW9kaWZpZWRGaWxlTGluZTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIH0KKworCisgICAgICAgICAgICAkbGluZUNvdW50Kys7Cisg ICAgICAgICAgICAkY29tbWl0TWVzc2FnZSAuPSAkbGluZTsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICRibGFua0xpbmVzIC49ICRfOworICAgICAgICB9CisgICAgfQorICAgIHJldHVy biAoJGNvbW1pdE1lc3NhZ2UsICRoYXNBdXRob3JJbmZvVG9Xcml0ZSwgJGRhdGUsICRhdXRob3Is ICRlbWFpbCk7Cit9CisKK3N1YiBzb3J0S2V5KCQpCit7CisgICAgbXkgKCRsYWJlbCkgPSBAXzsK KyAgICBteSAkc29ydEtleSA9IGxjICRsYWJlbDsKKyAgICBpZiAoJGxhYmVsIGVxICJ0b3AgbGV2 ZWwiKSB7CisgICAgICAgICRzb3J0S2V5ID0gIiI7CisgICAgfSBlbHNpZiAoJGxhYmVsIGVxICJM YXlvdXRUZXN0cyIpIHsKKyAgICAgICAgJHNvcnRLZXkgPSBsYyAifiwgTGF5b3V0VGVzdHMgbGFz dCI7CisgICAgfQorICAgIHJldHVybiAkc29ydEtleTsKK30KKwogc3ViIGNyZWF0ZUNvbW1pdE1l c3NhZ2UoQCkKIHsKICAgICBteSBAY2hhbmdlTG9ncyA9IEBfOwpAQCAtMjE4LDU5ICszMTQsOSBA QCBzdWIgY3JlYXRlQ29tbWl0TWVzc2FnZShAKQogICAgIG15ICVjaGFuZ2VMb2dTb3J0OwogICAg IG15ICVjaGFuZ2VMb2dDb250ZW50czsKICAgICBmb3IgbXkgJGNoYW5nZUxvZyAoQGNoYW5nZUxv Z3MpIHsKLSAgICAgICAgb3BlbiBDSEFOR0VMT0csICRjaGFuZ2VMb2cgb3IgZGllICJDYW4ndCBv cGVuICRjaGFuZ2VMb2ciOwotICAgICAgICBteSAkY29udGVudHMgPSAiIjsKLSAgICAgICAgbXkg JGJsYW5rTGluZXMgPSAiIjsKLSAgICAgICAgbXkgJGxpbmVDb3VudCA9IDA7Ci0gICAgICAgIG15 ICRkYXRlID0gIiI7Ci0gICAgICAgIG15ICRhdXRob3IgPSAiIjsKLSAgICAgICAgbXkgJGVtYWls ID0gIiI7Ci0gICAgICAgIG15ICRoYXNBdXRob3JJbmZvVG9Xcml0ZSA9IDA7Ci0gICAgICAgIHdo aWxlICg8Q0hBTkdFTE9HPikgewotICAgICAgICAgICAgaWYgKC9eXFMvKSB7Ci0gICAgICAgICAg ICAgICAgbGFzdCBpZiAkY29udGVudHM7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAo L1xTLykgewotICAgICAgICAgICAgICAgICRjb250ZW50cyAuPSAkYmxhbmtMaW5lcyBpZiAkY29u dGVudHM7Ci0gICAgICAgICAgICAgICAgJGJsYW5rTGluZXMgPSAiIjsKLQotICAgICAgICAgICAg ICAgIG15ICRsaW5lID0gJF87Ci0KLSAgICAgICAgICAgICAgICAjIFJlbW92ZSBpbmRlbnRhdGlv biBzcGFjZXMKLSAgICAgICAgICAgICAgICAkbGluZSA9fiBzL14gezh9Ly87Ci0KLSAgICAgICAg ICAgICAgICAjIEdyYWIgdGhlIGF1dGhvciBhbmQgdGhlIGRhdGUgbGluZQotICAgICAgICAgICAg ICAgIGlmICgkbGluZSA9fiBtL14oWzAtOV17NH0tWzAtOV17Mn0tWzAtOV17Mn0pXHMrKC4qW15c c10pXHMrPCguKik+LyAmJiAkbGluZUNvdW50ID09IDApIHsKLSAgICAgICAgICAgICAgICAgICAg JGRhdGUgPSAkMTsKLSAgICAgICAgICAgICAgICAgICAgJGF1dGhvciA9ICQyOwotICAgICAgICAg ICAgICAgICAgICAkZW1haWwgPSAkMzsKLSAgICAgICAgICAgICAgICAgICAgJGhhc0F1dGhvcklu Zm9Ub1dyaXRlID0gMTsKLSAgICAgICAgICAgICAgICAgICAgbmV4dDsKLSAgICAgICAgICAgICAg ICB9CisgICAgICAgIG9wZW4gbXkgJGNoYW5nZUxvZ0ZpbGUsICRjaGFuZ2VMb2cgb3IgZGllICJD YW4ndCBvcGVuICRjaGFuZ2VMb2ciOwogCi0gICAgICAgICAgICAgICAgaWYgKCRoYXNBdXRob3JJ bmZvVG9Xcml0ZSkgewotICAgICAgICAgICAgICAgICAgICBteSAkaXNSZXZpZXdlZEJ5TGluZSA9 ICRsaW5lID1+IG0vXig/OlJldmlld2VkfFJ1YmJlclsgXC1dP3N0YW1wZWQpIGJ5LzsKLSAgICAg ICAgICAgICAgICAgICAgbXkgJGlzTW9kaWZpZWRGaWxlTGluZSA9ICRsaW5lID1+IG0vXlwqIC4q Oi87Ci0KLSAgICAgICAgICAgICAgICAgICAgIyBJbnNlcnQgdGhlIGF1dGhvcnNoaXAgbGluZSBp ZiBuZWVkZWQganVzdCBhYm92ZSB0aGUgIlJldmlld2VkIGJ5IiBsaW5lIG9yIHRoZQotICAgICAg ICAgICAgICAgICAgICAjIGZpcnN0IG1vZGlmaWVkIGZpbGUgKHdoaWNoZXZlciBjb21lcyBmaXJz dCkuCi0gICAgICAgICAgICAgICAgICAgIGlmICgkaXNSZXZpZXdlZEJ5TGluZSB8fCAkaXNNb2Rp ZmllZEZpbGVMaW5lKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAkaGFzQXV0aG9ySW5mb1Rv V3JpdGUgPSAwOwotICAgICAgICAgICAgICAgICAgICAgICAgbXkgJGF1dGhvcnNoaXBTdHJpbmcg PSBwYXRjaEF1dGhvcnNoaXBTdHJpbmcoJGF1dGhvciwgJGVtYWlsLCAkZGF0ZSk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBpZiAoJGF1dGhvcnNoaXBTdHJpbmcpIHsKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAkY29udGVudHMgLj0gIiRhdXRob3JzaGlwU3RyaW5nXG4iOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICRjb250ZW50cyAuPSAiXG4iIGlmICRpc01vZGlmaWVkRmls ZUxpbmU7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICB9Ci0KLQotICAgICAgICAgICAgICAgICRsaW5lQ291bnQrKzsKLSAg ICAgICAgICAgICAgICAkY29udGVudHMgLj0gJGxpbmU7Ci0gICAgICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgICAgICRibGFua0xpbmVzIC49ICRfOwotICAgICAgICAgICAgfQotICAgICAg ICB9CisgICAgICAgIG15ICgkY29udGVudHMsICRoYXNBdXRob3JJbmZvVG9Xcml0ZSwgJGRhdGUs ICRhdXRob3IsICRlbWFpbCkgPSBjb21taXRNZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5KCRjaGFu Z2VMb2dGaWxlKTsKICAgICAgICAgaWYgKCRoYXNBdXRob3JJbmZvVG9Xcml0ZSkgewogICAgICAg ICAgICAgIyBXZSBkaWRuJ3QgZmluZCBhbnl3aGVyZSB0byBwdXQgdGhlIGF1dGhvcnNoaXAgaW5m bywgc28ganVzdCBwdXQgaXQgYXQgdGhlIGVuZC4KICAgICAgICAgICAgIG15ICRhdXRob3JzaGlw U3RyaW5nID0gcGF0Y2hBdXRob3JzaGlwU3RyaW5nKCRhdXRob3IsICRlbWFpbCwgJGRhdGUpOwpA QCAtMjc4LDIxICszMjQsMTQgQEAgc3ViIGNyZWF0ZUNvbW1pdE1lc3NhZ2UoQCkKICAgICAgICAg ICAgICRoYXNBdXRob3JJbmZvVG9Xcml0ZSA9IDA7CiAgICAgICAgIH0KIAotICAgICAgICBjbG9z ZSBDSEFOR0VMT0c7CisgICAgICAgIGNsb3NlICRjaGFuZ2VMb2dGaWxlOwogCiAgICAgICAgICRj aGFuZ2VMb2cgPSBGaWxlOjpTcGVjLT5hYnMycmVsKEZpbGU6OlNwZWMtPnJlbDJhYnMoJGNoYW5n ZUxvZyksICR0b3BMZXZlbCk7CiAKICAgICAgICAgbXkgJGxhYmVsID0gZGlybmFtZSgkY2hhbmdl TG9nKTsKICAgICAgICAgJGxhYmVsID0gInRvcCBsZXZlbCIgdW5sZXNzIGxlbmd0aCAkbGFiZWw7 CiAKLSAgICAgICAgbXkgJHNvcnRLZXkgPSBsYyAkbGFiZWw7Ci0gICAgICAgIGlmICgkbGFiZWwg ZXEgInRvcCBsZXZlbCIpIHsKLSAgICAgICAgICAgICRzb3J0S2V5ID0gIiI7Ci0gICAgICAgIH0g ZWxzaWYgKCRsYWJlbCBlcSAiTGF5b3V0VGVzdHMiKSB7Ci0gICAgICAgICAgICAkc29ydEtleSA9 IGxjICJ+LCBMYXlvdXRUZXN0cyBsYXN0IjsKLSAgICAgICAgfQotCi0gICAgICAgICRjaGFuZ2VM b2dTb3J0eyRzb3J0S2V5fSA9ICRsYWJlbDsKKyAgICAgICAgJGNoYW5nZUxvZ1NvcnR7c29ydEtl eSgkbGFiZWwpfSA9ICRsYWJlbDsKICAgICAgICAgJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0g PSAkY29udGVudHM7CiAgICAgfQogCkluZGV4OiBUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cJKHJldmlz aW9uIDE3MTkzNCkKKysrIFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTgwLDcgKzgwLDcgQEAgc3ViIGZpbmRPcmlnaW5hbEZpbGVGcm9tU3ZuKCQpOwog c3ViIGdlbmVyYXRlRmlsZUxpc3QoXCUkJCQpOwogc3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cygk JCQkJCk7CiBzdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMoJCQkJCk7Ci1zdWIgZ2Vu ZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkKTsKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MoJCQkJCQkJCQkJCQkKTsKIHN1YiBnZXRMYXRlc3RDaGFuZ2VMb2dzKCQpOwogc3ViIGdldF9m dW5jdGlvbl9saW5lX3JhbmdlcygkJCk7CiBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zv cl9jcHAoJCQpOwpAQCAtMTMxLDEyICsxMzEsMTQgQEAgc3ViIG1haW4oKQogICAgIG15ICRjaGVj a1dlYktpdFN0eWxlOwogICAgIG15ICRvcGVuQ2hhbmdlTG9ncyA9IDA7CiAgICAgbXkgJHdyaXRl Q2hhbmdlTG9ncyA9IDE7CisgICAgbXkgJGRlbGltaXRlcnMgPSAwOwogICAgIG15ICRzaG93SGVs cCA9IDA7CiAgICAgbXkgJHNwZXdEaWZmID0gJEVOVnsiUFJFUEFSRV9DSEFOR0VMT0dfRElGRiJ9 OwogICAgIG15ICR1cGRhdGVDaGFuZ2VMb2dzID0gMTsKICAgICBteSAkcGFyc2VPcHRpb25zUmVz dWx0ID0KICAgICAgICAgR2V0T3B0aW9ucygiZGlmZnxkISIgPT4gXCRzcGV3RGlmZiwKICAgICAg ICAgICAgICAgICAgICAiYnVnfGI6aSIgPT4gXCRidWdOdW1iZXIsCisgICAgICAgICAgICAgICAg ICAgImRlbGltaXRlcnMiID0+IFwkZGVsaW1pdGVycywKICAgICAgICAgICAgICAgICAgICAiZGVz Y3JpcHRpb246cyIgPT4gXCRidWdEZXNjcmlwdGlvbiwKICAgICAgICAgICAgICAgICAgICAibmFt ZTpzIiA9PiBcJG5hbWUsCiAgICAgICAgICAgICAgICAgICAgImVtYWlsOnMiID0+IFwkZW1haWxB ZGRyZXNzLApAQCAtMTY0LDYgKzE2Niw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnQgU1RE RVJSICIgIC1vfC0tb3BlbiAgICAgICBPcGVuIENoYW5nZUxvZ3MgaW4gYW4gZWRpdG9yIHdoZW4g ZG9uZVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV11cGRhdGUgICBVcGRhdGUg Q2hhbmdlTG9ncyBmcm9tIHN2biBiZWZvcmUgYWRkaW5nIGVudHJ5IChkZWZhdWx0OiB1cGRhdGUp XG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXdyaXRlICAgIFdyaXRlIENoYW5n ZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0KSAoZGVm YXVsdDogd3JpdGUpXG4iOworICAgICAgICBwcmludCBTVERFUlIgIiAgLS1kZWxpbWl0ZXJzICAg IFdoZW4gd3JpdGluZyB0byBzdGRvdXQsIGxhYmVsIGFuZCBwcmludCBhIFwiflwiIGFmdGVyIGVh Y2ggZW50cnlcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtLWVtYWlsPSAgICAgICAgU3Bl Y2lmeSB0aGUgZW1haWwgYWRkcmVzcyB0byBiZSB1c2VkIGluIHRoZSBwYXRjaFxuIjsKICAgICAg ICAgcmV0dXJuIDE7CiAgICAgfQpAQCAtMjIyLDcgKzIyNSw3IEBAIHN1YiBtYWluKCkKICAgICAg ICAgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsKICAgICB9CiAKLSAg ICBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFk ZGVkUmVncmVzc2lvblRlc3RzLCAkZnVuY3Rpb25MaXN0cywgJGJ1Z1VSTCwgJGJ1Z0Rlc2NyaXB0 aW9uLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmlld2VyLCAkZ2l0Q29tbWl0LCAkd3Jp dGVDaGFuZ2VMb2dzKTsKKyAgICBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAkZmls ZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAkZnVuY3Rpb25MaXN0cywgJGJ1 Z1VSTCwgJGJ1Z0Rlc2NyaXB0aW9uLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmlld2Vy LCAkZ2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycyk7CiAKICAgICBpZiAo JHdyaXRlQ2hhbmdlTG9ncykgewogICAgICAgICBwcmludCBTVERFUlIgIi0tIFBsZWFzZSByZW1l bWJlciB0byBpbmNsdWRlIGEgZGV0YWlsZWQgZGVzY3JpcHRpb24gaW4geW91ciBDaGFuZ2VMb2cg ZW50cnkuIC0tXG4tLSBTZWUgPGh0dHA6Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcu aHRtbD4gZm9yIG1vcmUgaW5mbyAtLVxuIjsKQEAgLTUyMiw5ICs1MjUsOSBAQCBzdWIgcmVzb2x2 ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCiAgICAgY2xvc2UgUkVTT0xWRTsKIH0KIAotc3ViIGdl bmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQkJCkKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MoJCQkJCQkJCQkJCQkKQogewotICAgIG15ICgkcHJlZml4ZXMsICRmaWxlc0luQ2hhbmdlTG9n LCAkYWRkZWRSZWdyZXNzaW9uVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnVVJMLCAkYnVnRGVz Y3JpcHRpb24sICRuYW1lLCAkZW1haWxBZGRyZXNzLCAkZ2l0UmV2aWV3ZXIsICRnaXRDb21taXQs ICR3cml0ZUNoYW5nZUxvZ3MpID0gQF87CisgICAgbXkgKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFu Z2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRi dWdEZXNjcmlwdGlvbiwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwgJGdpdENv bW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGltaXRlcnMpID0gQF87CiAKICAgICAjIEdlbmVy YXRlIG5ldyBDaGFuZ2VMb2cgZW50cmllcyBhbmQgKG9wdGlvbmFsbHkpIHdyaXRlIG91dCBuZXcg Q2hhbmdlTG9nIGZpbGVzLgogICAgIGZvcmVhY2ggbXkgJHByZWZpeCAoQCRwcmVmaXhlcykgewpA QCAtNTQ3LDcgKzU1MCw3IEBAIHN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQkJCQkJCQp CiAgICAgICAgICAgICBvcGVuIENIQU5HRV9MT0csICI+ICR7Y2hhbmdlTG9nUGF0aH0iIG9yIGRp ZSAiQ291bGQgbm90IHdyaXRlICR7Y2hhbmdlTG9nUGF0aH1cbi4iOwogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgb3BlbiBDSEFOR0VfTE9HLCAiPi0iIG9yIGRpZSAiQ291bGQgbm90IHdy aXRlIHRvIFNURE9VVFxuLiI7Ci0gICAgICAgICAgICBwcmludCBzdWJzdHIoJHByZWZpeCwgMCwg bGVuZ3RoKCRwcmVmaXgpIC0gMSkgLiAiOlxuXG4iIHVubGVzcyAoc2NhbGFyIEAkcHJlZml4ZXMp ID09IDE7CisgICAgICAgICAgICBwcmludCBzdWJzdHIoJHByZWZpeCwgMCwgbGVuZ3RoKCRwcmVm aXgpIC0gMSkgLiAiOlxuXG4iIHVubGVzcyAoc2NhbGFyIEAkcHJlZml4ZXMpID09IDEgJiYgISRk ZWxpbWl0ZXJzOwogICAgICAgICB9CiAKICAgICAgICAgbXkgJGRhdGUgPSBjaGFuZ2VMb2dEYXRl KENoYW5nZUxvZ1RpbWVab25lKTsKQEAgLTU4Miw2ICs1ODUsNyBAQCBzdWIgZ2VuZXJhdGVOZXdD aGFuZ2VMb2dzKCQkJCQkJCQkJCQkKQogICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3Jt YWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCksIEBvbGRfY2hhbmdlX2xvZzsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgIlxuIjsKKyAgICAgICAgICAg IHByaW50ICJ+XG4iICBpZiAkZGVsaW1pdGVyczsKICAgICAgICAgfQogCiAgICAgICAgIGNsb3Nl IENIQU5HRV9MT0c7Cg==