36759 2010-03-29 09:14:42 -0700 check-webkit-style: Eliminate explicit slash characters from _rel_path() 2010-03-29 16:18:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek commit-queue eric hamaji levin oldest_to_newest 205474 0 cjerdonek 2010-03-29 09:14:42 -0700 Eliminate explicit slash characters from _rel_path(), as discussed here: https://bugs.webkit.org/show_bug.cgi?id=35498#c27 This will make the implementation more platform-independent. 205481 1 51922 cjerdonek 2010-03-29 09:23:10 -0700 Created attachment 51922 Proposed patch 205496 2 51922 hamaji 2010-03-29 09:43:28 -0700 Comment on attachment 51922 Proposed patch > - if rel_path and rel_path[0] not in slash_chars: > - # Then we are in the case typified by the following example: > + if not rel_path: > + # Then the paths are the same. > + pass Ah, this patch let me notice we cannot run check-webkit-style with the root checkout directory % ./WebKitTools/Scripts/check-webkit-style `pwd` # in WebKit checkout directory File not a recognized type to check. Skipping: "" Total errors found: 0 in 1 files and % ./WebKitTools/Scripts/check-webkit-style . # in WebKit checkout directory File not a recognized type to check. Skipping: "" Total errors found: 0 in 1 files But this would be another issue. Let's go ahead as is. 205543 3 cjerdonek 2010-03-29 11:05:30 -0700 (In reply to comment #2) > (From update of attachment 51922 [details]) > > - if rel_path and rel_path[0] not in slash_chars: > > - # Then we are in the case typified by the following example: > > + if not rel_path: > > + # Then the paths are the same. > > + pass > > Ah, this patch let me notice we cannot run check-webkit-style with the root > checkout directory Yes, I was wondering about that. It looks like it might suffice to return os.curdir in that case. But yes, we can do that later. 205727 4 51922 commit-queue 2010-03-29 16:18:34 -0700 Comment on attachment 51922 Proposed patch Clearing flags on attachment: 51922 Committed r56747: <http://trac.webkit.org/changeset/56747> 205728 5 commit-queue 2010-03-29 16:18:39 -0700 All reviewed patches have been landed. Closing bug. 51922 2010-03-29 09:23:10 -0700 2010-03-29 16:18:34 -0700 Proposed patch _patch-36759-1.diff text/plain 2561 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxMjNhZDkyLi5lOWQ2MDlkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMt MjkgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWxpbWluYXRlIGV4cGxpY2l0IHNs YXNoIGNoYXJhY3RlcnMgZnJvbSBjaGVjay13ZWJraXQtc3R5bGUncworICAgICAgICBfcmVsX3Bh dGgoKSBtZXRob2QgdG8gbWFrZSBpdHMgaW1wbGVtZW50YXRpb24gbW9yZSBwbGF0Zm9ybQorICAg ICAgICBpbmRlcGVuZGVudC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzY3NTkKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFp bi5weToKKyAgICAgICAgICAtIENoYW5nZWQgdG8gdXNlIG9zLnNlcCBpbnN0ZWFkIG9mIHNsYXNo X2NoYXJzICIvXFwiLiAgVGhpcyBjYW4KKyAgICAgICAgICAgIGJlIGRvbmUgc2luY2Ugb3MucGF0 aC5hYnNwYXRoKCkgY29udmVydHMgc2xhc2hlcyB0byBvcy5zZXAuCisKIDIwMTAtMDMtMjggIEd1 c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgTm8gcmV2aWV3 LCByb2xsaW5nIG91dCByNTY2NzkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL21haW4ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L21haW4ucHkKaW5kZXggY2E2MGQ5Yy4uZjRjODFlMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvbWFpbi5weQpAQCAtNDksMjggKzQ5LDM2IEBAIGRlZiBfcmVsX3BhdGgo cGF0aCwgc3RhcnRfcGF0aCwgb3NfcGF0aF9hYnNwYXRoPU5vbmUpOgogICAgIGlmIG9zX3BhdGhf YWJzcGF0aCBpcyBOb25lOgogICAgICAgICBvc19wYXRoX2Fic3BhdGggPSBvcy5wYXRoLmFic3Bh dGgKIAotICAgICMgQ2FsbGluZyBvc19wYXRoX2Fic3BhdGgoKSBhbHNvIHJlbW92ZXMgYW55IHRy YWlsaW5nIHNsYXNoZXMuCisgICAgIyBTaW5jZSBvc19wYXRoX2Fic3BhdGgoKSBjYWxscyBvcy5w YXRoLm5vcm1wYXRoKCktLQorICAgICMKKyAgICAjIChzZWUgaHR0cDovL2RvY3MucHl0aG9uLm9y Zy9saWJyYXJ5L29zLnBhdGguaHRtbCNvcy5wYXRoLmFic3BhdGggKQorICAgICMKKyAgICAjIGl0 IGFsc28gcmVtb3ZlcyB0cmFpbGluZyBzbGFzaGVzIGFuZCBjb252ZXJ0cyBmb3J3YXJkIGFuZCBi YWNrd2FyZAorICAgICMgc2xhc2hlcyB0byB0aGUgcHJlZmVycmVkIHNsYXNoIG9zLnNlcC4KICAg ICBzdGFydF9wYXRoID0gb3NfcGF0aF9hYnNwYXRoKHN0YXJ0X3BhdGgpCiAgICAgcGF0aCA9IG9z X3BhdGhfYWJzcGF0aChwYXRoKQogCi0gICAgc2xhc2hfY2hhcnMgPSAiL1xcIgotCiAgICAgaWYg bm90IHBhdGgubG93ZXIoKS5zdGFydHN3aXRoKHN0YXJ0X3BhdGgubG93ZXIoKSk6CiAgICAgICAg ICMgVGhlbiBwYXRoIGlzIG91dHNpZGUgdGhlIGRpcmVjdG9yeSBnaXZlbiBieSBzdGFydF9wYXRo LgogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgcmVsX3BhdGggPSBwYXRoW2xlbihzdGFydF9w YXRoKTpdCiAKLSAgICBpZiByZWxfcGF0aCBhbmQgcmVsX3BhdGhbMF0gbm90IGluIHNsYXNoX2No YXJzOgotICAgICAgICAjIFRoZW4gd2UgYXJlIGluIHRoZSBjYXNlIHR5cGlmaWVkIGJ5IHRoZSBm b2xsb3dpbmcgZXhhbXBsZToKKyAgICBpZiBub3QgcmVsX3BhdGg6CisgICAgICAgICMgVGhlbiB0 aGUgcGF0aHMgYXJlIHRoZSBzYW1lLgorICAgICAgICBwYXNzCisgICAgZWxpZiByZWxfcGF0aFsw XSA9PSBvcy5zZXA6CisgICAgICAgICMgSXQgaXMgcHJvYmFibHkgc3VmZmljaWVudCB0byByZW1v dmUganVzdCB0aGUgZmlyc3QgY2hhcmFjdGVyCisgICAgICAgICMgc2luY2Ugb3MucGF0aC5ub3Jt cGF0aCgpIGNvbGxhcHNlcyBzZXBhcmF0b3JzLCBidXQgd2UgdXNlCisgICAgICAgICMgbHN0cmlw KCkganVzdCB0byBiZSBzdXJlLgorICAgICAgICByZWxfcGF0aCA9IHJlbF9wYXRoLmxzdHJpcChv cy5zZXApCisgICAgZWxzZToKKyAgICAgICAgIyBXZSBhcmUgaW4gdGhlIGNhc2UgdHlwaWZpZWQg YnkgdGhlIGZvbGxvd2luZyBleGFtcGxlOgogICAgICAgICAjCiAgICAgICAgICMgc3RhcnRfcGF0 aCA9ICIvdG1wL2ZvbyIKICAgICAgICAgIyBwYXRoID0gIi90bXAvZm9vYmFyIgogICAgICAgICAj IHJlbF9wYXRoID0gImJhciIKICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAjIE90aGVyd2lzZSBy ZWxfcGF0aCBpcyAiIiBvciBiZWdpbnMgd2l0aCBhIHNsYXNoLgotCi0gICAgcmVsX3BhdGggPSBy ZWxfcGF0aC5sc3RyaXAoc2xhc2hfY2hhcnMpCiAKICAgICByZXR1cm4gcmVsX3BhdGgKIAo=