38149 2010-04-26 16:45:11 -0700 check-webkit-style should not run the carriage checker on Windows-only files 2010-04-27 14:56:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi aroben cjerdonek hamaji oldest_to_newest 217355 0 dumi 2010-04-26 16:45:11 -0700 The carriage checker should not be invoked on Windows-only files, such as *.vcproj. 217359 1 54349 dumi 2010-04-26 16:51:22 -0700 Created attachment 54349 patch 217367 2 cjerdonek 2010-04-26 17:05:09 -0700 (In reply to comment #1) > Created an attachment (id=54349) [details] - # FIXME: We should probably use the SVN "eol-style" property - # or a white list to decide whether or not to do - # the carriage-return check. Originally, we did the - # check only if (os.linesep != '\r\n'). Is there a reason to delete the FIXME notes re: the SVN "eol-style" property? It seems that would be worth preserving in some form. 217375 3 54351 dumi 2010-04-26 17:29:14 -0700 Created attachment 54351 patch Added back the SVN eol-style comment. Sorry, I thought introducing a whitelist might be enough. 217539 4 cjerdonek 2010-04-26 23:30:06 -0700 In looking at the code, I see that .vcproj files are not currently set to be processed as text files (or as any type of file for that matter -- e.g. C++, Python, etc.): http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/style/checker.py?rev=58263#L356 Given that, would it make more sense simply to add .vcproj files to the list of files that should be skipped altogether? http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/style/checker.py?rev=58263#L177 Otherwise, it seems like .vcproj should be added to the list of text file extensions. 217561 5 54351 hamaji 2010-04-27 00:17:00 -0700 Comment on attachment 54351 patch Thanks for addressing this issue. Putting r- as I agree with Chris. Maybe we should just put .vcproj file into the skipped list. > Index: LayoutTests/storage/quota-tracking.html > =================================================================== > --- LayoutTests/storage/quota-tracking.html (revision 58269) > +++ LayoutTests/storage/quota-tracking.html (working copy) This change isn't related to this bug. 217678 6 cjerdonek 2010-04-27 06:48:53 -0700 I filed this related report, which will indirectly take care of issues like the one reported here: https://bugs.webkit.org/show_bug.cgi?id=38197 217725 7 cjerdonek 2010-04-27 08:55:42 -0700 (In reply to comment #6) > I filed this related report, which will indirectly take care of issues like the > one reported here: > > https://bugs.webkit.org/show_bug.cgi?id=38197 I submitted a patch for bug 38197 which should also address the issue in this report. If we want .vcproj files to be checked as text files (so that the tab check will be done on them, for example), then we may want to go forward with an additional variable as was proposed above to control which files should be exempted from the carriage return check. The patch in bug 38197 does not do this because .vcproj files are implicitly skipped altogether. This is because they are not in the list of recognized text file extensions. 217923 8 dumi 2010-04-27 14:06:38 -0700 I'm closing this bug since the patch for bug 38197 takes care of this problem. If it turns out that it's not OK to skip vcproj files altogether, then we can reopen the bug. 217975 9 cjerdonek 2010-04-27 14:56:13 -0700 (In reply to comment #8) > I'm closing this bug since the patch for bug 38197 takes care of this problem. > If it turns out that it's not OK to skip vcproj files altogether, then we can > reopen the bug. If this is creating a problem that needs to be fixed right away, you can add ".vcproj" to the list of skipped files without warning (one-line change): http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/style/checker.py?rev=58263#L177 I probably can't get to updating my patch to bug 38197 until tonight at the earliest. 54349 2010-04-26 16:51:22 -0700 2010-04-26 17:29:14 -0700 patch patch text/plain 2578 dumi SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU4MjcyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDQtMjYgIER1bWl0cnUgRGFuaWxpdWMg IDxkdW1pQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBEbyBub3QgaW52b2tlIHRoZSBjYXJyaWFnZSBjaGVja2VyIG9uIFdpbmRv d3Mtb25seSBmaWxlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM4MTQ5CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIu cHk6CisKIDIwMTAtMDQtMjYgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9uIDU4MjY5KQorKysgV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xODgsNiArMTg4LDEwIEBAIF9NQVhfUkVQT1JUU19QRVJfQ0FURUdPUlkgPSB7CiAgICAgIndo aXRlc3BhY2UvY2FycmlhZ2VfcmV0dXJuIjogMQogfQogCisjIFRoZSBjYXJyaWFnZSBjaGVja2Vy IHNob3VsZCBza2lwIGFsbCBXaW5kb3dzLW9ubHkgZmlsZXMuCitfQ0FSUklBR0VfQ0hFQ0tFUl9T S0lQUEVEX0ZJTEVTID0gWworICAgICIudmNwcm9qIiwKKyAgICBdCiAKIGRlZiBfYWxsX2NhdGVn b3JpZXMoKToKICAgICAiIiJSZXR1cm4gdGhlIHNldCBvZiBhbGwgY2F0ZWdvcmllcyB1c2VkIGJ5 IGNoZWNrLXdlYmtpdC1zdHlsZS4iIiIKQEAgLTYzMiw2ICs2MzYsMTMgQEAgY2xhc3MgU3R5bGVQ cm9jZXNzb3IoUHJvY2Vzc29yQmFzZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAg ICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBzaG91bGRfc2tpcF9jYXJyaWFnZV9jaGVja2VyKHNl bGYsIGZpbGVfcGF0aCk6CisgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoZSBjYXJyaWFnZSBj aGVja2VyIHNob3VsZCBza2lwIHRoZSBnaXZlbiBmaWxlLiIiIgorICAgICAgICBmb3Igc2tpcHBl ZF9maWxlIGluIF9DQVJSSUFHRV9DSEVDS0VSX1NLSVBQRURfRklMRVM6CisgICAgICAgICAgICBp ZiBmaWxlX3BhdGguZmluZChza2lwcGVkX2ZpbGUpID49IDA6CisgICAgICAgICAgICAgICAgcmV0 dXJuIFRydWUKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgcHJvY2VzcyhzZWxmLCBs aW5lcywgZmlsZV9wYXRoLCBsaW5lX251bWJlcnM9Tm9uZSk6CiAgICAgICAgICIiIkNoZWNrIHRo ZSBnaXZlbiBsaW5lcyBmb3Igc3R5bGUuCiAKQEAgLTY1NSwxNSArNjY2LDkgQEAgY2xhc3MgU3R5 bGVQcm9jZXNzb3IoUHJvY2Vzc29yQmFzZSk6CiAgICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3Jf Y291bnQ9c2VsZi5faW5jcmVtZW50X2Vycm9yX2NvdW50LAogICAgICAgICAgICAgbGluZV9udW1i ZXJzPWxpbmVfbnVtYmVycykKIAotICAgICAgICBjYXJyaWFnZV9jaGVja2VyID0gc2VsZi5fY2Fy cmlhZ2VfY2hlY2tlcl9jbGFzcyhzdHlsZV9lcnJvcl9oYW5kbGVyKQotCi0gICAgICAgICMgRklY TUU6IFdlIHNob3VsZCBwcm9iYWJseSB1c2UgdGhlIFNWTiAiZW9sLXN0eWxlIiBwcm9wZXJ0eQot ICAgICAgICAjICAgICAgICBvciBhIHdoaXRlIGxpc3QgdG8gZGVjaWRlIHdoZXRoZXIgb3Igbm90 IHRvIGRvCi0gICAgICAgICMgICAgICAgIHRoZSBjYXJyaWFnZS1yZXR1cm4gY2hlY2suIE9yaWdp bmFsbHksIHdlIGRpZCB0aGUKLSAgICAgICAgIyAgICAgICAgY2hlY2sgb25seSBpZiAob3MubGlu ZXNlcCAhPSAnXHJcbicpLgotICAgICAgICAjCi0gICAgICAgICMgQ2hlY2sgZm9yIGFuZCByZW1v dmUgdHJhaWxpbmcgY2FycmlhZ2UgcmV0dXJucyAoIlxyIikuCi0gICAgICAgIGxpbmVzID0gY2Fy cmlhZ2VfY2hlY2tlci5wcm9jZXNzKGxpbmVzKQorICAgICAgICBpZiBub3Qgc2VsZi5zaG91bGRf c2tpcF9jYXJyaWFnZV9jaGVja2VyKGZpbGVfcGF0aCk6CisgICAgICAgICAgICBjYXJyaWFnZV9j aGVja2VyID0gc2VsZi5fY2FycmlhZ2VfY2hlY2tlcl9jbGFzcyhzdHlsZV9lcnJvcl9oYW5kbGVy KQorICAgICAgICAgICAgbGluZXMgPSBjYXJyaWFnZV9jaGVja2VyLnByb2Nlc3MobGluZXMpCiAK ICAgICAgICAgbWluX2NvbmZpZGVuY2UgPSBzZWxmLl9jb25maWd1cmF0aW9uLm1pbl9jb25maWRl bmNlCiAgICAgICAgIGNoZWNrZXIgPSBzZWxmLl9kaXNwYXRjaGVyLmRpc3BhdGNoX3Byb2Nlc3Nv cihmaWxlX3BhdGgsCg== 54351 2010-04-26 17:29:14 -0700 2010-04-27 00:17:00 -0700 patch patch text/plain 3411 dumi SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU4MjcyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDQtMjYgIER1bWl0cnUgRGFuaWxpdWMg IDxkdW1pQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBEbyBub3QgaW52b2tlIHRoZSBjYXJyaWFnZSBjaGVja2VyIG9uIFdpbmRv d3Mtb25seSBmaWxlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM4MTQ5CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIu cHk6CisKIDIwMTAtMDQtMjYgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9uIDU4MjY5KQorKysgV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xODgsNiArMTg4LDEwIEBAIF9NQVhfUkVQT1JUU19QRVJfQ0FURUdPUlkgPSB7CiAgICAgIndo aXRlc3BhY2UvY2FycmlhZ2VfcmV0dXJuIjogMQogfQogCisjIFRoZSBjYXJyaWFnZSBjaGVja2Vy IHNob3VsZCBza2lwIGFsbCBXaW5kb3dzLW9ubHkgZmlsZXMuCitfQ0FSUklBR0VfQ0hFQ0tFUl9T S0lQUEVEX0ZJTEVTID0gWworICAgICIudmNwcm9qIiwKKyAgICBdCiAKIGRlZiBfYWxsX2NhdGVn b3JpZXMoKToKICAgICAiIiJSZXR1cm4gdGhlIHNldCBvZiBhbGwgY2F0ZWdvcmllcyB1c2VkIGJ5 IGNoZWNrLXdlYmtpdC1zdHlsZS4iIiIKQEAgLTYzMiw2ICs2MzYsMTMgQEAgY2xhc3MgU3R5bGVQ cm9jZXNzb3IoUHJvY2Vzc29yQmFzZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAg ICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBzaG91bGRfc2tpcF9jYXJyaWFnZV9jaGVja2VyKHNl bGYsIGZpbGVfcGF0aCk6CisgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoZSBjYXJyaWFnZSBj aGVja2VyIHNob3VsZCBza2lwIHRoZSBnaXZlbiBmaWxlLiIiIgorICAgICAgICBmb3Igc2tpcHBl ZF9maWxlIGluIF9DQVJSSUFHRV9DSEVDS0VSX1NLSVBQRURfRklMRVM6CisgICAgICAgICAgICBp ZiBmaWxlX3BhdGguZmluZChza2lwcGVkX2ZpbGUpID49IDA6CisgICAgICAgICAgICAgICAgcmV0 dXJuIFRydWUKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgcHJvY2VzcyhzZWxmLCBs aW5lcywgZmlsZV9wYXRoLCBsaW5lX251bWJlcnM9Tm9uZSk6CiAgICAgICAgICIiIkNoZWNrIHRo ZSBnaXZlbiBsaW5lcyBmb3Igc3R5bGUuCiAKQEAgLTY1NSwxNSArNjY2LDEzIEBAIGNsYXNzIFN0 eWxlUHJvY2Vzc29yKFByb2Nlc3NvckJhc2UpOgogICAgICAgICAgICAgaW5jcmVtZW50X2Vycm9y X2NvdW50PXNlbGYuX2luY3JlbWVudF9lcnJvcl9jb3VudCwKICAgICAgICAgICAgIGxpbmVfbnVt YmVycz1saW5lX251bWJlcnMpCiAKLSAgICAgICAgY2FycmlhZ2VfY2hlY2tlciA9IHNlbGYuX2Nh cnJpYWdlX2NoZWNrZXJfY2xhc3Moc3R5bGVfZXJyb3JfaGFuZGxlcikKKyAgICAgICAgaWYgbm90 IHNlbGYuc2hvdWxkX3NraXBfY2FycmlhZ2VfY2hlY2tlcihmaWxlX3BhdGgpOgorICAgICAgICAg ICAgY2FycmlhZ2VfY2hlY2tlciA9IHNlbGYuX2NhcnJpYWdlX2NoZWNrZXJfY2xhc3Moc3R5bGVf ZXJyb3JfaGFuZGxlcikKIAotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkgdXNl IHRoZSBTVk4gImVvbC1zdHlsZSIgcHJvcGVydHkKLSAgICAgICAgIyAgICAgICAgb3IgYSB3aGl0 ZSBsaXN0IHRvIGRlY2lkZSB3aGV0aGVyIG9yIG5vdCB0byBkbwotICAgICAgICAjICAgICAgICB0 aGUgY2FycmlhZ2UtcmV0dXJuIGNoZWNrLiBPcmlnaW5hbGx5LCB3ZSBkaWQgdGhlCi0gICAgICAg ICMgICAgICAgIGNoZWNrIG9ubHkgaWYgKG9zLmxpbmVzZXAgIT0gJ1xyXG4nKS4KLSAgICAgICAg IwotICAgICAgICAjIENoZWNrIGZvciBhbmQgcmVtb3ZlIHRyYWlsaW5nIGNhcnJpYWdlIHJldHVy bnMgKCJcciIpLgotICAgICAgICBsaW5lcyA9IGNhcnJpYWdlX2NoZWNrZXIucHJvY2VzcyhsaW5l cykKKyAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSB1c2UgdGhlIFNWTiAi ZW9sLXN0eWxlIiBwcm9wZXJ0eSBpbgorICAgICAgICAgICAgIyAgICAgICAgYWRkaXRpb24gdG8g dGhlIHdoaXRlIGxpc3QgdG8gZGVjaWRlIHdoZXRoZXIgb3Igbm90CisgICAgICAgICAgICAjICAg ICAgICB0byBkbyB0aGUgY2FycmlhZ2UtcmV0dXJuIGNoZWNrLgorICAgICAgICAgICAgbGluZXMg PSBjYXJyaWFnZV9jaGVja2VyLnByb2Nlc3MobGluZXMpCiAKICAgICAgICAgbWluX2NvbmZpZGVu Y2UgPSBzZWxmLl9jb25maWd1cmF0aW9uLm1pbl9jb25maWRlbmNlCiAgICAgICAgIGNoZWNrZXIg PSBzZWxmLl9kaXNwYXRjaGVyLmRpc3BhdGNoX3Byb2Nlc3NvcihmaWxlX3BhdGgsCkluZGV4OiBM YXlvdXRUZXN0cy9zdG9yYWdlL3F1b3RhLXRyYWNraW5nLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvc3RvcmFnZS9xdW90YS10cmFja2luZy5odG1sCShyZXZpc2lvbiA1ODI2OSkKKysr IExheW91dFRlc3RzL3N0b3JhZ2UvcXVvdGEtdHJhY2tpbmcuaHRtbAkod29ya2luZyBjb3B5KQpA QCAtOTEsNyArOTEsNyBAQCBmdW5jdGlvbiBydW5UZXN0KCkKICAgICBpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKSB7CiAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmNsZWFyQWxs RGF0YWJhc2VzKCk7CiAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBEYXRhYmFzZUNh bGxiYWNrcygpOwotICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXREYXRhYmFzZVF1b3Rh KDMyNzY4KTsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0RGF0YWJhc2VRdW90YSg0 MDk2MCk7CiAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwogICAgIH0K