82933 2012-04-02 13:20:34 -0700 check-webkit-style errors when removing .png files 2012-04-02 16:55:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fmalita tony abarth bank dpranke levin ojan pdr tony webkit.review.bot oldest_to_newest 593741 0 fmalita 2012-04-02 13:20:34 -0700 After http://trac.webkit.org/changeset/112270, removing .png files triggers the following: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plat..." exit_code: 1 ERROR: File does not exist: 'LayoutTests/platform/mac/transforms/no_transform_hit_testing-expected.png' Looks like we're force-processing non-existent (removed) png files (patchreader.py:66): if not line_numbers: match = re.search("\s*png$", path) if match: if call_only_once: self._text_file_reader.process_file(file_path=path, line_numbers=None) 593744 1 pdr 2012-04-02 13:21:57 -0700 I'm hitting this as well, using vanilla SVN. 593875 2 135195 tony 2012-04-02 14:47:09 -0700 Created attachment 135195 Patch 593885 3 135195 abarth 2012-04-02 14:55:48 -0700 Comment on attachment 135195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135195&action=review > Tools/Scripts/webkitpy/style/patchreader.py:55 > - def check(self, patch_string): > + def check(self, patch_string, fs=FileSystem()): Eric doesn't like this pattern because it creates a static FileSystem() object that's re-used each time this function is called, but maybe it's ok here since FileSystem is normally global-ish object. 593891 4 135201 tony 2012-04-02 15:01:47 -0700 Created attachment 135201 Patch for landing 593893 5 tony 2012-04-02 15:02:21 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=135195&action=review >> Tools/Scripts/webkitpy/style/patchreader.py:55 >> + def check(self, patch_string, fs=FileSystem()): > > Eric doesn't like this pattern because it creates a static FileSystem() object that's re-used each time this function is called, but maybe it's ok here since FileSystem is normally global-ish object. Yeah, I thought it was OK in this case because FileSystem has no state. I guess that might not be true in the future so I'll change it to None. 594028 6 tony 2012-04-02 16:55:08 -0700 Committed r112963: <http://trac.webkit.org/changeset/112963> 135195 2012-04-02 14:47:09 -0700 2012-04-02 15:01:44 -0700 Patch bug-82933-20120402144729.patch text/plain 3063 tony SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExMjk0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA0LTAyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIGVycm9ycyB3aGVuIHJlbW92aW5nIC5wbmcgZmls ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTMz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5OgorICAgICAgICAoUGF0Y2hSZWFkZXIu Y2hlY2spOiBNYWtlIHN1cmUgdGhlIGZpbGUgZXhpc3RzIGFuZCBwYXNzIGluIGEgRmlsZVN5c3Rl bSgpIG9iamVjdCAoZm9yIG1vY2tpbmcpLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5 bGUvcGF0Y2hyZWFkZXJfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X2NoZWNrX3BhdGNoX3dp dGhfcG5nX2RlbGV0aW9uKToKKwogMjAxMi0wNC0wMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBOUldUIGlzIG5vdCBwcmludGluZyBvdXQgdGhlIGJ1aWxk ZXIgaXQncyB1cGxvYWRpbmcgSlNPTiBmaWxlcyBmb3IKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9wYXRjaHJlYWRlci5weQkocmV2aXNpb24gMTEyOTI4KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9wYXRjaHJlYWRlci5weQkod29ya2luZyBjb3B5KQpAQCAt NTIsNyArNTIsNyBAQCBjbGFzcyBQYXRjaFJlYWRlcihvYmplY3QpOgogICAgICAgICAiIiIKICAg ICAgICAgc2VsZi5fdGV4dF9maWxlX3JlYWRlciA9IHRleHRfZmlsZV9yZWFkZXIKIAotICAgIGRl ZiBjaGVjayhzZWxmLCBwYXRjaF9zdHJpbmcpOgorICAgIGRlZiBjaGVjayhzZWxmLCBwYXRjaF9z dHJpbmcsIGZzPUZpbGVTeXN0ZW0oKSk6CiAgICAgICAgICIiIkNoZWNrIHN0eWxlIGluIHRoZSBn aXZlbiBwYXRjaC4iIiIKICAgICAgICAgcGF0Y2hfZmlsZXMgPSBEaWZmUGFyc2VyKHBhdGNoX3N0 cmluZy5zcGxpdGxpbmVzKCkpLmZpbGVzCiAKQEAgLTY1LDExICs2NSwxMSBAQCBjbGFzcyBQYXRj aFJlYWRlcihvYmplY3QpOgogCiAgICAgICAgICAgICBpZiBub3QgbGluZV9udW1iZXJzOgogICAg ICAgICAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCJccypwbmckIiwgcGF0aCkKLSAgICAgICAg ICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICBpZiBtYXRjaCBhbmQgZnMuZXhpc3Rz KHBhdGgpOgogICAgICAgICAgICAgICAgICAgICBpZiBjYWxsX29ubHlfb25jZToKICAgICAgICAg ICAgICAgICAgICAgICAgIHNlbGYuX3RleHRfZmlsZV9yZWFkZXIucHJvY2Vzc19maWxlKGZpbGVf cGF0aD1wYXRoLCBsaW5lX251bWJlcnM9Tm9uZSkKICAgICAgICAgICAgICAgICAgICAgICAgIGN3 ZCA9IEZpbGVTeXN0ZW0oKS5nZXRjd2QoKQotICAgICAgICAgICAgICAgICAgICAgICAgZGV0ZWN0 aW9uID0gU0NNRGV0ZWN0b3IoRmlsZVN5c3RlbSgpLCBFeGVjdXRpdmUoKSkuZGV0ZWN0X3NjbV9z eXN0ZW0oY3dkKQorICAgICAgICAgICAgICAgICAgICAgICAgZGV0ZWN0aW9uID0gU0NNRGV0ZWN0 b3IoZnMsIEV4ZWN1dGl2ZSgpKS5kZXRlY3Rfc2NtX3N5c3RlbShjd2QpCiAgICAgICAgICAgICAg ICAgICAgICAgICBpZiBkZXRlY3Rpb24uZGlzcGxheV9uYW1lKCkgPT0gImdpdCI6CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY2FsbF9vbmx5X29uY2UgPSBGYWxzZQogICAgICAgICAgICAg ICAgICAgICBjb250aW51ZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wYXRj aHJlYWRlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL3BhdGNocmVhZGVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMTI5MjgpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyX3VuaXR0ZXN0LnB5CSh3b3JraW5n IGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAKIGltcG9ydCB1bml0dGVzdAogCitmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQog ZnJvbSB3ZWJraXRweS5zdHlsZS5wYXRjaHJlYWRlciBpbXBvcnQgUGF0Y2hSZWFkZXIKIAogCkBA IC05MCwzICs5MSwxMyBAQCBpbmRleCBlZjY1YmVlLi5lM2RiNzBlIDEwMDY0NAogIiIiKQogICAg ICAgICAjIF9tb2NrX2NoZWNrX2ZpbGUgc2hvdWxkIG5vdCBiZSBjYWxsZWQgZm9yIHRoZSBkZWxl dGlvbiBwYXRjaC4KICAgICAgICAgc2VsZi5fYXNzZXJ0X2NoZWNrZWQoW10sIDEpCisKKyAgICBk ZWYgdGVzdF9jaGVja19wYXRjaF93aXRoX3BuZ19kZWxldGlvbihzZWxmKToKKyAgICAgICAgZnMg PSBNb2NrRmlsZVN5c3RlbSgpCisgICAgICAgIGRpZmZfdGV4dCA9ICIiIkluZGV4OiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvZm9vLWV4cGVjdGVkLnBuZworPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorQ2Fubm90IGRp c3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCitzdm46bWltZS10eXBlID0gaW1h Z2UvcG5nCisiIiIKKyAgICAgICAgc2VsZi5fcGF0Y2hfY2hlY2tlci5jaGVjayhkaWZmX3RleHQs IGZzKQorICAgICAgICBzZWxmLl9hc3NlcnRfY2hlY2tlZChbXSwgMSkK 135201 2012-04-02 15:01:47 -0700 2012-04-02 16:55:29 -0700 Patch for landing bug-82933-20120402150208.patch text/plain 3171 tony SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExMjk0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA0LTAyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIGVycm9ycyB3aGVuIHJlbW92aW5nIC5wbmcgZmls ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTMz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5OgorICAgICAgICAoUGF0Y2hSZWFkZXIuY2hl Y2spOiBNYWtlIHN1cmUgdGhlIGZpbGUgZXhpc3RzIGFuZCBwYXNzIGluIGEgRmlsZVN5c3RlbSgp IG9iamVjdCAoZm9yIG1vY2tpbmcpLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv cGF0Y2hyZWFkZXJfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X2NoZWNrX3BhdGNoX3dpdGhf cG5nX2RlbGV0aW9uKToKKwogMjAxMi0wNC0wMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBOUldUIGlzIG5vdCBwcmludGluZyBvdXQgdGhlIGJ1aWxkZXIg aXQncyB1cGxvYWRpbmcgSlNPTiBmaWxlcyBmb3IKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvcGF0Y2hyZWFkZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9wYXRjaHJlYWRlci5weQkocmV2aXNpb24gMTEyOTI4KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9wYXRjaHJlYWRlci5weQkod29ya2luZyBjb3B5KQpAQCAtNTIs OCArNTIsOSBAQCBjbGFzcyBQYXRjaFJlYWRlcihvYmplY3QpOgogICAgICAgICAiIiIKICAgICAg ICAgc2VsZi5fdGV4dF9maWxlX3JlYWRlciA9IHRleHRfZmlsZV9yZWFkZXIKIAotICAgIGRlZiBj aGVjayhzZWxmLCBwYXRjaF9zdHJpbmcpOgorICAgIGRlZiBjaGVjayhzZWxmLCBwYXRjaF9zdHJp bmcsIGZzPU5vbmUpOgogICAgICAgICAiIiJDaGVjayBzdHlsZSBpbiB0aGUgZ2l2ZW4gcGF0Y2gu IiIiCisgICAgICAgIGZzID0gZnMgb3IgRmlsZVN5c3RlbSgpCiAgICAgICAgIHBhdGNoX2ZpbGVz ID0gRGlmZlBhcnNlcihwYXRjaF9zdHJpbmcuc3BsaXRsaW5lcygpKS5maWxlcwogCiAgICAgICAg ICMgSWYgdGhlIHVzZXIgdXNlcyBnaXQsIGNoZWNraW5nIHN1YnZlcnNpb24gY29uZmlnIGZpbGUg b25seSBvbmNlIGlzIGVub3VnaC4KQEAgLTY1LDExICs2NiwxMSBAQCBjbGFzcyBQYXRjaFJlYWRl cihvYmplY3QpOgogCiAgICAgICAgICAgICBpZiBub3QgbGluZV9udW1iZXJzOgogICAgICAgICAg ICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCJccypwbmckIiwgcGF0aCkKLSAgICAgICAgICAgICAg ICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICBpZiBtYXRjaCBhbmQgZnMuZXhpc3RzKHBhdGgp OgogICAgICAgICAgICAgICAgICAgICBpZiBjYWxsX29ubHlfb25jZToKICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuX3RleHRfZmlsZV9yZWFkZXIucHJvY2Vzc19maWxlKGZpbGVfcGF0aD1w YXRoLCBsaW5lX251bWJlcnM9Tm9uZSkKICAgICAgICAgICAgICAgICAgICAgICAgIGN3ZCA9IEZp bGVTeXN0ZW0oKS5nZXRjd2QoKQotICAgICAgICAgICAgICAgICAgICAgICAgZGV0ZWN0aW9uID0g U0NNRGV0ZWN0b3IoRmlsZVN5c3RlbSgpLCBFeGVjdXRpdmUoKSkuZGV0ZWN0X3NjbV9zeXN0ZW0o Y3dkKQorICAgICAgICAgICAgICAgICAgICAgICAgZGV0ZWN0aW9uID0gU0NNRGV0ZWN0b3IoZnMs IEV4ZWN1dGl2ZSgpKS5kZXRlY3Rfc2NtX3N5c3RlbShjd2QpCiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiBkZXRlY3Rpb24uZGlzcGxheV9uYW1lKCkgPT0gImdpdCI6CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY2FsbF9vbmx5X29uY2UgPSBGYWxzZQogICAgICAgICAgICAgICAgICAg ICBjb250aW51ZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wYXRjaHJlYWRl cl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L3BhdGNocmVhZGVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMTI5MjgpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkp CkBAIC0zMyw2ICszMyw3IEBACiAKIGltcG9ydCB1bml0dGVzdAogCitmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQogZnJvbSB3 ZWJraXRweS5zdHlsZS5wYXRjaHJlYWRlciBpbXBvcnQgUGF0Y2hSZWFkZXIKIAogCkBAIC05MCwz ICs5MSwxMyBAQCBpbmRleCBlZjY1YmVlLi5lM2RiNzBlIDEwMDY0NAogIiIiKQogICAgICAgICAj IF9tb2NrX2NoZWNrX2ZpbGUgc2hvdWxkIG5vdCBiZSBjYWxsZWQgZm9yIHRoZSBkZWxldGlvbiBw YXRjaC4KICAgICAgICAgc2VsZi5fYXNzZXJ0X2NoZWNrZWQoW10sIDEpCisKKyAgICBkZWYgdGVz dF9jaGVja19wYXRjaF93aXRoX3BuZ19kZWxldGlvbihzZWxmKToKKyAgICAgICAgZnMgPSBNb2Nr RmlsZVN5c3RlbSgpCisgICAgICAgIGRpZmZfdGV4dCA9ICIiIkluZGV4OiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvZm9vLWV4cGVjdGVkLnBuZworPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorQ2Fubm90IGRpc3BsYXk6 IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCitzdm46bWltZS10eXBlID0gaW1hZ2UvcG5n CisiIiIKKyAgICAgICAgc2VsZi5fcGF0Y2hfY2hlY2tlci5jaGVjayhkaWZmX3RleHQsIGZzKQor ICAgICAgICBzZWxmLl9hc3NlcnRfY2hlY2tlZChbXSwgMSkK