38812 2010-05-09 01:12:19 -0700 Clean up: Make regular expressions for parsing the start of an SVN and Git header global variables 2010-05-09 02:50:47 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned cjerdonek eric oldest_to_newest 223004 0 dbates 2010-05-09 01:12:19 -0700 We use the regular expressions qr#^diff --git (\w/)?(.+) (\w/)?([^\r\n]+)# and qr#^Index: ([^\r\n]+)# or some form of these expressions in various places throughout VCUtils.pm. We should centralize the parsing of these lines by creating functions that parse the start of Git header and SVN header, respectively. 223006 1 55494 dbates 2010-05-09 01:15:12 -0700 Created attachment 55494 Patch I did not add any additional unit tests as our existing test coverage should be sufficient. 223019 2 55495 dbates 2010-05-09 02:28:37 -0700 Created attachment 55495 Patch Based on a Chris's suggestion, stored the regular expressions in global variables instead of encapsulating them in functions. 223020 3 55495 cjerdonek 2010-05-09 02:38:29 -0700 Comment on attachment 55495 Patch > +++ WebKitTools/ChangeLog (working copy) > + Extract the regular expressions for parsing the start of an SVN and > + Git header into their own respective functions so as to centralize > + these regular expressions as they are used throughout VCSUtils.pm. As we discussed, this needs to be updated. > +++ WebKitTools/Scripts/VCSUtils.pm (working copy) > +my $gitHeaderStartRegEx = qr#^diff --git (\w/)?(.+) (\w/)?([^\r\n]+)#; > +my $svnHeaderStartRegEx = qr#^Index: ([^\r\n]+)#; Might it be more straightforward to call these gitDiffStartRegEx and svnDiffStartRegEx? It's probably best to re-post after this since the latter involves a bunch of changes. 223022 4 dbates 2010-05-09 02:41:05 -0700 (In reply to comment #3) > (From update of attachment 55495 [details]) > > +++ WebKitTools/ChangeLog (working copy) > > + Extract the regular expressions for parsing the start of an SVN and > > + Git header into their own respective functions so as to centralize > > + these regular expressions as they are used throughout VCSUtils.pm. > > As we discussed, this needs to be updated. Will change. > > > +++ WebKitTools/Scripts/VCSUtils.pm (working copy) > > +my $gitHeaderStartRegEx = qr#^diff --git (\w/)?(.+) (\w/)?([^\r\n]+)#; > > +my $svnHeaderStartRegEx = qr#^Index: ([^\r\n]+)#; > > Might it be more straightforward to call these gitDiffStartRegEx and svnDiffStartRegEx? Will change. > > It's probably best to re-post after this since the latter involves a bunch of changes. Will repost with changes. 223024 5 55498 dbates 2010-05-09 02:45:05 -0700 Created attachment 55498 Patch Updated patch based on Chris's suggestions. 223025 6 55498 cjerdonek 2010-05-09 02:47:34 -0700 Comment on attachment 55498 Patch Looks good. Thanks for this refactoring! 223026 7 55498 dbates 2010-05-09 02:50:39 -0700 Comment on attachment 55498 Patch Clearing flags on attachment: 55498 Committed r59051: <http://trac.webkit.org/changeset/59051> 223027 8 dbates 2010-05-09 02:50:47 -0700 All reviewed patches have been landed. Closing bug. 55494 2010-05-09 01:15:12 -0700 2010-05-09 02:28:37 -0700 Patch Bug38812.patch text/plain 5538 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU5MDQ4KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUtMDkgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODgxMgorCisg ICAgICAgIEV4dHJhY3QgdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbnMgZm9yIHBhcnNpbmcgdGhlIHN0 YXJ0IG9mIGFuIFNWTiBhbmQKKyAgICAgICAgR2l0IGhlYWRlciBpbnRvIHRoZWlyIG93biByZXNw ZWN0aXZlIGZ1bmN0aW9ucyBzbyBhcyB0byBjZW50cmFsaXplCisgICAgICAgIHRoZXNlIHJlZ3Vs YXIgZXhwcmVzc2lvbnMgYXMgdGhleSBhcmUgdXNlZCB0aHJvdWdob3V0IFZDU1V0aWxzLnBtLgor CisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKwogMjAxMC0wNS0wOSAgQ2hyaXMgSmVy ZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW5p ZWwgQmF0ZXMuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDU5MDQ4KQor KysgV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTE3 LDYgKzExNywyNyBAQCBzdWIgY2FsbFNpbGVudGx5KCRAKSB7CiAgICAgcmV0dXJuIEByZXR1cm5W YWx1ZTsKIH0KIAorc3ViIHBhcnNlR2l0SGVhZGVyU3RhcnQoJCkKK3sKKyAgICBteSAoJGxpbmUp ID0gQF87CisgICAgcmV0dXJuIGlmICgkbGluZSAhfiBxciNeZGlmZiAtLWdpdCAoXHcvKT8oLisp IChcdy8pPyhbXlxyXG5dKykjKTsKKworICAgIG15ICVyZXN1bHQ7CisgICAgJHJlc3VsdHtzb3Vy Y2VGaWxlfSA9ICQyOworICAgICRyZXN1bHR7ZGVzdGluYXRpb25GaWxlfSA9ICQ0OworICAgIHJl dHVybiAoXCVyZXN1bHQsICRQT1NUTUFUQ0gpOworfQorCitzdWIgcGFyc2VTdm5IZWFkZXJTdGFy dCgkKQoreworICAgIG15ICgkbGluZSkgPSBAXzsKKyAgICByZXR1cm4gaWYgKCRsaW5lICF+IHFy I15JbmRleDogKFteXHJcbl0rKSMpOworCisgICAgbXkgJXJlc3VsdDsKKyAgICAkcmVzdWx0e2Rl c3RpbmF0aW9uRmlsZX0gPSAkMTsKKyAgICByZXR1cm4gKFwlcmVzdWx0LCAkUE9TVE1BVENIKTsK K30KKwogIyBOb3RlLCB0aGlzIG1ldGhvZCB3aWxsIG5vdCBlcnJvciBpZiB0aGUgZmlsZSBjb3Jy ZXNwb25kaW5nIHRvIHRoZSBwYXRoIGRvZXMgbm90IGV4aXN0Lgogc3ViIHNjbVRvZ2dsZUV4ZWN1 dGFibGVCaXQKIHsKQEAgLTQ3MSwxNSArNDkyLDEzIEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIo JCQpCiAKICAgICAkXyA9ICRsaW5lOwogCi0gICAgbXkgJGhlYWRlclN0YXJ0UmVnRXggPSBxciNe ZGlmZiAtLWdpdCAoXHcvKT8oLispIChcdy8pPyhbXlxyXG5dKykjOwogICAgIG15ICRpbmRleFBh dGg7Ci0gICAgaWYgKC8kaGVhZGVyU3RhcnRSZWdFeC8pIHsKKyAgICBpZiAobXkgKCRnaXRIZWFk ZXJTdGFydEhhc2gsICRlb2wpID0gcGFyc2VHaXRIZWFkZXJTdGFydCgkXykpIHsKICAgICAgICAg IyBUaGUgZmlyc3QgYW5kIHNlY29uZCBwYXRocyBjYW4gZGlmZmVyIGluIHRoZSBjYXNlIG9mIGNv cGllcwogICAgICAgICAjIGFuZCByZW5hbWVzLiAgV2UgdXNlIHRoZSBzZWNvbmQgZmlsZSBwYXRo IGJlY2F1c2UgaXQgaXMgdGhlCiAgICAgICAgICMgZGVzdGluYXRpb24gcGF0aC4KLSAgICAgICAg JGluZGV4UGF0aCA9ICQ0OwotICAgICAgICAjIFVzZSAkUE9TVE1BVENIIHRvIHByZXNlcnZlIHRo ZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXIuCi0gICAgICAgICRfID0gIkluZGV4OiAkaW5kZXhQYXRo JFBPU1RNQVRDSCI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0LgorICAgICAgICAkaW5kZXhQYXRo ID0gJGdpdEhlYWRlclN0YXJ0SGFzaC0+e2Rlc3RpbmF0aW9uRmlsZX07CisgICAgICAgICRfID0g IkluZGV4OiAkaW5kZXhQYXRoJGVvbCI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0LgogICAgIH0g ZWxzZSB7CiAgICAgICAgIGRpZSgiQ291bGQgbm90IHBhcnNlIGxlYWRpbmcgXCJkaWZmIC0tZ2l0 XCIgbGluZTogXCIkbGluZVwiLiIpOwogICAgIH0KQEAgLTUzOSw3ICs1NTgsNyBAQCBzdWIgcGFy c2VHaXREaWZmSGVhZGVyKCQkKQogCiAgICAgICAgICRfID0gPCRmaWxlSGFuZGxlPjsgIyBOb3Qg ZGVmaW5lZCBpZiBlbmQtb2YtZmlsZSByZWFjaGVkLgogCi0gICAgICAgIGxhc3QgaWYgKCFkZWZp bmVkKCRfKSB8fCAvJGhlYWRlclN0YXJ0UmVnRXgvIHx8ICRmb3VuZEhlYWRlckVuZGluZyk7Cisg ICAgICAgIGxhc3QgaWYgKCFkZWZpbmVkKCRfKSB8fCBwYXJzZUdpdEhlYWRlclN0YXJ0KCRfKSB8 fCAkZm91bmRIZWFkZXJFbmRpbmcpOwogICAgIH0KIAogICAgIG15ICRleGVjdXRhYmxlQml0RGVs dGEgPSAkbmV3RXhlY3V0YWJsZUJpdCAtICRvbGRFeGVjdXRhYmxlQml0OwpAQCAtNTkxLDE1ICs2 MTAsMTUgQEAgc3ViIHBhcnNlU3ZuRGlmZkhlYWRlcigkJCkKIAogICAgICRfID0gJGxpbmU7CiAK LSAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9IHFyL15JbmRleDogLzsKLQotICAgIGlmICghLyRo ZWFkZXJTdGFydFJlZ0V4LykgeworICAgIG15ICRpbmRleFBhdGg7CisgICAgaWYgKG15ICgkc3Zu SGVhZGVyU3RhcnRIYXNoLCAkZW9sKSA9IHBhcnNlU3ZuSGVhZGVyU3RhcnQoJGxpbmUpKSB7Cisg ICAgICAgICRpbmRleFBhdGggPSAkc3ZuSGVhZGVyU3RhcnRIYXNoLT57ZGVzdGluYXRpb25GaWxl fTsKKyAgICB9IGVsc2UgewogICAgICAgICBkaWUoIkZpcnN0IGxpbmUgb2YgU1ZOIGRpZmYgZG9l cyBub3QgYmVnaW4gd2l0aCBcIkluZGV4IFwiOiBcIiRfXCIiKTsKICAgICB9CiAKICAgICBteSAk Y29waWVkRnJvbVBhdGg7CiAgICAgbXkgJGZvdW5kSGVhZGVyRW5kaW5nOwotICAgIG15ICRpbmRl eFBhdGg7CiAgICAgbXkgJGlzQmluYXJ5OwogICAgIG15ICRpc05ldzsKICAgICBteSAkc291cmNl UmV2aXNpb247CkBAIC02MTIsOSArNjMxLDcgQEAgc3ViIHBhcnNlU3ZuRGlmZkhlYWRlcigkJCkK IAogICAgICAgICAjIEZpeCBwYXRocyBvbiAiIi0tLSIgYW5kICIrKysiIGxpbmVzIHRvIG1hdGNo IHRoZSBsZWFkaW5nCiAgICAgICAgICMgaW5kZXggbGluZS4KLSAgICAgICAgaWYgKC9eSW5kZXg6 IChbXlxyXG5dKykvKSB7Ci0gICAgICAgICAgICAkaW5kZXhQYXRoID0gJDE7Ci0gICAgICAgIH0g ZWxzaWYgKHMvXi0tLSBcUysvLS0tICRpbmRleFBhdGgvKSB7CisgICAgICAgIGlmIChzL14tLS0g XFMrLy0tLSAkaW5kZXhQYXRoLykgewogICAgICAgICAgICAgIyAtLS0KICAgICAgICAgICAgIGlm ICgvXi0tLSAuK1wocmV2aXNpb24gKFxkKylcKS8pIHsKICAgICAgICAgICAgICAgICAkc291cmNl UmV2aXNpb24gPSAkMTsKQEAgLTYzOCw3ICs2NTUsNyBAQCBzdWIgcGFyc2VTdm5EaWZmSGVhZGVy KCQkKQogCiAgICAgICAgICRfID0gPCRmaWxlSGFuZGxlPjsgIyBOb3QgZGVmaW5lZCBpZiBlbmQt b2YtZmlsZSByZWFjaGVkLgogCi0gICAgICAgIGxhc3QgaWYgKCFkZWZpbmVkKCRfKSB8fCAvJGhl YWRlclN0YXJ0UmVnRXgvIHx8ICRmb3VuZEhlYWRlckVuZGluZyk7CisgICAgICAgIGxhc3QgaWYg KCFkZWZpbmVkKCRfKSB8fCBwYXJzZVN2bkhlYWRlclN0YXJ0KCRfKSB8fCAkZm91bmRIZWFkZXJF bmRpbmcpOwogICAgIH0KIAogICAgIGlmICghJGZvdW5kSGVhZGVyRW5kaW5nKSB7CkBAIC02OTcs MTAgKzcxNCwxMCBAQCBzdWIgcGFyc2VEaWZmSGVhZGVyKCQkKQogICAgIG15ICRpc1N2bjsKICAg ICBteSAkbGFzdFJlYWRMaW5lOwogCi0gICAgaWYgKCRsaW5lID1+IC9eSW5kZXg6LykgeworICAg IGlmIChwYXJzZVN2bkhlYWRlclN0YXJ0KCRsaW5lKSkgewogICAgICAgICAkaXNTdm4gPSAxOwog ICAgICAgICAoJGhlYWRlciwgJGxhc3RSZWFkTGluZSkgPSBwYXJzZVN2bkRpZmZIZWFkZXIoJGZp bGVIYW5kbGUsICRsaW5lKTsKLSAgICB9IGVsc2lmICgkbGluZSA9fiAvXmRpZmYgLS1naXQvKSB7 CisgICAgfSBlbHNpZiAocGFyc2VHaXRIZWFkZXJTdGFydCgkbGluZSkpIHsKICAgICAgICAgJGlz R2l0ID0gMTsKICAgICAgICAgKCRoZWFkZXIsICRsYXN0UmVhZExpbmUpID0gcGFyc2VHaXREaWZm SGVhZGVyKCRmaWxlSGFuZGxlLCAkbGluZSk7CiAgICAgfSBlbHNlIHsKQEAgLTc2MSwyMCArNzc4 LDE5IEBAIHN1YiBwYXJzZURpZmYoJCQpCiB7CiAgICAgbXkgKCRmaWxlSGFuZGxlLCAkbGluZSkg PSBAXzsKIAotICAgIG15ICRoZWFkZXJTdGFydFJlZ0V4ID0gcXIjXkluZGV4OiAjOyAjIFNWTi1z dHlsZSBoZWFkZXIgZm9yIHRoZSBkZWZhdWx0Ci0gICAgbXkgJGdpdEhlYWRlclN0YXJ0UmVnRXgg PSBxciNeZGlmZiAtLWdpdCBcdy8jOworICAgIG15ICRwYXJzZUhlYWRlclN0YXJ0ID0gXCZwYXJz ZVN2bkhlYWRlclN0YXJ0OyAjIFNWTi1zdHlsZSBoZWFkZXIgZm9yIHRoZSBkZWZhdWx0CiAKICAg ICBteSAkaGVhZGVySGFzaFJlZjsgIyBMYXN0IGhlYWRlciBmb3VuZCwgYXMgcmV0dXJuZWQgYnkg cGFyc2VEaWZmSGVhZGVyKCkuCiAgICAgbXkgJHN2blRleHQ7CiAgICAgd2hpbGUgKGRlZmluZWQo JGxpbmUpKSB7Ci0gICAgICAgIGlmICghJGhlYWRlckhhc2hSZWYgJiYgKCRsaW5lID1+ICRnaXRI ZWFkZXJTdGFydFJlZ0V4KSkgeworICAgICAgICBpZiAoISRoZWFkZXJIYXNoUmVmICYmIHBhcnNl R2l0SGVhZGVyU3RhcnQoJGxpbmUpKSB7CiAgICAgICAgICAgICAjIFRoZW4gYXNzdW1lIGFsbCBk aWZmcyBpbiB0aGUgcGF0Y2ggYXJlIEdpdC1mb3JtYXR0ZWQuIFRoaXMKICAgICAgICAgICAgICMg YmxvY2sgd2FzIG1hZGUgdG8gYmUgZW50ZXJhYmxlIGF0IG1vc3Qgb25jZSBzaW5jZSB3ZSBhc3N1 bWUKICAgICAgICAgICAgICMgYWxsIGRpZmZzIGluIHRoZSBwYXRjaCBhcmUgZm9ybWF0dGVkIHRo ZSBzYW1lIChTVk4gb3IgR2l0KS4KLSAgICAgICAgICAgICRoZWFkZXJTdGFydFJlZ0V4ID0gJGdp dEhlYWRlclN0YXJ0UmVnRXg7CisgICAgICAgICAgICAkcGFyc2VIZWFkZXJTdGFydCA9IFwmcGFy c2VHaXRIZWFkZXJTdGFydDsKICAgICAgICAgfQogCi0gICAgICAgIGlmICgkbGluZSAhfiAkaGVh ZGVyU3RhcnRSZWdFeCkgeworICAgICAgICBpZiAoISYkcGFyc2VIZWFkZXJTdGFydCgkbGluZSkp IHsKICAgICAgICAgICAgICMgVGhlbiB3ZSBhcmUgaW4gdGhlIGJvZHkgb2YgdGhlIGRpZmYuCiAg ICAgICAgICAgICAkc3ZuVGV4dCAuPSAkbGluZTsKICAgICAgICAgICAgICRsaW5lID0gPCRmaWxl SGFuZGxlPjsK 55495 2010-05-09 02:28:37 -0700 2010-05-09 02:45:05 -0700 Patch Bug38812_1.patch text/plain 3989 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU5MDUwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUtMDkgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODgxMgorCisg ICAgICAgIEV4dHJhY3QgdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbnMgZm9yIHBhcnNpbmcgdGhlIHN0 YXJ0IG9mIGFuIFNWTiBhbmQKKyAgICAgICAgR2l0IGhlYWRlciBpbnRvIHRoZWlyIG93biByZXNw ZWN0aXZlIGZ1bmN0aW9ucyBzbyBhcyB0byBjZW50cmFsaXplCisgICAgICAgIHRoZXNlIHJlZ3Vs YXIgZXhwcmVzc2lvbnMgYXMgdGhleSBhcmUgdXNlZCB0aHJvdWdob3V0IFZDU1V0aWxzLnBtLgor CisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKwogMjAxMC0wNS0wOSAgQ2hyaXMgSmVy ZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW5p ZWwgQmF0ZXMuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDU5MDQ5KQor KysgV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQkod29ya2luZyBjb3B5KQpAQCAtODQs NiArODQsOSBAQCBteSAkaXNHaXRCcmFuY2hCdWlsZDsKIG15ICRpc1NWTjsKIG15ICRzdm5WZXJz aW9uOwogCitteSAkZ2l0SGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPygu KykgKFx3Lyk/KFteXHJcbl0rKSM7CitteSAkc3ZuSGVhZGVyU3RhcnRSZWdFeCA9IHFyI15JbmRl eDogKFteXHJcbl0rKSM7CisKICMgVGhpcyBtZXRob2QgaXMgZm9yIHBvcnRhYmlsaXR5LiBSZXR1 cm4gdGhlIHN5c3RlbS1hcHByb3ByaWF0ZSBleGl0CiAjIHN0YXR1cyBvZiBhIGNoaWxkIHByb2Nl c3MuCiAjCkBAIC00NzEsOSArNDc0LDggQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkKIAog ICAgICRfID0gJGxpbmU7CiAKLSAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0t Z2l0IChcdy8pPyguKykgKFx3Lyk/KFteXHJcbl0rKSM7CiAgICAgbXkgJGluZGV4UGF0aDsKLSAg ICBpZiAoLyRoZWFkZXJTdGFydFJlZ0V4LykgeworICAgIGlmICgvJGdpdEhlYWRlclN0YXJ0UmVn RXgvKSB7CiAgICAgICAgICMgVGhlIGZpcnN0IGFuZCBzZWNvbmQgcGF0aHMgY2FuIGRpZmZlciBp biB0aGUgY2FzZSBvZiBjb3BpZXMKICAgICAgICAgIyBhbmQgcmVuYW1lcy4gIFdlIHVzZSB0aGUg c2Vjb25kIGZpbGUgcGF0aCBiZWNhdXNlIGl0IGlzIHRoZQogICAgICAgICAjIGRlc3RpbmF0aW9u IHBhdGguCkBAIC01MzksNyArNTQxLDcgQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkKIAog ICAgICAgICAkXyA9IDwkZmlsZUhhbmRsZT47ICMgTm90IGRlZmluZWQgaWYgZW5kLW9mLWZpbGUg cmVhY2hlZC4KIAotICAgICAgICBsYXN0IGlmICghZGVmaW5lZCgkXykgfHwgLyRoZWFkZXJTdGFy dFJlZ0V4LyB8fCAkZm91bmRIZWFkZXJFbmRpbmcpOworICAgICAgICBsYXN0IGlmICghZGVmaW5l ZCgkXykgfHwgLyRnaXRIZWFkZXJTdGFydFJlZ0V4LyB8fCAkZm91bmRIZWFkZXJFbmRpbmcpOwog ICAgIH0KIAogICAgIG15ICRleGVjdXRhYmxlQml0RGVsdGEgPSAkbmV3RXhlY3V0YWJsZUJpdCAt ICRvbGRFeGVjdXRhYmxlQml0OwpAQCAtNTkxLDE1ICs1OTMsMTUgQEAgc3ViIHBhcnNlU3ZuRGlm ZkhlYWRlcigkJCkKIAogICAgICRfID0gJGxpbmU7CiAKLSAgICBteSAkaGVhZGVyU3RhcnRSZWdF eCA9IHFyL15JbmRleDogLzsKLQotICAgIGlmICghLyRoZWFkZXJTdGFydFJlZ0V4LykgeworICAg IG15ICRpbmRleFBhdGg7CisgICAgaWYgKC8kc3ZuSGVhZGVyU3RhcnRSZWdFeC8pIHsKKyAgICAg ICAgJGluZGV4UGF0aCA9ICQxOworICAgIH0gZWxzZSB7CiAgICAgICAgIGRpZSgiRmlyc3QgbGlu ZSBvZiBTVk4gZGlmZiBkb2VzIG5vdCBiZWdpbiB3aXRoIFwiSW5kZXggXCI6IFwiJF9cIiIpOwog ICAgIH0KIAogICAgIG15ICRjb3BpZWRGcm9tUGF0aDsKICAgICBteSAkZm91bmRIZWFkZXJFbmRp bmc7Ci0gICAgbXkgJGluZGV4UGF0aDsKICAgICBteSAkaXNCaW5hcnk7CiAgICAgbXkgJGlzTmV3 OwogICAgIG15ICRzb3VyY2VSZXZpc2lvbjsKQEAgLTYxMiw5ICs2MTQsNyBAQCBzdWIgcGFyc2VT dm5EaWZmSGVhZGVyKCQkKQogCiAgICAgICAgICMgRml4IHBhdGhzIG9uICIiLS0tIiBhbmQgIisr KyIgbGluZXMgdG8gbWF0Y2ggdGhlIGxlYWRpbmcKICAgICAgICAgIyBpbmRleCBsaW5lLgotICAg ICAgICBpZiAoL15JbmRleDogKFteXHJcbl0rKS8pIHsKLSAgICAgICAgICAgICRpbmRleFBhdGgg PSAkMTsKLSAgICAgICAgfSBlbHNpZiAocy9eLS0tIFxTKy8tLS0gJGluZGV4UGF0aC8pIHsKKyAg ICAgICAgaWYgKHMvXi0tLSBcUysvLS0tICRpbmRleFBhdGgvKSB7CiAgICAgICAgICAgICAjIC0t LQogICAgICAgICAgICAgaWYgKC9eLS0tIC4rXChyZXZpc2lvbiAoXGQrKVwpLykgewogICAgICAg ICAgICAgICAgICRzb3VyY2VSZXZpc2lvbiA9ICQxOwpAQCAtNjM4LDcgKzYzOCw3IEBAIHN1YiBw YXJzZVN2bkRpZmZIZWFkZXIoJCQpCiAKICAgICAgICAgJF8gPSA8JGZpbGVIYW5kbGU+OyAjIE5v dCBkZWZpbmVkIGlmIGVuZC1vZi1maWxlIHJlYWNoZWQuCiAKLSAgICAgICAgbGFzdCBpZiAoIWRl ZmluZWQoJF8pIHx8IC8kaGVhZGVyU3RhcnRSZWdFeC8gfHwgJGZvdW5kSGVhZGVyRW5kaW5nKTsK KyAgICAgICAgbGFzdCBpZiAoIWRlZmluZWQoJF8pIHx8IC8kc3ZuSGVhZGVyU3RhcnRSZWdFeC8g fHwgJGZvdW5kSGVhZGVyRW5kaW5nKTsKICAgICB9CiAKICAgICBpZiAoISRmb3VuZEhlYWRlckVu ZGluZykgewpAQCAtNjk3LDEwICs2OTcsMTAgQEAgc3ViIHBhcnNlRGlmZkhlYWRlcigkJCkKICAg ICBteSAkaXNTdm47CiAgICAgbXkgJGxhc3RSZWFkTGluZTsKIAotICAgIGlmICgkbGluZSA9fiAv XkluZGV4Oi8pIHsKKyAgICBpZiAoJGxpbmUgPX4gJHN2bkhlYWRlclN0YXJ0UmVnRXgpIHsKICAg ICAgICAgJGlzU3ZuID0gMTsKICAgICAgICAgKCRoZWFkZXIsICRsYXN0UmVhZExpbmUpID0gcGFy c2VTdm5EaWZmSGVhZGVyKCRmaWxlSGFuZGxlLCAkbGluZSk7Ci0gICAgfSBlbHNpZiAoJGxpbmUg PX4gL15kaWZmIC0tZ2l0LykgeworICAgIH0gZWxzaWYgKCRsaW5lID1+ICRnaXRIZWFkZXJTdGFy dFJlZ0V4KSB7CiAgICAgICAgICRpc0dpdCA9IDE7CiAgICAgICAgICgkaGVhZGVyLCAkbGFzdFJl YWRMaW5lKSA9IHBhcnNlR2l0RGlmZkhlYWRlcigkZmlsZUhhbmRsZSwgJGxpbmUpOwogICAgIH0g ZWxzZSB7CkBAIC03NjEsOCArNzYxLDcgQEAgc3ViIHBhcnNlRGlmZigkJCkKIHsKICAgICBteSAo JGZpbGVIYW5kbGUsICRsaW5lKSA9IEBfOwogCi0gICAgbXkgJGhlYWRlclN0YXJ0UmVnRXggPSBx ciNeSW5kZXg6ICM7ICMgU1ZOLXN0eWxlIGhlYWRlciBmb3IgdGhlIGRlZmF1bHQKLSAgICBteSAk Z2l0SGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IFx3LyM7CisgICAgbXkgJGhlYWRl clN0YXJ0UmVnRXggPSAkc3ZuSGVhZGVyU3RhcnRSZWdFeDsgIyBTVk4tc3R5bGUgaGVhZGVyIGZv ciB0aGUgZGVmYXVsdAogCiAgICAgbXkgJGhlYWRlckhhc2hSZWY7ICMgTGFzdCBoZWFkZXIgZm91 bmQsIGFzIHJldHVybmVkIGJ5IHBhcnNlRGlmZkhlYWRlcigpLgogICAgIG15ICRzdm5UZXh0Owo= 55498 2010-05-09 02:45:05 -0700 2010-05-09 02:50:39 -0700 Patch Bug38812_2.patch text/plain 4458 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU5MDUwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUtMDkgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODgxMgorCisg ICAgICAgIE1ha2UgdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbnMgZm9yIHBhcnNpbmcgdGhlIHN0YXJ0 IG9mIGFuIFNWTgorICAgICAgICBhbmQgR2l0IGhlYWRlciBnbG9iYWwgdmFyaWFibGVzIHNpbmNl IHRoZXkgYXJlIHVzZWQgdGhyb3VnaG91dAorICAgICAgICBWQ1NVdGlscy5wbS4KKworICAgICAg ICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisKIDIwMTAtMDUtMDkgIENocmlzIEplcmRvbmVrICA8 Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVz LgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCShyZXZpc2lvbiA1OTA0OSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHdvcmtpbmcgY29weSkKQEAgLTg0LDYgKzg0LDkg QEAgbXkgJGlzR2l0QnJhbmNoQnVpbGQ7CiBteSAkaXNTVk47CiBteSAkc3ZuVmVyc2lvbjsKIAor bXkgJGdpdERpZmZTdGFydFJlZ0V4ID0gcXIjXmRpZmYgLS1naXQgKFx3Lyk/KC4rKSAoXHcvKT8o W15cclxuXSspIzsKK215ICRzdm5EaWZmU3RhcnRSZWdFeCA9IHFyI15JbmRleDogKFteXHJcbl0r KSM7CisKICMgVGhpcyBtZXRob2QgaXMgZm9yIHBvcnRhYmlsaXR5LiBSZXR1cm4gdGhlIHN5c3Rl bS1hcHByb3ByaWF0ZSBleGl0CiAjIHN0YXR1cyBvZiBhIGNoaWxkIHByb2Nlc3MuCiAjCkBAIC00 NzEsOSArNDc0LDggQEAgc3ViIHBhcnNlR2l0RGlmZkhlYWRlcigkJCkKIAogICAgICRfID0gJGxp bmU7CiAKLSAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9IHFyI15kaWZmIC0tZ2l0IChcdy8pPygu KykgKFx3Lyk/KFteXHJcbl0rKSM7CiAgICAgbXkgJGluZGV4UGF0aDsKLSAgICBpZiAoLyRoZWFk ZXJTdGFydFJlZ0V4LykgeworICAgIGlmICgvJGdpdERpZmZTdGFydFJlZ0V4LykgewogICAgICAg ICAjIFRoZSBmaXJzdCBhbmQgc2Vjb25kIHBhdGhzIGNhbiBkaWZmZXIgaW4gdGhlIGNhc2Ugb2Yg Y29waWVzCiAgICAgICAgICMgYW5kIHJlbmFtZXMuICBXZSB1c2UgdGhlIHNlY29uZCBmaWxlIHBh dGggYmVjYXVzZSBpdCBpcyB0aGUKICAgICAgICAgIyBkZXN0aW5hdGlvbiBwYXRoLgpAQCAtNTM5 LDcgKzU0MSw3IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAKICAgICAgICAgJF8gPSA8 JGZpbGVIYW5kbGU+OyAjIE5vdCBkZWZpbmVkIGlmIGVuZC1vZi1maWxlIHJlYWNoZWQuCiAKLSAg ICAgICAgbGFzdCBpZiAoIWRlZmluZWQoJF8pIHx8IC8kaGVhZGVyU3RhcnRSZWdFeC8gfHwgJGZv dW5kSGVhZGVyRW5kaW5nKTsKKyAgICAgICAgbGFzdCBpZiAoIWRlZmluZWQoJF8pIHx8IC8kZ2l0 RGlmZlN0YXJ0UmVnRXgvIHx8ICRmb3VuZEhlYWRlckVuZGluZyk7CiAgICAgfQogCiAgICAgbXkg JGV4ZWN1dGFibGVCaXREZWx0YSA9ICRuZXdFeGVjdXRhYmxlQml0IC0gJG9sZEV4ZWN1dGFibGVC aXQ7CkBAIC01OTEsMTUgKzU5MywxNSBAQCBzdWIgcGFyc2VTdm5EaWZmSGVhZGVyKCQkKQogCiAg ICAgJF8gPSAkbGluZTsKIAotICAgIG15ICRoZWFkZXJTdGFydFJlZ0V4ID0gcXIvXkluZGV4OiAv OwotCi0gICAgaWYgKCEvJGhlYWRlclN0YXJ0UmVnRXgvKSB7CisgICAgbXkgJGluZGV4UGF0aDsK KyAgICBpZiAoLyRzdm5EaWZmU3RhcnRSZWdFeC8pIHsKKyAgICAgICAgJGluZGV4UGF0aCA9ICQx OworICAgIH0gZWxzZSB7CiAgICAgICAgIGRpZSgiRmlyc3QgbGluZSBvZiBTVk4gZGlmZiBkb2Vz IG5vdCBiZWdpbiB3aXRoIFwiSW5kZXggXCI6IFwiJF9cIiIpOwogICAgIH0KIAogICAgIG15ICRj b3BpZWRGcm9tUGF0aDsKICAgICBteSAkZm91bmRIZWFkZXJFbmRpbmc7Ci0gICAgbXkgJGluZGV4 UGF0aDsKICAgICBteSAkaXNCaW5hcnk7CiAgICAgbXkgJGlzTmV3OwogICAgIG15ICRzb3VyY2VS ZXZpc2lvbjsKQEAgLTYxMiw5ICs2MTQsNyBAQCBzdWIgcGFyc2VTdm5EaWZmSGVhZGVyKCQkKQog CiAgICAgICAgICMgRml4IHBhdGhzIG9uICIiLS0tIiBhbmQgIisrKyIgbGluZXMgdG8gbWF0Y2gg dGhlIGxlYWRpbmcKICAgICAgICAgIyBpbmRleCBsaW5lLgotICAgICAgICBpZiAoL15JbmRleDog KFteXHJcbl0rKS8pIHsKLSAgICAgICAgICAgICRpbmRleFBhdGggPSAkMTsKLSAgICAgICAgfSBl bHNpZiAocy9eLS0tIFxTKy8tLS0gJGluZGV4UGF0aC8pIHsKKyAgICAgICAgaWYgKHMvXi0tLSBc UysvLS0tICRpbmRleFBhdGgvKSB7CiAgICAgICAgICAgICAjIC0tLQogICAgICAgICAgICAgaWYg KC9eLS0tIC4rXChyZXZpc2lvbiAoXGQrKVwpLykgewogICAgICAgICAgICAgICAgICRzb3VyY2VS ZXZpc2lvbiA9ICQxOwpAQCAtNjM4LDcgKzYzOCw3IEBAIHN1YiBwYXJzZVN2bkRpZmZIZWFkZXIo JCQpCiAKICAgICAgICAgJF8gPSA8JGZpbGVIYW5kbGU+OyAjIE5vdCBkZWZpbmVkIGlmIGVuZC1v Zi1maWxlIHJlYWNoZWQuCiAKLSAgICAgICAgbGFzdCBpZiAoIWRlZmluZWQoJF8pIHx8IC8kaGVh ZGVyU3RhcnRSZWdFeC8gfHwgJGZvdW5kSGVhZGVyRW5kaW5nKTsKKyAgICAgICAgbGFzdCBpZiAo IWRlZmluZWQoJF8pIHx8IC8kc3ZuRGlmZlN0YXJ0UmVnRXgvIHx8ICRmb3VuZEhlYWRlckVuZGlu Zyk7CiAgICAgfQogCiAgICAgaWYgKCEkZm91bmRIZWFkZXJFbmRpbmcpIHsKQEAgLTY5NywxMCAr Njk3LDEwIEBAIHN1YiBwYXJzZURpZmZIZWFkZXIoJCQpCiAgICAgbXkgJGlzU3ZuOwogICAgIG15 ICRsYXN0UmVhZExpbmU7CiAKLSAgICBpZiAoJGxpbmUgPX4gL15JbmRleDovKSB7CisgICAgaWYg KCRsaW5lID1+ICRzdm5EaWZmU3RhcnRSZWdFeCkgewogICAgICAgICAkaXNTdm4gPSAxOwogICAg ICAgICAoJGhlYWRlciwgJGxhc3RSZWFkTGluZSkgPSBwYXJzZVN2bkRpZmZIZWFkZXIoJGZpbGVI YW5kbGUsICRsaW5lKTsKLSAgICB9IGVsc2lmICgkbGluZSA9fiAvXmRpZmYgLS1naXQvKSB7Cisg ICAgfSBlbHNpZiAoJGxpbmUgPX4gJGdpdERpZmZTdGFydFJlZ0V4KSB7CiAgICAgICAgICRpc0dp dCA9IDE7CiAgICAgICAgICgkaGVhZGVyLCAkbGFzdFJlYWRMaW5lKSA9IHBhcnNlR2l0RGlmZkhl YWRlcigkZmlsZUhhbmRsZSwgJGxpbmUpOwogICAgIH0gZWxzZSB7CkBAIC03NjEsMTcgKzc2MSwx NiBAQCBzdWIgcGFyc2VEaWZmKCQkKQogewogICAgIG15ICgkZmlsZUhhbmRsZSwgJGxpbmUpID0g QF87CiAKLSAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9IHFyI15JbmRleDogIzsgIyBTVk4tc3R5 bGUgaGVhZGVyIGZvciB0aGUgZGVmYXVsdAotICAgIG15ICRnaXRIZWFkZXJTdGFydFJlZ0V4ID0g cXIjXmRpZmYgLS1naXQgXHcvIzsKKyAgICBteSAkaGVhZGVyU3RhcnRSZWdFeCA9ICRzdm5EaWZm U3RhcnRSZWdFeDsgIyBTVk4tc3R5bGUgaGVhZGVyIGZvciB0aGUgZGVmYXVsdAogCiAgICAgbXkg JGhlYWRlckhhc2hSZWY7ICMgTGFzdCBoZWFkZXIgZm91bmQsIGFzIHJldHVybmVkIGJ5IHBhcnNl RGlmZkhlYWRlcigpLgogICAgIG15ICRzdm5UZXh0OwogICAgIHdoaWxlIChkZWZpbmVkKCRsaW5l KSkgewotICAgICAgICBpZiAoISRoZWFkZXJIYXNoUmVmICYmICgkbGluZSA9fiAkZ2l0SGVhZGVy U3RhcnRSZWdFeCkpIHsKKyAgICAgICAgaWYgKCEkaGVhZGVySGFzaFJlZiAmJiAoJGxpbmUgPX4g JGdpdERpZmZTdGFydFJlZ0V4KSkgewogICAgICAgICAgICAgIyBUaGVuIGFzc3VtZSBhbGwgZGlm ZnMgaW4gdGhlIHBhdGNoIGFyZSBHaXQtZm9ybWF0dGVkLiBUaGlzCiAgICAgICAgICAgICAjIGJs b2NrIHdhcyBtYWRlIHRvIGJlIGVudGVyYWJsZSBhdCBtb3N0IG9uY2Ugc2luY2Ugd2UgYXNzdW1l CiAgICAgICAgICAgICAjIGFsbCBkaWZmcyBpbiB0aGUgcGF0Y2ggYXJlIGZvcm1hdHRlZCB0aGUg c2FtZSAoU1ZOIG9yIEdpdCkuCi0gICAgICAgICAgICAkaGVhZGVyU3RhcnRSZWdFeCA9ICRnaXRI ZWFkZXJTdGFydFJlZ0V4OworICAgICAgICAgICAgJGhlYWRlclN0YXJ0UmVnRXggPSAkZ2l0RGlm ZlN0YXJ0UmVnRXg7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoJGxpbmUgIX4gJGhlYWRlclN0 YXJ0UmVnRXgpIHsK