146082 2015-06-17 15:22:27 -0700 Make webkitdirs::runGitUpdate() work when invoked in more than one Git checkout 2015-06-18 11:00:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates oldest_to_newest 1102670 0 dbates 2015-06-17 15:22:27 -0700 For Apple internal scripts it would be beneficial to be able to call the convenience function webkitdirs::runGitUpdate() to update an arbitrary Git- and Git SVN- checkouts. Currently webkitdirs::runGitUpdate() cannot be used to update both Git and Git SVN- checkout because it calls isGitSVN() to determine whether the current working directory is a Git SVN checkout. And isGitSVN() caches its result to speed up subsequent queries. We should support running webkitdirs::runGitUpdate() from inside an arbitrary Git/Git SVN checkout to update it. 1102678 1 255044 dbates 2015-06-17 15:42:35 -0700 Created attachment 255044 Patch 1102682 2 255046 dbates 2015-06-17 15:44:31 -0700 Created attachment 255046 Patch 1102686 3 255046 ddkilzer 2015-06-17 15:55:49 -0700 Comment on attachment 255046 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255046&action=review > Tools/ChangeLog:18 > + different than the current working directory). Instead runGitUpdate() should check > + whether the current working directory is a Git SVN checkout on each invocation. If we find isGitSVNDirectory() is too slow, we could memoize the result instead. (Not necessary for this patch; something to keep in mind for the future.) > Tools/Scripts/VCSUtils.pm:244 > +sub isGitSVN() Should we add a comment here that this is deprecated? I assume that's the long-term intention by introducing isGitSVNDirectory(). 1102965 4 dbates 2015-06-18 10:59:28 -0700 (In reply to comment #3) > Comment on attachment 255046 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255046&action=review > > > Tools/ChangeLog:18 > > + different than the current working directory). Instead runGitUpdate() should check > > + whether the current working directory is a Git SVN checkout on each invocation. > > If we find isGitSVNDirectory() is too slow, we could memoize the result > instead. (Not necessary for this patch; something to keep in mind for the > future.) > Yes, we could use memoization should a script(s) make repeated calls to isGitSVNDirectory() with the same directory. Currently runGitUpdate() is the only caller of isGitSVNDirectory() and scripts that use runGitUpdate() either invoke it once or invoke it more than once with a different directory on each invocation. > > Tools/Scripts/VCSUtils.pm:244 > > +sub isGitSVN() > > Should we add a comment here that this is deprecated? I assume that's the > long-term intention by introducing isGitSVNDirectory(). No, I was not planning to deprecate isGitSVN(). isGitSVN() and isGitSVNDirectory() serve two different audience. The former is for the majority of scripts that operate on exactly one SCM repository (usually WebKit). Similar to the purpose of VCSUtils::is{Git, SVN}(), isGitSVN() is the preferred function to use to determine if a WebKit checkout is a Git SVN checkout because it caches its value to speed up subsequent calls. For the few scripts that operate on multiple repositories VCSUtils::is{Git, GitSVN, SVN}Directory() are provided. 1102968 5 255046 dbates 2015-06-18 11:00:51 -0700 Comment on attachment 255046 Patch Clearing flags on attachment: 255046 Committed r185710: <http://trac.webkit.org/changeset/185710> 1102969 6 dbates 2015-06-18 11:00:55 -0700 All reviewed patches have been landed. Closing bug. 255044 2015-06-17 15:42:35 -0700 2015-06-17 15:44:29 -0700 Patch bug-146082-20150617154159.patch text/plain 3441 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NjcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTg4ZTM2MTIyNDk2NGQyZGFkZmNkNjkzOGYzYzdjMTMw ZGEwZmQxNy4uYzgzZTMxMjFlZmQ2MWQ4OTYyZjk1YWI3MTI1Yjg5YzBjNTIxZjEzZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDE1LTA2LTE3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAg ICAgICBNYWtlIHdlYmtpdGRpcnM6OnJ1bkdpdFVwZGF0ZSgpIHdvcmsgd2hlbiBpbnZva2VkIGlu IG1vcmUgdGhhbiBvbmUgR2l0IGNoZWNrb3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYwODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb24gd2Via2l0ZGlyczo6cnVuR2l0VXBkYXRl IG1heSBub3QgdXBkYXRlIHRoZSBHaXQgY2hlY2tvdXQgaW4gdGhlIGN1cnJlbnQKKyAgICAgICAg d29ya2luZyBkaXJlY3RvcnkgYWZ0ZXIgYmVpbmcgaW52b2tlZCBpbiBhIGRpZmZlcmVudCBHaXQg Y2hlY2tvdXQuIEluIHBhcnRpY3VsYXIsCisgICAgICAgIGNhbGxpbmcgcnVuR2l0VXBkYXRlKCkg aW5zaWRlIGEgR2l0IFNWTiBjaGVja291dCBhbmQgc3Vic2VxdWVudGx5IGNhbGxpbmcgaXQgaW5z aWRlCisgICAgICAgIGEgcHVyZSBHaXQgY2hlY2tvdXQgZyB3aWxsIGZhaWwgdG8gdXBkYXRlIGcu CisKKyAgICAgICAgQ3VycmVudGx5IHdlYmtpdGRpcnM6OnJ1bkdpdFVwZGF0ZSgpIGNhbGxzIFZD U1V0aWxzOjppc0dpdFNWTigpIHRvIGRldGVybWluZSB3aGV0aGVyCisgICAgICAgIHRoZSBjdXJy ZW50IHdvcmtpbmcgZGlyZWN0b3J5IGlzIGEgR2l0IFNWTiBjaGVja291dC4gQW5kIGlzR2l0U1ZO KCkgY2FjaGVzIGl0cyByZXN1bHQKKyAgICAgICAgdG8gc3BlZWQgdXAgc3Vic2VxdWVudCBxdWVy aWVzLiBUaGlzIHByZXZlbnRzIHJ1bkdpdFVwZGF0ZSgpIGZyb20gYmVpbmcgdXNlZCB0byB1cGRh dGUKKyAgICAgICAgYW4gYXJiaXRyYXJ5IEdpdCBjaGVja291dCAoc2luY2UgaXNHaXRTVk4oKSBt YXkgcmV0dXJuIGEgY2FjaGVkIHJlc3VsdCBmb3IgYSBkaXJlY3RvcnkKKyAgICAgICAgZGlmZmVy ZW50IHRoYW4gdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkpLiBJbnN0ZWFkIHJ1bkdpdFVw ZGF0ZSgpIHNob3VsZCBjaGVjaworICAgICAgICB3aGV0aGVyIHRoZSBjdXJyZW50IHdvcmtpbmcg ZGlyZWN0b3J5IGlzIGEgR2l0IFNWTiBjaGVja291dCBvbiBlYWNoIGludm9jYXRpb24uCisKKyAg ICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOgorICAgICAgICAoaXNHaXRTVk5EaXJlY3Rvcnkp OiBFeHRyYWN0ZWQgbG9naWMgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgYSBkaXJlY3RvcnkgaXMgYSBH aXQKKyAgICAgICAgU1ZOIGRpcmVjdG9yeSBmcm9tIGlzR2l0U1ZOKCkuCisgICAgICAgIChpc0dp dFNWTik6IEltcGxlbWVudGVkIGluIHRlcm1zIG9mIGlzR2l0U1ZORGlyZWN0b3J5KCkuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAocnVuR2l0VXBkYXRlKTogTW9k aWZpZWQgdG8gdXNlIGlzR2l0U1ZORGlyZWN0b3J5KCkuCisKKzIwMTUtMDYtMTcgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIEV4cG9ydCBWQ1NVdGlsczo6Z2l0 VHJlZURpcmVjdG9yeSgpCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTI0ODkwMT4KIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRp bHMucG0KaW5kZXggZWUxN2YyMmRkNTZiZWI4YmVhY2E3YzQwYWI2Y2JkMzA3OGQ4NWFkYy4uNTRi OGE3OTNhNjA3ZjMxM2RhNDc2YzEyMzBiY2MxNWY0ZDg2MzA2NyAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9WQ1NVdGlscy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0y MjQsMTUgKzIyNCwyNyBAQCBzdWIgaXNHaXQoKQogICAgIHJldHVybiAkaXNHaXQ7CiB9CiAKLXN1 YiBpc0dpdFNWTigpCitzdWIgaXNHaXRTVk5EaXJlY3RvcnkoJCkKIHsKLSAgICByZXR1cm4gJGlz R2l0U1ZOIGlmIGRlZmluZWQgJGlzR2l0U1ZOOworICAgIG15ICgkZGlyZWN0b3J5KSA9IEBfOwor CisgICAgbXkgJHNhdmVkV29ya2luZ0RpcmVjdG9yeSA9IEN3ZDo6Z2V0Y3dkKCk7CisgICAgY2hk aXIoJGRpcmVjdG9yeSk7CiAKICAgICAjIFRoZXJlIGRvZXNuJ3Qgc2VlbSB0byBiZSBhbiBvZmZp Y2lhbGx5IGRvY3VtZW50ZWQgd2F5IHRvIGRldGVybWluZQogICAgICMgaWYgeW91J3JlIGluIGEg Z2l0LXN2biBjaGVja291dC4gVGhlIGJlc3Qgc3VnZ2VzdGlvbnMgc2VlbiBzbyBmYXIKICAgICAj IGFsbCB1c2Ugc29tZXRoaW5nIGxpa2UgdGhlIGZvbGxvd2luZzoKICAgICBteSAkb3V0cHV0ID0g YGdpdCBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggMj4mIDFgOwogICAgICRpc0dp dFNWTiA9ICRvdXRwdXQgbmUgJyc7CisgICAgY2hkaXIoJHNhdmVkV29ya2luZ0RpcmVjdG9yeSk7 CisgICAgcmV0dXJuICRpc0dpdFNWTjsKK30KKworc3ViIGlzR2l0U1ZOKCkKK3sKKyAgICByZXR1 cm4gJGlzR2l0U1ZOIGlmIGRlZmluZWQgJGlzR2l0U1ZOOworCisgICAgJGlzR2l0U1ZOID0gaXNH aXRTVk5EaXJlY3RvcnkoIi4iKTsKICAgICByZXR1cm4gJGlzR2l0U1ZOOwogfQogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KaW5kZXggNmMxZTQ3OTFjODUyZDQ2YmU1ZjMyMDVjNTg3NmE0ZjMwNjUyZGFiMy4uZTEy NjllNDYzOGM2OTEzMDJmNGJmMDJlNmIyOTI1OGY2MWJlYmY5NyAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpA QCAtMjQ5NCw3ICsyNDk0LDcgQEAgc3ViIHJ1bkdpdFVwZGF0ZSgpCiAgICAgIyBEb2luZyBhIGdp dCBmZXRjaCBmaXJzdCBhbGxvd3Mgc2V0dXBzIHdpdGggc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggPSB0 cnVuazpyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcgogICAgICMgdG8gcGVyZm9ybSB0aGUgcmVi YXNlIG11Y2ggbXVjaCBmYXN0ZXIuCiAgICAgc3lzdGVtKCJnaXQiLCAiZmV0Y2giKTsKLSAgICBp ZiAoaXNHaXRTVk4oKSkgeworICAgIGlmIChpc0dpdFNWTkRpcmVjdG9yeSgiLiIpKSB7CiAgICAg ICAgIHN5c3RlbSgiZ2l0IiwgInN2biIsICJyZWJhc2UiKSA9PSAwIG9yIGRpZTsKICAgICB9IGVs c2UgewogICAgICAgICAjIFRoaXMgd2lsbCBkaWUgaWYgYnJhbmNoLiRCUkFOQ0hOQU1FLm1lcmdl IGlzbid0IHNldCwgd2hpY2ggaXMK 255046 2015-06-17 15:44:31 -0700 2015-06-18 11:00:51 -0700 Patch bug-146082-20150617154355.patch text/plain 3729 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NjcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTg4ZTM2MTIyNDk2NGQyZGFkZmNkNjkzOGYzYzdjMTMw ZGEwZmQxNy4uOWU3NjA2NDY1MjIyZTViNmZiZWNlMzdjNTM2MjVmMDk3MGQwM2VkYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDE1LTA2LTE3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAg ICAgICBNYWtlIHdlYmtpdGRpcnM6OnJ1bkdpdFVwZGF0ZSgpIHdvcmsgd2hlbiBpbnZva2VkIGlu IG1vcmUgdGhhbiBvbmUgR2l0IGNoZWNrb3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYwODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb24gd2Via2l0ZGlyczo6cnVuR2l0VXBkYXRl IG1heSBub3QgdXBkYXRlIHRoZSBHaXQgY2hlY2tvdXQgaW4gdGhlIGN1cnJlbnQKKyAgICAgICAg d29ya2luZyBkaXJlY3RvcnkgYWZ0ZXIgYmVpbmcgaW52b2tlZCBpbiBhIGRpZmZlcmVudCBHaXQg Y2hlY2tvdXQuIEluIHBhcnRpY3VsYXIsCisgICAgICAgIGNhbGxpbmcgcnVuR2l0VXBkYXRlKCkg aW5zaWRlIGEgR2l0IFNWTiBjaGVja291dCBhbmQgc3Vic2VxdWVudGx5IGNhbGxpbmcgaXQgaW5z aWRlCisgICAgICAgIGEgcHVyZSBHaXQgY2hlY2tvdXQgZyB3aWxsIGZhaWwgdG8gdXBkYXRlIGcu CisKKyAgICAgICAgQ3VycmVudGx5IHdlYmtpdGRpcnM6OnJ1bkdpdFVwZGF0ZSgpIGNhbGxzIFZD U1V0aWxzOjppc0dpdFNWTigpIHRvIGRldGVybWluZSB3aGV0aGVyCisgICAgICAgIHRoZSBjdXJy ZW50IHdvcmtpbmcgZGlyZWN0b3J5IGlzIGEgR2l0IFNWTiBjaGVja291dC4gQW5kIGlzR2l0U1ZO KCkgY2FjaGVzIGl0cyByZXN1bHQKKyAgICAgICAgdG8gc3BlZWQgdXAgc3Vic2VxdWVudCBxdWVy aWVzLiBUaGlzIHByZXZlbnRzIHJ1bkdpdFVwZGF0ZSgpIGZyb20gYmVpbmcgdXNlZCB0byB1cGRh dGUKKyAgICAgICAgYW4gYXJiaXRyYXJ5IEdpdCBjaGVja291dCAoc2luY2UgaXNHaXRTVk4oKSBt YXkgcmV0dXJuIGEgY2FjaGVkIHJlc3VsdCBmb3IgYSBkaXJlY3RvcnkKKyAgICAgICAgZGlmZmVy ZW50IHRoYW4gdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkpLiBJbnN0ZWFkIHJ1bkdpdFVw ZGF0ZSgpIHNob3VsZCBjaGVjaworICAgICAgICB3aGV0aGVyIHRoZSBjdXJyZW50IHdvcmtpbmcg ZGlyZWN0b3J5IGlzIGEgR2l0IFNWTiBjaGVja291dCBvbiBlYWNoIGludm9jYXRpb24uCisKKyAg ICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOiBFeHBvcnQgZnVuY3Rpb24gaXNHaXRTVk5EaXJl Y3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgdXNlZCBmcm9tIHdlYmtpdGRpcnM6OnJ1bkdpdFVwZGF0 ZSgpLgorICAgICAgICAoaXNHaXRTVk5EaXJlY3RvcnkpOiBFeHRyYWN0ZWQgbG9naWMgdG8gZGV0 ZXJtaW5lIHdoZXRoZXIgYSBkaXJlY3RvcnkgaXMgYSBHaXQKKyAgICAgICAgU1ZOIGRpcmVjdG9y eSBmcm9tIGlzR2l0U1ZOKCkuCisgICAgICAgIChpc0dpdFNWTik6IEltcGxlbWVudGVkIGluIHRl cm1zIG9mIGlzR2l0U1ZORGlyZWN0b3J5KCkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJz LnBtOgorICAgICAgICAocnVuR2l0VXBkYXRlKTogTW9kaWZpZWQgdG8gdXNlIGlzR2l0U1ZORGly ZWN0b3J5KCkuCisKKzIwMTUtMDYtMTcgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29t PgorCiAgICAgICAgIEV4cG9ydCBWQ1NVdGlsczo6Z2l0VHJlZURpcmVjdG9yeSgpCiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yMTI0ODkwMT4KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9W Q1NVdGlscy5wbSBiL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KaW5kZXggZWUxN2YyMmRkNTZi ZWI4YmVhY2E3YzQwYWI2Y2JkMzA3OGQ4NWFkYy4uMzM1ODk3OTk2MmQ0YTM0ODhlNDEyOWIzMDE2 ZTNmNmE1OTkzMzgyNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC02Niw2ICs2Niw3IEBAIEJFR0lOIHsKICAg ICAgICAgJmlzR2l0U1ZOCiAgICAgICAgICZpc0dpdEJyYW5jaEJ1aWxkCiAgICAgICAgICZpc0dp dERpcmVjdG9yeQorICAgICAgICAmaXNHaXRTVk5EaXJlY3RvcnkKICAgICAgICAgJmlzU1ZOCiAg ICAgICAgICZpc1NWTkRpcmVjdG9yeQogICAgICAgICAmaXNTVk5WZXJzaW9uMTZPck5ld2VyCkBA IC0yMjQsMTUgKzIyNSwyNyBAQCBzdWIgaXNHaXQoKQogICAgIHJldHVybiAkaXNHaXQ7CiB9CiAK LXN1YiBpc0dpdFNWTigpCitzdWIgaXNHaXRTVk5EaXJlY3RvcnkoJCkKIHsKLSAgICByZXR1cm4g JGlzR2l0U1ZOIGlmIGRlZmluZWQgJGlzR2l0U1ZOOworICAgIG15ICgkZGlyZWN0b3J5KSA9IEBf OworCisgICAgbXkgJHNhdmVkV29ya2luZ0RpcmVjdG9yeSA9IEN3ZDo6Z2V0Y3dkKCk7CisgICAg Y2hkaXIoJGRpcmVjdG9yeSk7CiAKICAgICAjIFRoZXJlIGRvZXNuJ3Qgc2VlbSB0byBiZSBhbiBv ZmZpY2lhbGx5IGRvY3VtZW50ZWQgd2F5IHRvIGRldGVybWluZQogICAgICMgaWYgeW91J3JlIGlu IGEgZ2l0LXN2biBjaGVja291dC4gVGhlIGJlc3Qgc3VnZ2VzdGlvbnMgc2VlbiBzbyBmYXIKICAg ICAjIGFsbCB1c2Ugc29tZXRoaW5nIGxpa2UgdGhlIGZvbGxvd2luZzoKICAgICBteSAkb3V0cHV0 ID0gYGdpdCBjb25maWcgLS1nZXQgc3ZuLXJlbW90ZS5zdm4uZmV0Y2ggMj4mIDFgOwogICAgICRp c0dpdFNWTiA9ICRvdXRwdXQgbmUgJyc7CisgICAgY2hkaXIoJHNhdmVkV29ya2luZ0RpcmVjdG9y eSk7CisgICAgcmV0dXJuICRpc0dpdFNWTjsKK30KKworc3ViIGlzR2l0U1ZOKCkKK3sKKyAgICBy ZXR1cm4gJGlzR2l0U1ZOIGlmIGRlZmluZWQgJGlzR2l0U1ZOOworCisgICAgJGlzR2l0U1ZOID0g aXNHaXRTVk5EaXJlY3RvcnkoIi4iKTsKICAgICByZXR1cm4gJGlzR2l0U1ZOOwogfQogCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KaW5kZXggNmMxZTQ3OTFjODUyZDQ2YmU1ZjMyMDVjNTg3NmE0ZjMwNjUyZGFiMy4u ZTEyNjllNDYzOGM2OTEzMDJmNGJmMDJlNmIyOTI1OGY2MWJlYmY5NyAxMDA3NTUKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQpAQCAtMjQ5NCw3ICsyNDk0LDcgQEAgc3ViIHJ1bkdpdFVwZGF0ZSgpCiAgICAgIyBEb2luZyBh IGdpdCBmZXRjaCBmaXJzdCBhbGxvd3Mgc2V0dXBzIHdpdGggc3ZuLXJlbW90ZS5zdm4uZmV0Y2gg PSB0cnVuazpyZWZzL3JlbW90ZXMvb3JpZ2luL21hc3RlcgogICAgICMgdG8gcGVyZm9ybSB0aGUg cmViYXNlIG11Y2ggbXVjaCBmYXN0ZXIuCiAgICAgc3lzdGVtKCJnaXQiLCAiZmV0Y2giKTsKLSAg ICBpZiAoaXNHaXRTVk4oKSkgeworICAgIGlmIChpc0dpdFNWTkRpcmVjdG9yeSgiLiIpKSB7CiAg ICAgICAgIHN5c3RlbSgiZ2l0IiwgInN2biIsICJyZWJhc2UiKSA9PSAwIG9yIGRpZTsKICAgICB9 IGVsc2UgewogICAgICAgICAjIFRoaXMgd2lsbCBkaWUgaWYgYnJhbmNoLiRCUkFOQ0hOQU1FLm1l cmdlIGlzbid0IHNldCwgd2hpY2ggaXMK