31457 2009-11-12 23:21:47 -0800 svn-apply may not handle git patches created by bugzilla-tool 2009-11-15 22:07:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 31458 1 hamaji webkit-unassigned oldest_to_newest 163236 0 hamaji 2009-11-12 23:21:47 -0800 bugzilla-tool's run_command calls rstrip() for stdout, so generated patches will be rstripped. As current svn-apply expects trailing "\n\n" in binary patch, the patching may fail if binary diff is its last diff. It seems removing rstrip() causes unitttest failure in other tests. I think rstripping may happen due to other reasons and the current check is too strict. Let's relax the check a bit. 163237 1 43138 hamaji 2009-11-12 23:23:14 -0800 Created attachment 43138 Patch v1 163467 2 43138 eric 2009-11-13 13:17:33 -0800 Comment on attachment 43138 Patch v1 The rstripping was added for convenience when dealing with output from commands like svn info, where it's just a single line of output and you don't actually want the trailing \n. We can easily remove the rstrip() and fix all callers to deal with the added newline if that's better? 163580 3 43213 hamaji 2009-11-13 16:16:37 -0800 Created attachment 43213 Patch v2 163581 4 hamaji 2009-11-13 16:22:40 -0800 I agree run_command should return non-rstripped values if there are no critical reasons. I updated my patch. 163842 5 43213 eric 2009-11-15 21:57:31 -0800 Comment on attachment 43213 Patch v2 Fantastic! 163845 6 hamaji 2009-11-15 22:07:01 -0800 Thanks for the review! Closing this bug. 43138 2009-11-12 23:23:14 -0800 2009-11-13 16:16:31 -0800 Patch v1 bug-31457-20091113162312.patch text/plain 2199 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiODQ5ZTAwLi40YmFjMmYwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTEt MTIgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tYXBwbHkgbWF5IG5vdCBo YW5kbGUgZ2l0IHBhdGNoZXMgY3JlYXRlZCBieSBidWd6aWxsYS10b29sCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTQ1NworCisgICAgICAgIFJlbGF4 IHRoZSBjaGVjayBvZiBnaXQgYmluYXJ5IHBhdGNoIGZvcm1hdCBhIGJpdC4KKworICAgICAgICAq IFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0 dGVzdC5weToKKwogMjAwOS0xMS0xMSAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRp bHMucG0KaW5kZXggNzYzODEwMi4uNjk1YzY4ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy9WQ1NVdGlscy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBA IC01NDQsOCArNTQ0LDggQEAgc3ViIGRlY29kZUdpdEJpbmFyeVBhdGNoKCQkKQogICAgICMKICAg ICAjIFRoZW4sIGNvbnRlbnQgb2YgdGhlIGNodW5rIGNvbWVzLiBUbyBkZWNvZGUgdGhlIGNvbnRl bnQsIHdlCiAgICAgIyBuZWVkIGRlY29kZSBpdCB3aXRoIGJhc2U4NSBmaXJzdCwgYW5kIHRoZW4g emxpYi4KLSAgICBteSAkZ2l0UGF0Y2hSZWdFeHAgPSAnKGxpdGVyYWx8ZGVsdGEpIChbMC05XSsp XG4oW0EtWmEtejAtOSEjJCUmKCkqKy07PD0+P0BeX2B7fH1+XFxuXSo/KVxuXG4nOwotICAgIGlm ICgkY29udGVudHMgIX4gbSJcbkdJVCBiaW5hcnkgcGF0Y2hcbiRnaXRQYXRjaFJlZ0V4cCRnaXRQ YXRjaFJlZ0V4cFxaIikgeworICAgIG15ICRnaXRQYXRjaFJlZ0V4cCA9ICcobGl0ZXJhbHxkZWx0 YSkgKFswLTldKylcbihbQS1aYS16MC05ISMkJSYoKSorLTs8PT4/QF5fYHt8fX5cXG5dKj8pJzsK KyAgICBpZiAoJGNvbnRlbnRzICF+IG0iXG5HSVQgYmluYXJ5IHBhdGNoXG4kZ2l0UGF0Y2hSZWdF eHBcblxuJGdpdFBhdGNoUmVnRXhwXG57MCwyfVxaIikgewogICAgICAgICBkaWUgIiRmdWxsUGF0 aDogdW5rbm93biBnaXQgYmluYXJ5IHBhdGNoIGZvcm1hdCIKICAgICB9CiAKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5CmluZGV4IDNmODZlZjUuLjAxZjc1ZTYg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQpAQCAtMjgx LDYgKzI4MSwxMiBAQCBPY21ZZXgmcmVEJDtzTzgqRjlMKUIKICAgICAgICAgIyBDYW5ub3QgZGVs ZXRlIGFnYWluLgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRFcnJvciwgc2VsZi5z Y20uYXBwbHlfcGF0Y2gsIHNlbGYuX2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5X2RlbGV0aW9uKSkK IAorICAgICAgICAjIENoZWNrIGlmIHdlIGNhbiBhcHBseSByc3RyaXBwZWQgcGF0Y2hlcy4KKyAg ICAgICAgc2VsZi5zY20uYXBwbHlfcGF0Y2goc2VsZi5fY3JlYXRlX3BhdGNoKGdpdF9iaW5hcnlf YWRkaXRpb24ucnN0cmlwKCkpKQorICAgICAgICBhZGRlZCA9IHJlYWRfZnJvbV9wYXRoKCdmaXp6 YnV6ejcuZ2lmJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg1MTIsIGxlbihhZGRlZCkpCisg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShhZGRlZC5zdGFydHN3aXRoKCdHSUY4OWEnKSkKKyAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKCdmaXp6YnV6ejcuZ2lmJyBpbiBzZWxmLnNjbS5jaGFuZ2VkX2Zp bGVzKCkpCiAKIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6 43213 2009-11-13 16:16:37 -0800 2009-11-15 22:07:27 -0800 Patch v2 bug-31457-20091114091635.patch text/plain 3694 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiODQ5ZTAwLi4zZGUwNDcyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTMgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tYXBwbHkgbWF5IG5vdCBo YW5kbGUgZ2l0IHBhdGNoZXMgY3JlYXRlZCBieSBidWd6aWxsYS10b29sCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTQ1NworCisgICAgICAgICogU2Ny aXB0cy9tb2R1bGVzL3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0 ZXN0LnB5OgorCiAyMDA5LTExLTExICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL3NjbS5weQppbmRleCAzZmZhMjNiLi5hZTI4ODJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9zY20ucHkKQEAgLTEzMSw3ICsxMzEsNyBAQCBjbGFzcyBTQ006CiAgICAgICAgICAgICBzdGRp biA9IHN1YnByb2Nlc3MuUElQRSBpZiBpbnB1dCBlbHNlIE5vbmUKICAgICAgICAgICAgIHN0cmlu Z190b19jb21tdW5pY2F0ZSA9IGlucHV0CiAgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBv cGVuKGFyZ3MsIHN0ZGluPXN0ZGluLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3Vi cHJvY2Vzcy5TVERPVVQsIGN3ZD1jd2QpCi0gICAgICAgIG91dHB1dCA9IHByb2Nlc3MuY29tbXVu aWNhdGUoc3RyaW5nX3RvX2NvbW11bmljYXRlKVswXS5yc3RyaXAoKQorICAgICAgICBvdXRwdXQg PSBwcm9jZXNzLmNvbW11bmljYXRlKHN0cmluZ190b19jb21tdW5pY2F0ZSlbMF0KICAgICAgICAg ZXhpdF9jb2RlID0gcHJvY2Vzcy53YWl0KCkKICAgICAgICAgaWYgZXhpdF9jb2RlOgogICAgICAg ICAgICAgc2NyaXB0X2Vycm9yID0gU2NyaXB0RXJyb3Ioc2NyaXB0X2FyZ3M9YXJncywgZXhpdF9j b2RlPWV4aXRfY29kZSwgb3V0cHV0PW91dHB1dCwgY3dkPWN3ZCkKQEAgLTI5NSw3ICsyOTUsNyBA QCBjbGFzcyBTVk4oU0NNKToKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgdmFsdWVfZnJvbV9z dm5faW5mbyhjbHMsIHBhdGgsIGZpZWxkX25hbWUpOgogICAgICAgICBzdm5faW5mb19hcmdzID0g Wydzdm4nLCAnaW5mbycsIHBhdGhdCi0gICAgICAgIGluZm9fb3V0cHV0ID0gY2xzLnJ1bl9jb21t YW5kKHN2bl9pbmZvX2FyZ3MpCisgICAgICAgIGluZm9fb3V0cHV0ID0gY2xzLnJ1bl9jb21tYW5k KHN2bl9pbmZvX2FyZ3MpLnJzdHJpcCgpCiAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCJeJXM6 ICg/UDx2YWx1ZT4uKykkIiAlIGZpZWxkX25hbWUsIGluZm9fb3V0cHV0LCByZS5NVUxUSUxJTkUp CiAgICAgICAgIGlmIG5vdCBtYXRjaDoKICAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKHNj cmlwdF9hcmdzPXN2bl9pbmZvX2FyZ3MsIG1lc3NhZ2U9J3N2biBpbmZvIGRpZCBub3QgY29udGFp biBhICVzLicgJSBmaWVsZF9uYW1lKQpAQCAtMzk0LDcgKzM5NCw3IEBAIGNsYXNzIEdpdChTQ00p OgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGluX3dvcmtpbmdfZGlyZWN0b3J5KGNscywg cGF0aCk6Ci0gICAgICAgIHJldHVybiBjbHMucnVuX2NvbW1hbmQoWydnaXQnLCAncmV2LXBhcnNl JywgJy0taXMtaW5zaWRlLXdvcmstdHJlZSddLCBjd2Q9cGF0aCwgZXJyb3JfaGFuZGxlcj1pZ25v cmVfZXJyb3IpID09ICJ0cnVlIgorICAgICAgICByZXR1cm4gY2xzLnJ1bl9jb21tYW5kKFsnZ2l0 JywgJ3Jldi1wYXJzZScsICctLWlzLWluc2lkZS13b3JrLXRyZWUnXSwgY3dkPXBhdGgsIGVycm9y X2hhbmRsZXI9aWdub3JlX2Vycm9yKS5yc3RyaXAoKSA9PSAidHJ1ZSIKIAogICAgIEBjbGFzc21l dGhvZAogICAgIGRlZiBmaW5kX2NoZWNrb3V0X3Jvb3QoY2xzLCBwYXRoKToKQEAgLTQ1NSw3ICs0 NTUsNyBAQCBjbGFzcyBHaXQoU0NNKToKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgZ2l0X2Nv bW1pdF9mcm9tX3N2bl9yZXZpc2lvbihjbHMsIHJldmlzaW9uKToKICAgICAgICAgIyBnaXQgc3Zu IGZpbmQtcmV2IGFsd2F5cyBleGl0cyAwLCBldmVuIHdoZW4gdGhlIHJldmlzaW9uIGlzIG5vdCBm b3VuZC4KLSAgICAgICAgcmV0dXJuIGNscy5ydW5fY29tbWFuZChbJ2dpdCcsICdzdm4nLCAnZmlu ZC1yZXYnLCAnciVzJyAlIHJldmlzaW9uXSkKKyAgICAgICAgcmV0dXJuIGNscy5ydW5fY29tbWFu ZChbJ2dpdCcsICdzdm4nLCAnZmluZC1yZXYnLCAnciVzJyAlIHJldmlzaW9uXSkucnN0cmlwKCkK IAogICAgIGRlZiBkaWZmX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbik6CiAgICAgICAgIGdp dF9jb21taXQgPSBzZWxmLmdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24ocmV2aXNpb24pCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQppbmRleCAzZjg2ZWY1 Li5hZTk4NWY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3Vu aXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3Qu cHkKQEAgLTEyNiwxMCArMTI2LDEwIEBAIGNsYXNzIFNDTUNsYXNzVGVzdHModW5pdHRlc3QuVGVz dENhc2UpOgogCiAgICAgZGVmIHRlc3RfcnVuX2NvbW1hbmRfd2l0aF9waXBlKHNlbGYpOgogICAg ICAgICBpbnB1dF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbJy9iaW4vZWNobycsICdmb29c bmJhciddLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c2VsZi5kZXZfbnVsbCkKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChTQ00ucnVuX2NvbW1hbmQoWycvdXNyL2Jpbi9ncmVwJywg J2JhciddLCBpbnB1dD1pbnB1dF9wcm9jZXNzLnN0ZG91dCksICJiYXIiKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKFNDTS5ydW5fY29tbWFuZChbJy91c3IvYmluL2dyZXAnLCAnYmFyJ10sIGlu cHV0PWlucHV0X3Byb2Nlc3Muc3Rkb3V0KSwgImJhclxuIikKIAogICAgICAgICAjIFRlc3QgdGhl IG5vbi1waXBlIGNhc2UgdG9vOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFNDTS5ydW5fY29t bWFuZChbJy91c3IvYmluL2dyZXAnLCAnYmFyJ10sIGlucHV0PSJmb29cbmJhciIpLCAiYmFyIikK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChTQ00ucnVuX2NvbW1hbmQoWycvdXNyL2Jpbi9ncmVw JywgJ2JhciddLCBpbnB1dD0iZm9vXG5iYXIiKSwgImJhclxuIikKIAogICAgICAgICBjb21tYW5k X3JldHVybnNfbm9uX3plcm8gPSBbJy9iaW4vc2gnLCAnLS1pbnZhbGlkLW9wdGlvbiddCiAgICAg ICAgICMgVGVzdCB3aGVuIHRoZSBpbnB1dCBwaXBlIHByb2Nlc3MgZmFpbHMuCg==