133168 2014-05-21 21:44:53 -0700 Add cherrypick_merge and revert methods to SCM 2015-02-26 09:40:02 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified NEW P2 Enhancement --- 1 matthew_hanson webkit-unassigned dpranke glenn ossy rniwa oldest_to_newest 1010887 0 matthew_hanson 2014-05-21 21:44:53 -0700 SCM is missing methods for cherrypicking a specific commit and reverting a single file. These methods should be added to the base class and implemented in the SVN and Git subclasses. 1010889 1 231856 matthew_hanson 2014-05-21 22:13:27 -0700 Created attachment 231856 Add cherrypick_merge and revert_file to SCM and subclasses. 1010892 2 231856 rniwa 2014-05-21 22:21:16 -0700 Comment on attachment 231856 Add cherrypick_merge and revert_file to SCM and subclasses. I'd prefer if all these changes to webkitpy were in the patch that adds some scripts to use it. 1010902 3 231856 rniwa 2014-05-21 22:48:45 -0700 Comment on attachment 231856 Add cherrypick_merge and revert_file to SCM and subclasses. rs=me. 1072355 4 ossy 2015-02-26 06:15:27 -0800 Cherry pick is already added by http://trac.webkit.org/changeset/175606 ... but it isn't used at all. What is the goal with adding unused codes to git.py? 1072356 5 231856 ossy 2015-02-26 06:15:50 -0800 Comment on attachment 231856 Add cherrypick_merge and revert_file to SCM and subclasses. r-, because they are unused functions. 1072400 6 rniwa 2015-02-26 09:40:02 -0800 (In reply to comment #5) > Comment on attachment 231856 [details] > Add cherrypick_merge and revert_file to SCM and subclasses. > > r-, because they are unused functions. These are used by Apple internal tools. 231856 2014-05-21 22:13:27 -0700 2015-02-26 06:15:50 -0800 Add cherrypick_merge and revert_file to SCM and subclasses. scm.patch text/plain 4275 matthew_hanson RnJvbSBmNzlhNTAxOTZjMmRlNGQ5YmU3OGI3ZmQzZjI0ZjJkZWI4ZjY4YTc2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEhhbnNvbiA8bWF0dGhld19oYW5zb25AYXBwbGUu Y29tPgpEYXRlOiBXZWQsIDIxIE1heSAyMDE0IDIyOjA4OjM5IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gQWRkIGNoZXJyeXBpY2tfbWVyZ2UgYW5kIHJldmVydCBtZXRob2RzIHRvIFNDTQogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzE2OAoKKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgooR2l0LmNoZXJyeXBpY2tfbWVyZ2UpOiBJ bXBsZW1lbnQuCihHaXQucmV2ZXJ0X2ZpbGUpOiBJbXBsZW1lbnQuCiogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKFNDTS5jaGVycnlwaWNrX21lcmdlKTogQWRk ZWQuCihTQ00ucmV2ZXJ0X2ZpbGUpOiBBZGRlZC4KKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5OgooU1ZOLmNoZXJyeXBpY2tfbWVyZ2UpOiBJbXBsZW1lbnQuCihT Vk4ucmV2ZXJ0X2ZpbGUpOiBJbXBsZW1lbnQuCi0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE3ICsrKysrKysrKysrKysrKysrCiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IHwgIDkgKysrKysrKysr CiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IHwgIDYg KysrKysrCiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5 IHwgIDggKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKQoKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmMjhjYzA0Li4y YjJhZmY5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMjIgQEAKIDIwMTQtMDUtMjEgIE1hdHRoZXcgSGFuc29uICA8bWF0dGhld19o YW5zb25AYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBjaGVycnlwaWNrX21lcmdlIGFuZCByZXZl cnQgbWV0aG9kcyB0byBTQ00KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMzE2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToK KyAgICAgICAgKEdpdC5jaGVycnlwaWNrX21lcmdlKTogSW1wbGVtZW50LgorICAgICAgICAoR2l0 LnJldmVydF9maWxlKTogSW1wbGVtZW50LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00uY2hlcnJ5cGlja19tZXJnZSk6 IEFkZGVkLgorICAgICAgICAoU0NNLnJldmVydF9maWxlKTogQWRkZWQuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5j aGVycnlwaWNrX21lcmdlKTogSW1wbGVtZW50LgorICAgICAgICAoU1ZOLnJldmVydF9maWxlKTog SW1wbGVtZW50LgorCisyMDE0LTA1LTIxICBNYXR0aGV3IEhhbnNvbiAgPG1hdHRoZXdfaGFuc29u QGFwcGxlLmNvbT4KKwogICAgICAgICBJbXByb3ZlIHN1cHBvcnQgZm9yIFNWTiBzdGF0dXNlcyBp biBzY20ucHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMTQxNQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL2dpdC5weQppbmRleCBjM2EzMmYxLi45ZDZiZmRiIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTE2Miw2ICsxNjIsMTUg QEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIF9zdGF0dXNfcmVnZXhw KHNlbGYsIGV4cGVjdGVkX3R5cGVzKToKICAgICAgICAgcmV0dXJuICdeKD9QPHN0YXR1cz5bJXNd KVx0KD9QPGZpbGVuYW1lPi4rKSQnICUgZXhwZWN0ZWRfdHlwZXMKIAorICAgIGRlZiBjaGVycnlw aWNrX21lcmdlKHNlbGYsIHVybCwgY29tbWl0LCBpbnRlcmFjdGl2ZT1GYWxzZSk6CisgICAgICAg IGdpdF9hcmdzID0gWydjaGVycnktcGljaycsIGNvbW1pdF0KKyAgICAgICAgcmV0dXJuIHNlbGYu X3J1bl9naXQoZ2l0X2FyZ3MpCisKKyAgICBkZWYgcmV2ZXJ0X2ZpbGUoc2VsZiwgcGF0aCk6Cisg ICAgICAgIHJlc2V0X2FyZ3MgPSBbJ3Jlc2V0JywgcGF0aF0KKyAgICAgICAgY2hlY2tvdXRfYXJn cyA9IFsnY2hlY2tvdXQnLCBwYXRoXQorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChyZXNl dF9hcmdzKSBhbmQgc2VsZi5fcnVuX2dpdChjaGVja291dF9hcmdzKQorCiAgICAgZGVmIGFkZF9s aXN0KHNlbGYsIHBhdGhzKToKICAgICAgICAgc2VsZi5fcnVuX2dpdChbImFkZCJdICsgcGF0aHMp CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt LnB5CmluZGV4IDFlNzFkNTkuLjIzMmEyZjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtMTYxLDYgKzE2MSwxMiBAQCBjbGFz cyBTQ006CiAgICAgICAgIHN0YXR1c19jb21tYW5kID0gc3RhdHVzX2NvbW1hbmQgb3Igc2VsZi5z dGF0dXNfY29tbWFuZCgpCiAgICAgICAgIHJldHVybiBzZWxmLmNoZWNrb3V0X3N0YXR1cygpLnRy ZWVfY29uZmxpY3RlZF9maWxlcwogCisgICAgZGVmIGNoZXJyeXBpY2tfbWVyZ2Uoc2VsZiwgcmV2 aXNpb24pOgorICAgICAgICBzZWxmLl9zdWJjbGFzc19tdXN0X2ltcGxlbWVudCgpCisKKyAgICBk ZWYgcmV2ZXJ0X2ZpbGUoc2VsZiwgZmlsZSk6CisgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3Rf aW1wbGVtZW50KCkKKwogICAgIGRlZiBhZGQoc2VsZiwgcGF0aCk6CiAgICAgICAgIHNlbGYuYWRk X2xpc3QoW3BhdGhdKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3N2bi5weQppbmRleCAxMmMzMzE4Li43ZDNhOTk3IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTMzMSw2ICsz MzEsMTQgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICMgRklYTUU6 IFNob3VsZCB0aGlzIHVzZSBjd2Q9c2VsZi5jaGVja291dF9yb290PwogICAgICAgICBzZWxmLl9y dW5fc3ZuKHN2bl9tZXJnZV9hcmdzKQogCisgICAgZGVmIGNoZXJyeXBpY2tfbWVyZ2Uoc2VsZiwg dXJsLCByZXZpc2lvbiwgaW50ZXJhY3RpdmU9RmFsc2UpOgorICAgICAgICBzdm5fYXJncyA9IFsn bWVyZ2UnLCAnLS1ub24taW50ZXJhY3RpdmUnLCAnLS1pZ25vcmUtYW5jZXN0cnknLCAnLWMnLCBy ZXZpc2lvbiwgdXJsXQorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX3N2bihzdm5fYXJncywgY3dk PXNlbGYuY2hlY2tvdXRfcm9vdCkKKworICAgIGRlZiByZXZlcnRfZmlsZShzZWxmLCBwYXRoKToK KyAgICAgICAgc3ZuX2FyZ3MgPSBbJ3JldmVydCcsIHBhdGhdCisgICAgICAgIHJldHVybiBzZWxm Ll9ydW5fc3ZuKHN2bl9hcmdzLCBjd2Q9c2VsZi5jaGVja291dF9yb290KQorCiAgICAgZGVmIHJl dmVydF9maWxlcyhzZWxmLCBmaWxlX3BhdGhzKToKICAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91 bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QuCiAgICAgICAgIHNlbGYuX3J1 bl9zdm4oWydyZXZlcnQnXSArIGZpbGVfcGF0aHMpCi0tIAoxLjkuMiAoQXBwbGUgR2l0LTQ5KQoK