107871 2013-01-24 15:52:37 -0800 Fixing the diff_parser to correctly identify git diffs even with leading comments. 2013-01-24 21:08:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mithro mithro abarth dpranke eric webkit.review.bot oldest_to_newest 815925 0 mithro 2013-01-24 15:52:37 -0800 Fixing the diff_parser to correctly identify git diffs even with leading comments. 815927 1 184601 mithro 2013-01-24 15:53:27 -0800 Created attachment 184601 Patch 816118 2 184601 eric 2013-01-24 20:17:19 -0800 Comment on attachment 184601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184601&action=review LGTM. > Tools/Scripts/webkitpy/common/checkout/diff_parser.py:78 > # FIXME: This method belongs on DiffParser > -def get_diff_converter(first_diff_line): > +def get_diff_converter(lines): Commonly to solve this sort of testing problem, we just make an object, make this function a method, and then do: def my_free_function(foo): return MyNewObject().my_free_function(foo) I guess we just haven't gotten to that with DiffParser yet. 816159 3 184601 webkit.review.bot 2013-01-24 21:07:59 -0800 Comment on attachment 184601 Patch Clearing flags on attachment: 184601 Committed r140775: <http://trac.webkit.org/changeset/140775> 816160 4 webkit.review.bot 2013-01-24 21:08:03 -0800 All reviewed patches have been landed. Closing bug. 184601 2013-01-24 15:53:27 -0800 2013-01-24 21:07:59 -0800 Patch bug-107871-20130125105018.patch text/plain 5991 mithro U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNzMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTBiODgzMTkwMzVkNTNhNjkzNjhmMTc5MzExZWNmMjJi OGE5MmIxOS4uOTU3NDhkMTM5MjVhMDdkMzIxYzY1OTI1ZDQzYWNjOGJmYmQyYTgzOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEzLTAxLTI0ICBUaW0gJ21pdGhybycgQW5zZWxsICA8bWl0aHJvQG1pdGhpcy5jb20+ CisKKyAgICAgICAgRml4aW5nIHRoZSBkaWZmX3BhcnNlciB0byBjb3JyZWN0bHkgaWRlbnRpZnkg Z2l0IGRpZmZzIGV2ZW4gd2l0aCBsZWFkaW5nIGNvbW1lbnRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3ODcxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9kaWZmX3BhcnNlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9kaWZmX3BhcnNlcl91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvaGFzbGFuZGVkLnB5OgorCiAyMDEzLTAxLTI0ICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBBYnN0cmFjdCB0aGUgbG9n aWMgZm9yIGFwcGVuZGluZyBhIFVDaGFyMzIgb250byBTdHJpbmdCdWlsZGVyCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5Cmlu ZGV4IDNjNWI0NWIxZGMxYTM1OTcwNzk1YzdkY2M0NjdiNGY3ZDFjYWZjMWMuLjNhOWVhOTIyNGY3 Y2RhMGQyZjgxZmQzZGIyZjI1YzMwNGQ1ZjM4MjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5CkBAIC02OSwxOSArNjks MjcgQEAgZGVmIGdpdF9kaWZmX3RvX3N2bl9kaWZmKGxpbmUpOgogICAgIHJldHVybiBsaW5lCiAK IAorIyBUaGlzIGZ1bmN0aW9uIGV4aXN0cyBzbyB3ZSBjYW4gdW5pdHRlc3QgZ2V0X2RpZmZfY29u dmVydGVyIGZ1bmN0aW9uCitkZWYgc3ZuX2RpZmZfdG9fc3ZuX2RpZmYobGluZSk6CisgICAgcmV0 dXJuIGxpbmUKKworCiAjIEZJWE1FOiBUaGlzIG1ldGhvZCBiZWxvbmdzIG9uIERpZmZQYXJzZXIK LWRlZiBnZXRfZGlmZl9jb252ZXJ0ZXIoZmlyc3RfZGlmZl9saW5lKToKK2RlZiBnZXRfZGlmZl9j b252ZXJ0ZXIobGluZXMpOgogICAgICIiIkdldHMgYSBjb252ZXJ0ZXIgZnVuY3Rpb24gb2YgZGlm ZiBsaW5lcy4KIAogICAgIEFyZ3M6Ci0gICAgICBmaXJzdF9kaWZmX2xpbmU6IFRoZSBmaXJzdCBm aWxlbmFtZSBsaW5lIG9mIGEgZGlmZiBmaWxlLgotICAgICAgICAgICAgICAgICAgICAgICBJZiB0 aGlzIGxpbmUgaXMgZ2l0IGZvcm1hdHRlZCwgd2UnbGwgcmV0dXJuIGEKLSAgICAgICAgICAgICAg ICAgICAgICAgY29udmVydGVyIGZyb20gZ2l0IHRvIFNWTi4KKyAgICAgIGxpbmVzOiBUaGUgbGlu ZXMgb2YgYSBkaWZmIGZpbGUuCisgICAgICAgICAgICAgSWYgdGhpcyBsaW5lIGlzIGdpdCBmb3Jt YXR0ZWQsIHdlJ2xsIHJldHVybiBhCisgICAgICAgICAgICAgY29udmVydGVyIGZyb20gZ2l0IHRv IFNWTi4KICAgICAiIiIKLSAgICBpZiBtYXRjaChyIl5kaWZmIC0tZ2l0IFx3LyIsIGZpcnN0X2Rp ZmZfbGluZSk6Ci0gICAgICAgIHJldHVybiBnaXRfZGlmZl90b19zdm5fZGlmZgotICAgIHJldHVy biBsYW1iZGEgaW5wdXQ6IGlucHV0Ci0KKyAgICBmb3IgaSwgbGluZSBpbiBlbnVtZXJhdGUobGlu ZXNbOi0xXSk6CisgICAgICAgICMgU3RvcCB3aGVuIHdlIGZpbmQgdGhlIGZpcnN0IHBhdGNoCisg ICAgICAgIGlmIGxpbmVbOjNdID09ICIrKysiIGFuZCBsaW5lc1tpICsgMV0gPT0gIi0tLSI6Cisg ICAgICAgICAgICBicmVhaworICAgICAgICBpZiBtYXRjaChyIl5kaWZmIC0tZ2l0IFx3LyIsIGxp bmUpOgorICAgICAgICAgICAgcmV0dXJuIGdpdF9kaWZmX3RvX3N2bl9kaWZmCisgICAgcmV0dXJu IHN2bl9kaWZmX3RvX3N2bl9kaWZmCiAKIF9JTklUSUFMX1NUQVRFID0gMQogX0RFQ0xBUkVEX0ZJ TEVfUEFUSCA9IDIKQEAgLTE0MiwxMCArMTUwLDkgQEAgY2xhc3MgRGlmZlBhcnNlcihvYmplY3Qp OgogICAgICAgICBjdXJyZW50X2ZpbGUgPSBOb25lCiAgICAgICAgIG9sZF9kaWZmX2xpbmUgPSBO b25lCiAgICAgICAgIG5ld19kaWZmX2xpbmUgPSBOb25lCisgICAgICAgIHRyYW5zZm9ybV9saW5l ID0gZ2V0X2RpZmZfY29udmVydGVyKGRpZmZfaW5wdXQpCiAgICAgICAgIGZvciBsaW5lIGluIGRp ZmZfaW5wdXQ6CiAgICAgICAgICAgICBsaW5lID0gbGluZS5yc3RyaXAoIlxuIikKLSAgICAgICAg ICAgIGlmIHN0YXRlID09IF9JTklUSUFMX1NUQVRFOgotICAgICAgICAgICAgICAgIHRyYW5zZm9y bV9saW5lID0gZ2V0X2RpZmZfY29udmVydGVyKGxpbmUpCiAgICAgICAgICAgICBsaW5lID0gdHJh bnNmb3JtX2xpbmUobGluZSkKIAogICAgICAgICAgICAgZmlsZV9kZWNsYXJhdGlvbiA9IG1hdGNo KHIiXkluZGV4OiAoP1A8RmlsZVBhdGg+LispIiwgbGluZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXJfdW5pdHRl c3QucHkKaW5kZXggODMyYWRhZGQ2MjFhZWY4Yjk4MjNkOTU2NjEyOWNiZTZhNGJkNTFkZS4uNzhk YWIyNmJjZDg0NjQwNzFjMzRjYWExMjZjZTYzNDM3NDYyZTIwOCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXJfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXJf dW5pdHRlc3QucHkKQEAgLTc4LDYgKzc4LDQyIEBAIGNsYXNzIERpZmZQYXJzZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgxLCBsZW4oZGlmZi5saW5l cykpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoKDAsIDEpLCBkaWZmLmxpbmVzWzBdWzA6Ml0p CiAKKyAgICBkZWYgdGVzdF9kaWZmX2NvbnZlcnRlcihzZWxmKToKKyAgICAgICAgY29tbWVudF9s aW5lcyA9IFsKKyAgICAgICAgICAgICJIZXkgZ3V5cyxcbiIsCisgICAgICAgICAgICAiXG4iLAor ICAgICAgICAgICAgIlNlZSBteSBhd2Vzb21lIHBhdGNoIGJlbG93IVxuIiwKKyAgICAgICAgICAg ICJcbiIsCisgICAgICAgICAgICAiIC0gQ29vbCBIYWNrZXJcbiIsCisgICAgICAgICAgICAiXG4i LAorICAgICAgICAgICAgXQorCisgICAgICAgIHJldmlzaW9uX2xpbmVzID0gWworICAgICAgICAg ICAgIlN1YnZlcnNpb24gUmV2aXNpb24gMjg5Nzk5XG4iLAorICAgICAgICAgICAgXQorCisgICAg ICAgIHN2bl9kaWZmX2xpbmVzID0gWworICAgICAgICAgICAgIkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weVxuIiwKKyAgICAgICAgICAg ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09XG4iLAorICAgICAgICAgICAgIi0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weVxuIiwKKyAgICAgICAgICAgICIrKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHlcbiIsCisg ICAgICAgICAgICAiQEAgLTU5LDYgKzU5LDcgQEAgZGVmIGdpdF9kaWZmX3RvX3N2bl9kaWZmKGxp bmUpOlxuIiwKKyAgICAgICAgICAgIF0KKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkaWZmX3Bh cnNlci5nZXRfZGlmZl9jb252ZXJ0ZXIoc3ZuX2RpZmZfbGluZXMpLCBkaWZmX3BhcnNlci5zdm5f ZGlmZl90b19zdm5fZGlmZikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkaWZmX3BhcnNlci5n ZXRfZGlmZl9jb252ZXJ0ZXIoY29tbWVudF9saW5lcyArIHN2bl9kaWZmX2xpbmVzKSwgZGlmZl9w YXJzZXIuc3ZuX2RpZmZfdG9fc3ZuX2RpZmYpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGlm Zl9wYXJzZXIuZ2V0X2RpZmZfY29udmVydGVyKHJldmlzaW9uX2xpbmVzICsgc3ZuX2RpZmZfbGlu ZXMpLCBkaWZmX3BhcnNlci5zdm5fZGlmZl90b19zdm5fZGlmZikKKworICAgICAgICBnaXRfZGlm Zl9saW5lcyA9IFsKKyAgICAgICAgICAgICJkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weVxuIiwKKyAgICAgICAgICAgICJpbmRl eCAzYzViNDViLi4wMTk3ZWFkIDEwMDY0NFxuIiwKKyAgICAgICAgICAgICItLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weVxuIiwKKyAgICAg ICAgICAgICIrKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZm X3BhcnNlci5weVxuIiwKKyAgICAgICAgICAgICJAQCAtNTksNiArNTksNyBAQCBkZWYgZ2l0X2Rp ZmZfdG9fc3ZuX2RpZmYobGluZSk6XG4iLAorICAgICAgICAgICAgXQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGRpZmZfcGFyc2VyLmdldF9kaWZmX2NvbnZlcnRlcihnaXRfZGlmZl9saW5lcyks IGRpZmZfcGFyc2VyLmdpdF9kaWZmX3RvX3N2bl9kaWZmKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGRpZmZfcGFyc2VyLmdldF9kaWZmX2NvbnZlcnRlcihjb21tZW50X2xpbmVzICsgZ2l0X2Rp ZmZfbGluZXMpLCBkaWZmX3BhcnNlci5naXRfZGlmZl90b19zdm5fZGlmZikKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChkaWZmX3BhcnNlci5nZXRfZGlmZl9jb252ZXJ0ZXIocmV2aXNpb25fbGlu ZXMgKyBnaXRfZGlmZl9saW5lcyksIGRpZmZfcGFyc2VyLmdpdF9kaWZmX3RvX3N2bl9kaWZmKQor CiAgICAgZGVmIHRlc3RfZ2l0X21uZW1vbmljcHJlZml4KHNlbGYpOgogICAgICAgICBwID0gcmUu Y29tcGlsZShyJyAoW2F8Yl0pLycpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9oYXNsYW5kZWQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvaGFzbGFuZGVkLnB5CmluZGV4IDExNmEzNDA3NmFhYmQ1OGE4NzQ3NTc3MTBjNzdjNmJm YmIyNjVjYmIuLmIwNjkyYjMyYjI3YjliYTdiYWIwM2Y2Yjc3MzgwNzc1OTE1NmE2NWUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9oYXNsYW5kZWQucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2hhc2xhbmRlZC5weQpAQCAtNDYs NyArNDYsNyBAQCBjbGFzcyBIYXNMYW5kZWQoY29uZmlybWRpZmYuQ29uZmlybURpZmYpOgogICAg IEBjbGFzc21ldGhvZAogICAgIGRlZiBjb252ZXJ0X3RvX3N2bihjbHMsIGRpZmYpOgogICAgICAg ICBsaW5lcyA9IFN0cmluZ0lPLlN0cmluZ0lPKGRpZmYpLnJlYWRsaW5lcygpCi0gICAgICAgIGNv bnZlcnQgPSBkaWZmX3BhcnNlci5nZXRfZGlmZl9jb252ZXJ0ZXIobGluZXNbMF0pCisgICAgICAg IGNvbnZlcnQgPSBkaWZmX3BhcnNlci5nZXRfZGlmZl9jb252ZXJ0ZXIobGluZXMpCiAgICAgICAg IHJldHVybiAiIi5qb2luKGNvbnZlcnQoeCkgZm9yIHggaW4gbGluZXMpCiAKICAgICBAY2xhc3Nt ZXRob2QK