152536 2015-12-23 13:02:03 -0800 Python SCM should be able to retrieve untracked files - Generic changes 2015-12-24 02:43:21 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143135 1 youennf youennf achristensen bfulgham commit-queue glenn lforschler rniwa oldest_to_newest 1151135 0 youennf 2015-12-23 13:02:03 -0800 Let's reintroduce patch from bug 143135 progressively. 1151138 1 267853 youennf 2015-12-23 13:08:22 -0800 Created attachment 267853 Patch 1151139 2 youennf 2015-12-23 13:10:37 -0800 Patch reintroduces part of bug 143135 patch which broke win build. 1151146 3 267853 bfulgham 2015-12-23 13:59:49 -0800 Comment on attachment 267853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267853&action=review This looks fine to me, and seems okay on the EWS. I'd prefer if you used the "os.path.join" methods so we can rely on it working on non-Cygwin Windows as well. r+ assuming you make that change. > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:317 > + write_into_file_at_path("test_dir_new/test_file_new", "new stuff") Could you use the python path stuff so this will work on Windows? E.g., os.path.join("test_dir_new", "test_file_new")? 1151261 4 267894 youennf 2015-12-24 01:48:00 -0800 Created attachment 267894 Patch for landing 1151262 5 youennf 2015-12-24 01:48:57 -0800 Thanks for the review. > Could you use the python path stuff so this will work on Windows? E.g., > os.path.join("test_dir_new", "test_file_new")? Sounds good, done in the landing patch. 1151265 6 267894 commit-queue 2015-12-24 02:43:17 -0800 Comment on attachment 267894 Patch for landing Clearing flags on attachment: 267894 Committed r194415: <http://trac.webkit.org/changeset/194415> 1151266 7 commit-queue 2015-12-24 02:43:21 -0800 All reviewed patches have been landed. Closing bug. 267853 2015-12-23 13:08:22 -0800 2015-12-24 01:47:54 -0800 Patch bug-152536-20151223220744.patch text/plain 3409 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0Mzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODBlMTFkMTQxYmY3YTM4NjYyYzNjNjc0OWQwYTBjNjYw OWFiZTc4My4uNDgwY2EwZWY4MzJmZDAzYzc4MTM5MjgzMDc4ZDE3YjgxMGRkZjQ3MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE1LTEyLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgUHl0aG9uIFNDTSBzaG91bGQgYmUgYWJsZSB0byByZXRyaWV2ZSB1bnRy YWNrZWQgZmlsZXMgLSBHZW5lcmljIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBTQ00udW50cmFja2Vk X2ZpbGVzIHRvIHJldHJpZXZlIGEgbGlzdCBvZiB1bnRyYWNrZWQgZmlsZXMuCisgICAgICAgIE5v IHN1cHBvcnQgaXMgeWV0IGFkZGVkIHRvIEdJVCBhbmQgU1ZOIHNwZWNpZmljIGltcGxlbWVudGF0 aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y20ucHk6CisgICAgICAgIChTQ00udW50cmFja2VkX2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5OgorICAgICAgICAo U0NNVGVzdC5fc2hhcmVkX3Rlc3RfdW50cmFja2VkX2ZpbGVzKToKKwogMjAxNS0xMi0yMyAgQ2hy aXMgQWxqb3VkaSA8Y2hyaXNAY2hyaXNtYXRpYy5pbz4gYW5kIEFsZXggQ2hyaXN0ZW5zZW4gPGFj aHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIENvbnRlbnQgYmxvY2tlcnMgc2hvdWxk IGJlIGFibGUgdG8gcHJvbW90ZSBodHRwIHRvIGh0dHBzCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQppbmRleCBlYmI2YzA5MTM5OTZjMmUy MjQ3ZTIwZDEwOWU5YjYxMjE1YjQxOGIwLi44YjhlNTNlMWJhYWVlZDdlYTZlYzg0ODUwMWYwZDcw Yjg1NzBhNjVlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9zY20ucHkKQEAgLTIwNCw2ICsyMDQsOSBAQCBjbGFzcyBTQ006CiAgICAgZGVmIGhh c193b3JraW5nX2RpcmVjdG9yeV9jaGFuZ2VzKHNlbGYpOgogICAgICAgICBzZWxmLl9zdWJjbGFz c19tdXN0X2ltcGxlbWVudCgpCiAKKyAgICBkZWYgdW50cmFja2VkX2ZpbGVzKHNlbGYsIGluY2x1 ZGVfaWdub3JlZF9maWxlcz1GYWxzZSk6CisgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1w bGVtZW50KCkKKwogICAgIGRlZiBkaXNjYXJkX3dvcmtpbmdfZGlyZWN0b3J5X2NoYW5nZXMoc2Vs Zik6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1wbGVtZW50KCkKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5p dHRlc3QucHkKaW5kZXggNGI2NTgyY2I0ZTdmMWM4Y2Q3MmI5MTdjZjA2YmI5NDVlYzg3MWY3Mi4u MzdhMjFkOGMwMjQ1ZGMyMDgxNTU2OTdiZjU5ZWNlYjc3ODA3OWQxYiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5CkBAIC0zMDksNiArMzA5LDI5IEBAIGNsYXNzIFNDTVRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICBzZWxmLmFzc2VydEl0ZW1zRXF1YWwoc2VsZi5zY20uY2hhbmdlZF9maWxl cygpLCBbInRlc3RfZGlyL3Rlc3RfZmlsZTMiLCAidGVzdF9maWxlIl0pCiAgICAgICAgIG9zLmNo ZGlyKG9sZF9jd2QpCiAKKyAgICBkZWYgX3NoYXJlZF90ZXN0X3VudHJhY2tlZF9maWxlcyhzZWxm LCBzY20pOgorICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgidGVzdF9maWxlX25ldyIs ICJuZXcgY29udGVudCIpCisgICAgICAgIHNlbGYuYXNzZXJ0SXRlbXNFcXVhbChzY20udW50cmFj a2VkX2ZpbGVzKCksIFsidGVzdF9maWxlX25ldyJdKQorCisgICAgICAgIG9zLm1rZGlyKCJ0ZXN0 X2Rpcl9uZXciKQorICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgidGVzdF9kaXJfbmV3 L3Rlc3RfZmlsZV9uZXciLCAibmV3IHN0dWZmIikKKyAgICAgICAgc2VsZi5hc3NlcnRJdGVtc0Vx dWFsKHNjbS51bnRyYWNrZWRfZmlsZXMoKSwgWyJ0ZXN0X2Rpcl9uZXciLCAidGVzdF9maWxlX25l dyJdKQorCisgICAgICAgIG9sZF9jd2QgPSBvcy5nZXRjd2QoKQorICAgICAgICBvcy5jaGRpcigi dGVzdF9kaXJfbmV3IikKKyAgICAgICAgIyBWYWxpZGF0ZSB0aGF0IHVudHJhY2tlZF9maWxlcyBk byBub3QgY2hhbmdlIHdpdGggb3VyIGN3ZC4KKyAgICAgICAgc2VsZi5hc3NlcnRJdGVtc0VxdWFs KHNjbS51bnRyYWNrZWRfZmlsZXMoKSwgWyJ0ZXN0X2Rpcl9uZXciLCAidGVzdF9maWxlX25ldyJd KQorCisgICAgICAgIG9zLmNoZGlyKG9sZF9jd2QpCisKKyAgICAgICAgd3JpdGVfaW50b19maWxl X2F0X3BhdGgoInRlc3RfZmlsZV9uZXcucHljIiwgIm5ldyBpZ25vcmVkIGZpbGUiKQorICAgICAg ICBzZWxmLmFzc2VydEl0ZW1zRXF1YWwoc2NtLnVudHJhY2tlZF9maWxlcygpLCBbInRlc3RfZGly X25ldyIsICJ0ZXN0X2ZpbGVfbmV3Il0pCisgICAgICAgIHNlbGYuYXNzZXJ0SXRlbXNFcXVhbChz Y20udW50cmFja2VkX2ZpbGVzKGluY2x1ZGVfaWdub3JlZF9maWxlcz1UcnVlKSwgWyJ0ZXN0X2Zp bGVfbmV3LnB5YyIsICJ0ZXN0X2Rpcl9uZXciLCAidGVzdF9maWxlX25ldyJdKQorCisgICAgICAg IHNodXRpbC5ybXRyZWUoInRlc3RfZGlyX25ldyIpCisgICAgICAgIG9zLnJlbW92ZSgidGVzdF9m aWxlX25ldyIpCisgICAgICAgIG9zLnJlbW92ZSgidGVzdF9maWxlX25ldy5weWMiKQorCiAgICAg ZGVmIF9zaGFyZWRfdGVzdF9hZGRlZF9maWxlcyhzZWxmKToKICAgICAgICAgd3JpdGVfaW50b19m aWxlX2F0X3BhdGgoInRlc3RfZmlsZSIsICJjaGFuZ2VkIGNvbnRlbnQiKQogICAgICAgICBzZWxm LmFzc2VydEl0ZW1zRXF1YWwoc2VsZi5zY20uYWRkZWRfZmlsZXMoKSwgW10pCg== 267894 2015-12-24 01:48:00 -0800 2015-12-24 02:43:17 -0800 Patch for landing bug-152536-20151223222828.patch text/plain 3425 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0Mzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODBlMTFkMTQxYmY3YTM4NjYyYzNjNjc0OWQwYTBjNjYw OWFiZTc4My4uNmYwMmQxYjI0YTM3M2QyOGNjOGY4YmY2YzAzYzYxZWE3NjkzM2Y1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE1LTEyLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgUHl0aG9uIFNDTSBzaG91bGQgYmUgYWJsZSB0byByZXRyaWV2ZSB1bnRy YWNrZWQgZmlsZXMgLSBHZW5lcmljIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50 IEZ1bGdoYW0uCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIFNDTS51bnRyYWNrZWRf ZmlsZXMgdG8gcmV0cmlldmUgYSBsaXN0IG9mIHVudHJhY2tlZCBmaWxlcy4KKyAgICAgICAgTm8g c3VwcG9ydCBpcyB5ZXQgYWRkZWQgdG8gR0lUIGFuZCBTVk4gc3BlY2lmaWMgaW1wbGVtZW50YXRp b25zLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weToKKyAgICAgICAgKFNDTS51bnRyYWNrZWRfZmlsZXMpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisgICAgICAgIChT Q01UZXN0Ll9zaGFyZWRfdGVzdF91bnRyYWNrZWRfZmlsZXMpOgorCiAyMDE1LTEyLTIzICBDaHJp cyBBbGpvdWRpIDxjaHJpc0BjaHJpc21hdGljLmlvPiBhbmQgQWxleCBDaHJpc3RlbnNlbiA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ29udGVudCBibG9ja2VycyBzaG91bGQg YmUgYWJsZSB0byBwcm9tb3RlIGh0dHAgdG8gaHR0cHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CmluZGV4IGViYjZjMDkxMzk5NmMyZTIy NDdlMjBkMTA5ZTliNjEyMTViNDE4YjAuLjhiOGU1M2UxYmFhZWVkN2VhNmVjODQ4NTAxZjBkNzBi ODU3MGE2NWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3NjbS5weQpAQCAtMjA0LDYgKzIwNCw5IEBAIGNsYXNzIFNDTToKICAgICBkZWYgaGFz X3dvcmtpbmdfZGlyZWN0b3J5X2NoYW5nZXMoc2VsZik6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNz X211c3RfaW1wbGVtZW50KCkKIAorICAgIGRlZiB1bnRyYWNrZWRfZmlsZXMoc2VsZiwgaW5jbHVk ZV9pZ25vcmVkX2ZpbGVzPUZhbHNlKToKKyAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBs ZW1lbnQoKQorCiAgICAgZGVmIGRpc2NhcmRfd29ya2luZ19kaXJlY3RvcnlfY2hhbmdlcyhzZWxm KToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0 dGVzdC5weQppbmRleCA0YjY1ODJjYjRlN2YxYzhjZDcyYjkxN2NmMDZiYjk0NWVjODcxZjcyLi4z ODAwNjQxMzI4MjY0MzYwY2Q3MWQ2MWI0MTY5Nzk1MjQ3ZWRhNmRhIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRl c3QucHkKQEAgLTMwOSw2ICszMDksMjkgQEAgY2xhc3MgU0NNVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0SXRlbXNFcXVhbChzZWxmLnNjbS5jaGFuZ2VkX2ZpbGVz KCksIFsidGVzdF9kaXIvdGVzdF9maWxlMyIsICJ0ZXN0X2ZpbGUiXSkKICAgICAgICAgb3MuY2hk aXIob2xkX2N3ZCkKIAorICAgIGRlZiBfc2hhcmVkX3Rlc3RfdW50cmFja2VkX2ZpbGVzKHNlbGYs IHNjbSk6CisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKCJ0ZXN0X2ZpbGVfbmV3Iiwg Im5ldyBjb250ZW50IikKKyAgICAgICAgc2VsZi5hc3NlcnRJdGVtc0VxdWFsKHNjbS51bnRyYWNr ZWRfZmlsZXMoKSwgWyJ0ZXN0X2ZpbGVfbmV3Il0pCisKKyAgICAgICAgb3MubWtkaXIoInRlc3Rf ZGlyX25ldyIpCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKG9zLnBhdGguam9pbigi dGVzdF9kaXJfbmV3IiwgInRlc3RfZmlsZV9uZXciKSwgIm5ldyBzdHVmZiIpCisgICAgICAgIHNl bGYuYXNzZXJ0SXRlbXNFcXVhbChzY20udW50cmFja2VkX2ZpbGVzKCksIFsidGVzdF9kaXJfbmV3 IiwgInRlc3RfZmlsZV9uZXciXSkKKworICAgICAgICBvbGRfY3dkID0gb3MuZ2V0Y3dkKCkKKyAg ICAgICAgb3MuY2hkaXIoInRlc3RfZGlyX25ldyIpCisgICAgICAgICMgVmFsaWRhdGUgdGhhdCB1 bnRyYWNrZWRfZmlsZXMgZG8gbm90IGNoYW5nZSB3aXRoIG91ciBjd2QuCisgICAgICAgIHNlbGYu YXNzZXJ0SXRlbXNFcXVhbChzY20udW50cmFja2VkX2ZpbGVzKCksIFsidGVzdF9kaXJfbmV3Iiwg InRlc3RfZmlsZV9uZXciXSkKKworICAgICAgICBvcy5jaGRpcihvbGRfY3dkKQorCisgICAgICAg IHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKCJ0ZXN0X2ZpbGVfbmV3LnB5YyIsICJuZXcgaWdub3Jl ZCBmaWxlIikKKyAgICAgICAgc2VsZi5hc3NlcnRJdGVtc0VxdWFsKHNjbS51bnRyYWNrZWRfZmls ZXMoKSwgWyJ0ZXN0X2Rpcl9uZXciLCAidGVzdF9maWxlX25ldyJdKQorICAgICAgICBzZWxmLmFz c2VydEl0ZW1zRXF1YWwoc2NtLnVudHJhY2tlZF9maWxlcyhpbmNsdWRlX2lnbm9yZWRfZmlsZXM9 VHJ1ZSksIFsidGVzdF9maWxlX25ldy5weWMiLCAidGVzdF9kaXJfbmV3IiwgInRlc3RfZmlsZV9u ZXciXSkKKworICAgICAgICBzaHV0aWwucm10cmVlKCJ0ZXN0X2Rpcl9uZXciKQorICAgICAgICBv cy5yZW1vdmUoInRlc3RfZmlsZV9uZXciKQorICAgICAgICBvcy5yZW1vdmUoInRlc3RfZmlsZV9u ZXcucHljIikKKwogICAgIGRlZiBfc2hhcmVkX3Rlc3RfYWRkZWRfZmlsZXMoc2VsZik6CiAgICAg ICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKCJ0ZXN0X2ZpbGUiLCAiY2hhbmdlZCBjb250ZW50 IikKICAgICAgICAgc2VsZi5hc3NlcnRJdGVtc0VxdWFsKHNlbGYuc2NtLmFkZGVkX2ZpbGVzKCks IFtdKQo=