187294 2018-07-03 09:41:50 -0700 check-webkit-style: Run the tool without SVN client. 2018-07-03 13:46:55 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke annulen ap basuke commit-queue dbates ddkilzer ews-watchlist glenn jbedard lforschler mcatanzaro mitz webkit-bug-importer oldest_to_newest 1438875 0 basuke 2018-07-03 09:41:50 -0700 It fails if SVN client is not installed. SVN is optional. 1438877 1 344193 basuke 2018-07-03 09:59:37 -0700 Created attachment 344193 PATCH 1438916 2 basuke 2018-07-03 12:07:02 -0700 Without this patch, tools which uses the method SVN.in_working_directory() raises exception which terminates the command: > $ python Tools/Scripts/check-webkit-style --help > Traceback (most recent call last): > File "Tools/Scripts/check-webkit-style", line 48, in <module> > sys.exit(CheckWebKitStyle().main()) > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\style\main.py", line 127, in main > host.initialize_scm() > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\host.py", line 81, in initialize_scm > self._checkout = Checkout(detector.default_scm(patch_directories)) > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\checkout\scm\detection.py", line 55, in default_scm > scm_system = self.detect_scm_system(cwd, patch_directories) > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\checkout\scm\detection.py", line 71, in detect_scm_system > if SVN.in_working_directory(real_path, executive=self._executive): > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\checkout\scm\svn.py", line 101, in in_working_directory > exit_code = executive.run_command(svn_info_args, cwd=path, return_exit_code=True) > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\system\executive.py", line 386, in run_command > close_fds=self._should_close_fds()) > File "C:\Users\basuke\webkit-trunk\Tools\Scripts\webkitpy\common\system\executive.py", line 481, in popen > return subprocess.Popen(string_args, **kwargs) > File "C:\Python27\lib\subprocess.py", line 390, in __init__ > errread, errwrite) > File "C:\Python27\lib\subprocess.py", line 640, in _execute_child > startupinfo) > WindowsError: [Error 2] The system cannot find the file specified 1438925 3 344193 dbates 2018-07-03 12:23:48 -0700 Comment on attachment 344193 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=344193&action=review > Tools/ChangeLog:6 > + Follow the same strategy with git.py. If it invokes exception, it just returns False. The description in the ChangeLog should come after the "Reviewed by" line. The "strategy" you are referring to in git.py was added in <https://trac.webkit.org/changeset/92440/webkit> as speculative fix for the "svn revision on Windows" problem. That is, it was not added to allow people to run check-webkit-style without a Git checkout. So, I would remove the first sentence of your ChangeLog as it does not justify this change. Please describe that Subversion is considered optional according to the wording on <https://webkit.org/getting-the-code/#checking-out-with-git> and <https://webkit.org/webkit-on-windows/#installing-developer-tools> and explain that this patch makes it so that people with only a Git checkout of WebKit that commit using the commit-queue (or another machine with an SVN checkout) can run check-webkit-style. 1438927 4 basuke 2018-07-03 12:30:09 -0700 Right. Thanks. 1438935 5 344206 basuke 2018-07-03 13:04:20 -0700 Created attachment 344206 Fix ChangeLog Thanks for r+, Daniel. 1438956 6 344206 commit-queue 2018-07-03 13:45:06 -0700 Comment on attachment 344206 Fix ChangeLog Clearing flags on attachment: 344206 Committed r233474: <https://trac.webkit.org/changeset/233474> 1438957 7 commit-queue 2018-07-03 13:45:08 -0700 All reviewed patches have been landed. Closing bug. 1438961 8 webkit-bug-importer 2018-07-03 13:46:55 -0700 <rdar://problem/41790081> 344193 2018-07-03 09:59:37 -0700 2018-07-03 13:04:20 -0700 PATCH 187294.diff text/plain 1691 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ZmQ1 YWU4YjU4Ni4uYjBiZDJlNTU3MTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0wNy0wMyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgY2hlY2std2Via2l0LXN0eWxl OiBSdW4gdGhlIHRvb2wgd2l0aG91dCBTVk4gY2xpZW50LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Mjk0CisKKyAgICAgICAgRm9sbG93IHRoZSBz YW1lIHN0cmF0ZWd5IHdpdGggZ2l0LnB5LiBJZiBpdCBpbnZva2VzIGV4Y2VwdGlvbiwgaXQganVz dCByZXR1cm5zIEZhbHNlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToK KyAgICAgICAgKFNWTi5pbl93b3JraW5nX2RpcmVjdG9yeSk6CisKIDIwMTgtMDctMDIgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgcnVuLWJlbmNobWFyayBzaG91 bGQgaW5jbHVkZSB0aGUgdmVyc2lvbiBudW1iZXIgb2YgTW90aW9uTWFyaydzIHJlc3VsdHMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4u cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5Cmlu ZGV4IDRiNjgyYTAwZWY5Li5mNzFkNzg5ZDBiNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CkBAIC05NiwxMCArOTYsMTMgQEAgY2xh c3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICAgICAjIGJ1dCBkb2Vzbid0IHdv cmsgZm9yIFNWTiA+PSAxLjcuCiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogCi0gICAgICAgIGV4 ZWN1dGl2ZSA9IGV4ZWN1dGl2ZSBvciBFeGVjdXRpdmUoKQotICAgICAgICBzdm5faW5mb19hcmdz ID0gW2Nscy5leGVjdXRhYmxlX25hbWUsICdpbmZvJ10KLSAgICAgICAgZXhpdF9jb2RlID0gZXhl Y3V0aXZlLnJ1bl9jb21tYW5kKHN2bl9pbmZvX2FyZ3MsIGN3ZD1wYXRoLCByZXR1cm5fZXhpdF9j b2RlPVRydWUpCi0gICAgICAgIHJldHVybiAoZXhpdF9jb2RlID09IDApCisgICAgICAgIHRyeToK KyAgICAgICAgICAgIGV4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZSBvciBFeGVjdXRpdmUoKQorICAgICAg ICAgICAgc3ZuX2luZm9fYXJncyA9IFtjbHMuZXhlY3V0YWJsZV9uYW1lLCAnaW5mbyddCisgICAg ICAgICAgICBleGl0X2NvZGUgPSBleGVjdXRpdmUucnVuX2NvbW1hbmQoc3ZuX2luZm9fYXJncywg Y3dkPXBhdGgsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKKyAgICAgICAgICAgIHJldHVybiAoZXhp dF9jb2RlID09IDApCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGU6CisgICAgICAgICAgICBy ZXR1cm4gRmFsc2UKIAogICAgIGRlZiBmaW5kX3V1aWQoc2VsZiwgcGF0aCk6CiAgICAgICAgIGlm IG5vdCBzZWxmLmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGgpOgo= 344206 2018-07-03 13:04:20 -0700 2018-07-03 13:45:06 -0700 Fix ChangeLog 187294.diff text/plain 2191 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ZmQ1 YWU4YjU4Ni4uOWVlYzYyZjZhMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0wNy0wMyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgY2hlY2std2Via2l0LXN0eWxl OiBSdW4gdGhlIHRvb2wgd2l0aG91dCBTVk4gY2xpZW50LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Mjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFuaWVsIEJhdGVzLgorCisgICAgICAgIFdoZW4gaW52b2tpbmcgY2hlY2std2Via2l0LXN0eWxl IHdpdGhvdXQgU1ZOIGNsaWVudCwgdGhlIGV4Y2VwdGlvbiB3YXMgcmFpc2VkIGFuZCB0ZXJtaW5h dGVkLgorICAgICAgICBVc2luZyBHaXQgcmVwb3NpdG9yeSBpcyBhY2NlcHRhYmxlIHdvcmtmbG93 IGFjY29yZGluZyB0byB0aGUgd29yZGluZyBvbjoKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9nZXR0aW5nLXRoZS1jb2RlLyNjaGVja2luZy1vdXQtd2l0aC1naXQ+CisgICAgICAgIGFuZCB1 c2luZyBTdWJ2ZXJzaW9uIGlzIGNvbnNpZGVyZWQgb3B0aW9uYWwgYnkgZm9sbG93aW5nIGxpbms6 CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvd2Via2l0LW9uLXdpbmRvd3MvI2luc3RhbGxp bmctZGV2ZWxvcGVyLXRvb2xzPi4KKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyBpdCBzbyB0aGF0 IHBlb3BsZSB3aXRoIG9ubHkgYSBHaXQgY2hlY2tvdXQgb2YgV2ViS2l0IHRoYXQgY29tbWl0IHVz aW5nCisgICAgICAgIHRoZSBjb21taXQtcXVldWUgKG9yIGFub3RoZXIgbWFjaGluZSB3aXRoIGFu IFNWTiBjaGVja291dCkgY2FuIHJ1biBjaGVjay13ZWJraXQtc3R5bGUuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZO LmluX3dvcmtpbmdfZGlyZWN0b3J5KToKKwogMjAxOC0wNy0wMiAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBydW4tYmVuY2htYXJrIHNob3VsZCBpbmNsdWRlIHRo ZSB2ZXJzaW9uIG51bWJlciBvZiBNb3Rpb25NYXJrJ3MgcmVzdWx0cwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggNGI2ODJhMDBl ZjkuLmY3MWQ3ODlkMGI3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTk2LDEwICs5NiwxMyBAQCBjbGFzcyBTVk4oU0NNLCBT Vk5SZXBvc2l0b3J5KToKICAgICAgICAgICAgICMgYnV0IGRvZXNuJ3Qgd29yayBmb3IgU1ZOID49 IDEuNy4KICAgICAgICAgICAgIHJldHVybiBUcnVlCiAKLSAgICAgICAgZXhlY3V0aXZlID0gZXhl Y3V0aXZlIG9yIEV4ZWN1dGl2ZSgpCi0gICAgICAgIHN2bl9pbmZvX2FyZ3MgPSBbY2xzLmV4ZWN1 dGFibGVfbmFtZSwgJ2luZm8nXQotICAgICAgICBleGl0X2NvZGUgPSBleGVjdXRpdmUucnVuX2Nv bW1hbmQoc3ZuX2luZm9fYXJncywgY3dkPXBhdGgsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKLSAg ICAgICAgcmV0dXJuIChleGl0X2NvZGUgPT0gMCkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAg ZXhlY3V0aXZlID0gZXhlY3V0aXZlIG9yIEV4ZWN1dGl2ZSgpCisgICAgICAgICAgICBzdm5faW5m b19hcmdzID0gW2Nscy5leGVjdXRhYmxlX25hbWUsICdpbmZvJ10KKyAgICAgICAgICAgIGV4aXRf Y29kZSA9IGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChzdm5faW5mb19hcmdzLCBjd2Q9cGF0aCwgcmV0 dXJuX2V4aXRfY29kZT1UcnVlKQorICAgICAgICAgICAgcmV0dXJuIChleGl0X2NvZGUgPT0gMCkK KyAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZToKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQog CiAgICAgZGVmIGZpbmRfdXVpZChzZWxmLCBwYXRoKToKICAgICAgICAgaWYgbm90IHNlbGYuaW5f d29ya2luZ19kaXJlY3RvcnkocGF0aCk6Cg==