124889 2013-11-26 06:54:36 -0800 Move methods which belong to Checkout 2013-11-26 17:24:55 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbatyai.u-szeged webkit-unassigned commit-queue glenn ossy rniwa oldest_to_newest 954255 0 dbatyai.u-szeged 2013-11-26 06:54:36 -0800 Moved methods which belong to Checkout into checkout.py FIXME: This belongs in Checkout, not SCM. def scripts_directory(self): FIXME: This belongs in Checkout, not SCM. def script_path(self, script_name): 954256 1 217878 dbatyai.u-szeged 2013-11-26 06:56:26 -0800 Created attachment 217878 Proposed patch 954259 2 217878 rniwa 2013-11-26 07:13:45 -0800 Comment on attachment 217878 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=217878&action=review > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:276 > - return self.run([self.script_path("svn-create-patch")] + changed_files, > + script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch") > + return self.run([script_path] + changed_files, Why are we not moving this method to Checkout? 954260 3 dbatyai.u-szeged 2013-11-26 07:20:17 -0800 (In reply to comment #2) > Why are we not moving this method to Checkout? Because the method form the supercalss is called, and if I moved it, I'd have to move it from both SVN and Git, but then I would also have to figure out somehow which one to call, since it's not obvius from the superclass, and that would just be a huge hack, unless I'm missing something. 954393 4 217878 commit-queue 2013-11-26 17:24:53 -0800 Comment on attachment 217878 Proposed patch Clearing flags on attachment: 217878 Committed r159796: <http://trac.webkit.org/changeset/159796> 954394 5 commit-queue 2013-11-26 17:24:55 -0800 All reviewed patches have been landed. Closing bug. 217878 2013-11-26 06:56:26 -0800 2013-11-26 17:24:53 -0800 Proposed patch proposedpatch.patch text/plain 7195 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0Y2Nj OGI2Li41MWYzMDYxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTMtMTEtMjYgIETDoW5pZWwgQsOhdHlhaSAgPEJh dHlhaS5EYW5pZWxAc3R1ZC51LXN6ZWdlZC5odT4KKworICAgICAgICBNb3ZlZCBtZXRob2RzIHdo aWNoIGJlbG9uZyB0byBDaGVja291dCBpbnRvIGNoZWNrb3V0LnB5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ4ODkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2NoZWNrb3V0LnB5OgorICAgICAgICAoQ2hlY2tvdXQuc2NyaXB0c19kaXJlY3Rv cnkpOgorICAgICAgICAoQ2hlY2tvdXQpOgorICAgICAgICAoQ2hlY2tvdXQuc2NyaXB0X3BhdGgp OgorICAgICAgICAoQ2hlY2tvdXQuY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KToKKyAg ICAgICAgKENoZWNrb3V0LmFwcGx5X3BhdGNoKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfY29t bWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KToKKyAgICAgICAgKENoZWNrb3V0VGVzdC50ZXN0 X2FwcGx5X3BhdGNoKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc2NtLnB5OgorICAgICAgICAoU0NNLmFic29sdXRlX3BhdGgpOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisgICAg ICAgIChTQ01UZXN0Ll9zZXR1cF93ZWJraXR0b29sc19zY3JpcHRzX3N5bWxpbmspOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHk6CisgICAgICAg IChTVk4uY3JlYXRlX3BhdGNoKToKKwogMjAxMy0xMS0yMiAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpdmUgTW91bnRhaW4gTGlvbiBidWlsZCBmaXgu CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVj a291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0 LnB5CmluZGV4IDYwZTE1YjIuLjU4M2NmYTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CkBAIC00Niw2ICs0NiwxMiBAQCBjbGFz cyBDaGVja291dChvYmplY3QpOgogICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBleGVjdXRpdmUg b3Igc2VsZi5fc2NtLl9leGVjdXRpdmUKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGZpbGVz eXN0ZW0gb3Igc2VsZi5fc2NtLl9maWxlc3lzdGVtCiAKKyAgICBkZWYgc2NyaXB0c19kaXJlY3Rv cnkoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fc2Nt LmNoZWNrb3V0X3Jvb3QsICJUb29scyIsICJTY3JpcHRzIikKKworICAgIGRlZiBzY3JpcHRfcGF0 aChzZWxmLCBzY3JpcHRfbmFtZSk6CisgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpv aW4oc2VsZi5zY3JpcHRzX2RpcmVjdG9yeSgpLCBzY3JpcHRfbmFtZSkKKwogICAgIGRlZiBpc19w YXRoX3RvX2NoYW5nZWxvZyhzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVz eXN0ZW0uYmFzZW5hbWUocGF0aCkgPT0gIkNoYW5nZUxvZyIKIApAQCAtMTI1LDcgKzEzMSw3IEBA IGNsYXNzIENoZWNrb3V0KG9iamVjdCk6CiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvciht ZXNzYWdlPSJGb3VuZCBubyBtb2RpZmllZCBDaGFuZ2VMb2dzLCBjYW5ub3QgY3JlYXRlIGEgY29t bWl0IG1lc3NhZ2UuXG4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQWxsIGNoYW5n ZXMgcmVxdWlyZSBhIENoYW5nZUxvZy4gIFNlZTpcbiAlcyIgJSB1cmxzLmNvbnRyaWJ1dGlvbl9n dWlkZWxpbmVzKQogCi0gICAgICAgIG1lc3NhZ2VfdGV4dCA9IHNlbGYuX3NjbS5ydW4oW3NlbGYu X3NjbS5zY3JpcHRfcGF0aCgnY29tbWl0LWxvZy1lZGl0b3InKSwgJy0tcHJpbnQtbG9nJ10gKyBj aGFuZ2Vsb2dfcGF0aHMsIHJldHVybl9zdGRlcnI9cmV0dXJuX3N0ZGVycikKKyAgICAgICAgbWVz c2FnZV90ZXh0ID0gc2VsZi5fc2NtLnJ1bihbc2VsZi5zY3JpcHRfcGF0aCgnY29tbWl0LWxvZy1l ZGl0b3InKSwgJy0tcHJpbnQtbG9nJ10gKyBjaGFuZ2Vsb2dfcGF0aHMsIHJldHVybl9zdGRlcnI9 cmV0dXJuX3N0ZGVycikKICAgICAgICAgcmV0dXJuIENvbW1pdE1lc3NhZ2UobWVzc2FnZV90ZXh0 LnNwbGl0bGluZXMoKSkKIAogICAgIGRlZiByZWNlbnRfY29tbWl0X2luZm9zX2Zvcl9maWxlcyhz ZWxmLCBwYXRocyk6CkBAIC0xNTAsNyArMTU2LDcgQEAgY2xhc3MgQ2hlY2tvdXQob2JqZWN0KToK ICAgICAgICAgIyBXZSBzaG91bGQgZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNlLgogICAgICAg ICAjIEZJWE1FOiBNb3ZlIF9zY20uc2NyaXB0X3BhdGggaGVyZSBvbmNlIHdlIGdldCByaWQgb2Yg YWxsIHRoZSBkZXBlbmRlbmNpZXMuCiAgICAgICAgICMgLS1mb3JjZSAoY29udGludWUgYWZ0ZXIg ZXJyb3JzKSBpcyB0aGUgY29tbW9uIGNhc2UsIHNvIHdlIGFsd2F5cyB1c2UgaXQuCi0gICAgICAg IGFyZ3MgPSBbc2VsZi5fc2NtLnNjcmlwdF9wYXRoKCdzdm4tYXBwbHknKSwgIi0tZm9yY2UiXQor ICAgICAgICBhcmdzID0gW3NlbGYuc2NyaXB0X3BhdGgoJ3N2bi1hcHBseScpLCAiLS1mb3JjZSJd CiAgICAgICAgIGlmIHBhdGNoLnJldmlld2VyKCk6CiAgICAgICAgICAgICBhcmdzICs9IFsnLS1y ZXZpZXdlcicsIHBhdGNoLnJldmlld2VyKCkuZnVsbF9uYW1lXQogICAgICAgICBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoYXJncywgaW5wdXQ9cGF0Y2guY29udGVudHMoKSwgY3dkPXNlbGYu X3NjbS5jaGVja291dF9yb290KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvY2hlY2tvdXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dF91bml0dGVzdC5weQppbmRleCA1ODc3OThlLi5i NmIzNzA1ZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L2NoZWNrb3V0X3VuaXR0ZXN0LnB5CkBAIC0xMzYsOSArMTM2LDEwIEBAIFNl Y29uZCBwYXJ0IG9mIHRoaXMgY29tcGxpY2F0ZWQgY2hhbmdlIGJ5IG1lLCBUb3IgQXJuZSBWZXN0 Ylx1MDBmOCEKIAogICAgICAgICBtb2NrX3NjbSA9IE1vY2tTQ00oKQogICAgICAgICBtb2NrX3Nj bS5ydW4gPSBtb2NrX3J1bgotICAgICAgICBtb2NrX3NjbS5zY3JpcHRfcGF0aCA9IHJlYWxfc2Nt LnNjcmlwdF9wYXRoCiAKKyAgICAgICAgcmVhbF9jaGVja291dCA9IENoZWNrb3V0KHJlYWxfc2Nt KQogICAgICAgICBjaGVja291dCA9IENoZWNrb3V0KG1vY2tfc2NtKQorICAgICAgICBjaGVja291 dC5zY3JpcHRfcGF0aCA9IHJlYWxfY2hlY2tvdXQuc2NyaXB0X3BhdGgKICAgICAgICAgY2hlY2tv dXQubW9kaWZpZWRfY2hhbmdlbG9ncyA9IGxhbWJkYSBnaXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVz PU5vbmU6IHNlbGYuY2hhbmdlbG9ncwogICAgICAgICBjb21taXRfbWVzc2FnZSA9IGNoZWNrb3V0 LmNvbW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdChnaXRfY29tbWl0PU5vbmUsIHJldHVybl9z dGRlcnI9VHJ1ZSkKICAgICAgICAgIyBUaHJvdyBhd2F5IHRoZSBmaXJzdCBsaW5lIC0gYSB3YXJu aW5nIGFib3V0IHVua25vd24gVkNTIHJvb3QuCkBAIC0yNTIsNyArMjUzLDcgQEAgY2xhc3MgQ2hl Y2tvdXRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9hcHBseV9wYXRjaChz ZWxmKToKICAgICAgICAgY2hlY2tvdXQgPSBzZWxmLl9tYWtlX2NoZWNrb3V0KCkKICAgICAgICAg Y2hlY2tvdXQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1UcnVlKQotICAg ICAgICBjaGVja291dC5fc2NtLnNjcmlwdF9wYXRoID0gbGFtYmRhIHNjcmlwdDogc2NyaXB0Cisg ICAgICAgIGNoZWNrb3V0LnNjcmlwdF9wYXRoID0gbGFtYmRhIHNjcmlwdDogc2NyaXB0CiAgICAg ICAgIG1vY2tfcGF0Y2ggPSBNb2NrKCkKICAgICAgICAgbW9ja19wYXRjaC5jb250ZW50cyA9IGxh bWJkYTogImZvbyIKICAgICAgICAgbW9ja19wYXRjaC5yZXZpZXdlciA9IGxhbWJkYTogTm9uZQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkK aW5kZXggYjAwNWVhMi4uZWJiNmMwOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CkBAIC04MiwxNCArODIsNiBAQCBjbGFzcyBTQ006 CiAgICAgZGVmIGFic29sdXRlX3BhdGgoc2VsZiwgcmVwb3NpdG9yeV9yZWxhdGl2ZV9wYXRoKToK ICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLmNoZWNrb3V0X3Jvb3Qs IHJlcG9zaXRvcnlfcmVsYXRpdmVfcGF0aCkKIAotICAgICMgRklYTUU6IFRoaXMgYmVsb25ncyBp biBDaGVja291dCwgbm90IFNDTS4KLSAgICBkZWYgc2NyaXB0c19kaXJlY3Rvcnkoc2VsZik6Ci0g ICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5jaGVja291dF9yb290LCAi VG9vbHMiLCAiU2NyaXB0cyIpCi0KLSAgICAjIEZJWE1FOiBUaGlzIGJlbG9uZ3MgaW4gQ2hlY2tv dXQsIG5vdCBTQ00uCi0gICAgZGVmIHNjcmlwdF9wYXRoKHNlbGYsIHNjcmlwdF9uYW1lKToKLSAg ICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnNjcmlwdHNfZGlyZWN0b3J5 KCksIHNjcmlwdF9uYW1lKQotCiAgICAgZGVmIHJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5h bWVzKHNlbGYsIHN0YXR1c19jb21tYW5kLCBzdGF0dXNfcmVnZXhwKToKICAgICAgICAgZmlsZW5h bWVzID0gW10KICAgICAgICAgIyBXZSBydW4gd2l0aCBjd2Q9c2VsZi5jaGVja291dF9yb290IHNv IHRoYXQgcmV0dXJuZWQtcGF0aHMgYXJlIHJvb3QtcmVsYXRpdmUuCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5w eQppbmRleCAxNTQzMmYwLi5hM2NkM2IxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKQEAgLTI5MCw4 ICsyOTAsOCBAQCBjbGFzcyBTQ01UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiBf c2V0dXBfd2Via2l0dG9vbHNfc2NyaXB0c19zeW1saW5rKHNlbGYsIGxvY2FsX3NjbSk6CiAgICAg ICAgIHdlYmtpdF9zY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShvcy5wYXRoLmRpcm5hbWUob3MucGF0 aC5hYnNwYXRoKF9fZmlsZV9fKSkpCi0gICAgICAgIHdlYmtpdF9zY3JpcHRzX2RpcmVjdG9yeSA9 IHdlYmtpdF9zY20uc2NyaXB0c19kaXJlY3RvcnkoKQotICAgICAgICBsb2NhbF9zY3JpcHRzX2Rp cmVjdG9yeSA9IGxvY2FsX3NjbS5zY3JpcHRzX2RpcmVjdG9yeSgpCisgICAgICAgIHdlYmtpdF9z Y3JpcHRzX2RpcmVjdG9yeSA9IENoZWNrb3V0KHdlYmtpdF9zY20sIHdlYmtpdF9zY20uX2V4ZWN1 dGl2ZSwgd2Via2l0X3NjbS5fZmlsZXN5c3RlbSkuc2NyaXB0c19kaXJlY3RvcnkoKQorICAgICAg ICBsb2NhbF9zY3JpcHRzX2RpcmVjdG9yeSA9IENoZWNrb3V0KGxvY2FsX3NjbSwgbG9jYWxfc2Nt Ll9leGVjdXRpdmUsIGxvY2FsX3NjbS5fZmlsZXN5c3RlbSkuc2NyaXB0c19kaXJlY3RvcnkoKQog ICAgICAgICBvcy5ta2Rpcihvcy5wYXRoLmRpcm5hbWUobG9jYWxfc2NyaXB0c19kaXJlY3Rvcnkp KQogICAgICAgICBvcy5zeW1saW5rKHdlYmtpdF9zY3JpcHRzX2RpcmVjdG9yeSwgbG9jYWxfc2Ny aXB0c19kaXJlY3RvcnkpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5CmluZGV4IDFmNjAzYzUuLjhhOTgwZWQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQpAQCAtMjcyLDcg KzI3Miw4IEBAIGNsYXNzIFNWTihTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICAgICAgcmV0 dXJuICIiCiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgogICAgICAgICAgICAg Y2hhbmdlZF9maWxlcyA9IFtdCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2VsZi5zY3JpcHRf cGF0aCgic3ZuLWNyZWF0ZS1wYXRjaCIpXSArIGNoYW5nZWRfZmlsZXMsCisgICAgICAgIHNjcmlw dF9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xz IiwgIlNjcmlwdHMiLCAic3ZuLWNyZWF0ZS1wYXRjaCIpCisgICAgICAgIHJldHVybiBzZWxmLnJ1 bihbc2NyaXB0X3BhdGhdICsgY2hhbmdlZF9maWxlcywKICAgICAgICAgICAgIGN3ZD1zZWxmLmNo ZWNrb3V0X3Jvb3QsIHJldHVybl9zdGRlcnI9RmFsc2UsCiAgICAgICAgICAgICBkZWNvZGVfb3V0 cHV0PUZhbHNlKQogCg==