42984 2010-07-26 11:24:37 -0700 webkit-patch post-commits is broken: AttributeError: Values instance has no attribute 'no_squash' 2010-07-27 13:24:00 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned abarth eric ojan oldest_to_newest 256127 0 ddkilzer 2010-07-26 11:24:37 -0700 $ ./WebKitTools/Scripts/webkit-patch post-commits -m "Patch v1" HEAD Traceback (most recent call last): File "./WebKitTools/Scripts/webkit-patch", line 64, in <module> main() File "./WebKitTools/Scripts/webkit-patch", line 59, in main WebKitPatch(__file__).main() File "/Volumes/Data/WebKit.git/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 308, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/WebKit.git/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py", line 117, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/WebKit.git/WebKitTools/Scripts/webkitpy/tool/commands/upload.py", line 288, in execute steps.ObsoletePatches(tool, options).run(state) File "/Volumes/Data/WebKit.git/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py", line 38, in __init__ if options.no_squash: AttributeError: Values instance has no attribute 'no_squash' Note that "upload" keeps opening an editor for a patch that already has a ChangeLog, which is not what I want either: ./WebKitTools/Scripts/webkit-patch upload -m "Patch v1" -g HEAD 256165 1 eric 2010-07-26 12:29:00 -0700 Looks like this needs a test case. :) Ojan is our master of --no-squash... 256772 2 62731 ojan 2010-07-27 13:00:13 -0700 Created attachment 62731 Patch 256777 3 62731 eric 2010-07-27 13:13:41 -0700 Comment on attachment 62731 Patch How does this change PostCommits? 256785 4 ojan 2010-07-27 13:20:50 -0700 This issue was that post-commits used an object that inherited from AbstractStep, which would check the values of these options without using the options in the AbstractStep itself. I think there's an architectural issue in the code here, but I'm not sure it's worth fixing now. 256788 5 ojan 2010-07-27 13:24:00 -0700 Committed r64153: <http://trac.webkit.org/changeset/64153> 62731 2010-07-27 13:00:13 -0700 2010-07-27 13:13:40 -0700 Patch bug-42984-20100727130012.patch text/plain 4641 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1YTZjOWRkZjgzYmNiZDI5YThmMjQ2NzA0MmFmOTcyMjM5NGYwN2Q2Li45NmZjNDJl MGJjNWZhNzg3MzRlMDEyZDIyZmNjODJhZTU3NzAxZDg4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDctMjcgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2ggcG9zdC1j b21taXRzIGlzIGJyb2tlbjogQXR0cmlidXRlRXJyb3I6IFZhbHVlcyBpbnN0YW5jZSBoYXMgbm8g YXR0cmlidXRlICdub19zcXVhc2gnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00Mjk4NAorCisgICAgICAgIHNxdWFzaCBhbmQgbm9fc3F1YXNoIGhhdmUg YmVlbiBpbnRlbnRpb25hbGx5IGVycm9yaW5nIGZvciBhIGNvdXBsZSB3ZWVrcyBub3cuCisgICAg ICAgIEJ1dCBwb3N0LWNvbW1pdHMgd2FzIGp1c3QgYnJva2VuLiBKdXN0IHJlbW92ZSBzcXVhc2gv bm9fc3F1YXNoLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3Ry YWN0c3RlcC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvb3B0aW9u cy5weToKKwogMjAxMC0wNy0yNyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAg ICAgICAgTWFjIGJ1aWxkIGZpeApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKaW5kZXggOGYwZDE1M2Q5Y2ZjMDQyNDUx YTA5OWM1MzQ5NTMwYjAyOTBiNzI2Yy4uOWNlYjJjYmQwZDEyZjEyNjg1ZjJkZjU0ZmVmZTAyM2E4 MjBhNTcwMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL2Fic3RyYWN0c3RlcC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5CkBAIC0zNSwxMCArMzUsNiBAQCBmcm9tIHdlYmtpdHB5 LnRvb2wuc3RlcHMub3B0aW9ucyBpbXBvcnQgT3B0aW9ucwogY2xhc3MgQWJzdHJhY3RTdGVwKG9i amVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHRvb2wsIG9wdGlvbnMpOgogICAgICAgICBz ZWxmLl90b29sID0gdG9vbAotICAgICAgICBpZiBvcHRpb25zLm5vX3NxdWFzaDoKLSAgICAgICAg ICAgIHJhaXNlIFNjcmlwdEVycm9yKCctLW5vLXNxdWFzaCBoYXMgYmVlbiByZW1vdmVkLiBVc2Ug Ii0tZ2l0LWNvbW1pdD1IRUFELi4iIG9yICItZyBIRUFELi4iIHRvIG9wZXJhdGUgb24gdGhlIHdv cmtpbmcgY29weS4nKQotICAgICAgICBpZiBvcHRpb25zLnNxdWFzaDoKLSAgICAgICAgICAgIHJh aXNlIFNjcmlwdEVycm9yKCctLXNxdWFzaCBoYXMgYmVlbiByZW1vdmVkLiBJdCBpcyBub3cgdGhl IGRlZmF1bHQgYmVoYXZpb3IgaWYgLS1naXQtY29tbWl0IGlzIG9taXR0ZWQuJykKICAgICAgICAg c2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fcG9ydCA9IE5vbmUKIApAQCAt NzYsOSArNzIsNiBAQCBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAgcmV0dXJu IFsKICAgICAgICAgICAgICMgV2UgbmVlZCB0aGlzIG9wdGlvbiBoZXJlIGJlY2F1c2UgY2FjaGVk X2xvb2t1cCB1c2VzIGl0LiAgOigKICAgICAgICAgICAgIE9wdGlvbnMuZ2l0X2NvbW1pdCwKLSAg ICAgICAgICAgICMgRklYTUU6IEdldCByaWQgb2YgdGhlc2UuCi0gICAgICAgICAgICBPcHRpb25z Lm5vX3NxdWFzaCwKLSAgICAgICAgICAgIE9wdGlvbnMuc3F1YXNoLAogICAgICAgICBdCiAKICAg ICBkZWYgcnVuKHNlbGYsIHN0YXRlKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkKaW5kZXggOWM3M2Y1YTY1N2FlYjljNzQxNGIxNmFl YmJiNTc3MTY4NDE0ZGMxZi4uZTdlMzg1NWZmNmU1YjM2OWUxZWExMGY5ZjViZGQwMzNiNDgzMDdk YiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29w dGlvbnMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29w dGlvbnMucHkKQEAgLTQ2LDggKzQ2LDYgQEAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgIGdp dF9jb21taXQgPSBtYWtlX29wdGlvbigiLWciLCAiLS1naXQtY29tbWl0IiwgYWN0aW9uPSJzdG9y ZSIsIGRlc3Q9ImdpdF9jb21taXQiLCBoZWxwPSJPcGVyYXRlIG9uIGEgbG9jYWwgY29tbWl0LiBJ ZiBhIHJhbmdlLCB0aGUgY29tbWl0cyBhcmUgc3F1YXNoZWQgaW50byBvbmUuIEhFQUQuLiBvcGVy YXRlcyBvbiB3b3JraW5nIGNvcHkgY2hhbmdlcyBvbmx5LiIpCiAgICAgbG9jYWxfY29tbWl0ID0g bWFrZV9vcHRpb24oIi0tbG9jYWwtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0i bG9jYWxfY29tbWl0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iTWFrZSBhIGxvY2FsIGNvbW1pdCBm b3IgZWFjaCBhcHBsaWVkIHBhdGNoIikKICAgICBub25faW50ZXJhY3RpdmUgPSBtYWtlX29wdGlv bigiLS1ub24taW50ZXJhY3RpdmUiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJub25faW50 ZXJhY3RpdmUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJOZXZlciBwcm9tcHQgdGhlIHVzZXIsIGZh aWwgYXMgZmFzdCBhcyBwb3NzaWJsZS4iKQotICAgICMgRklYTUU6IFJlbW92ZSAtLW5vLXNxdWFz aCwgb25jZSBwZW9wbGUgaGF2ZSBhZGp1c3RlZCB0byB1c2luZyAtLWdpdC1jb21taXQuCi0gICAg bm9fc3F1YXNoID0gbWFrZV9vcHRpb24oIi0tbm8tc3F1YXNoIiwgYWN0aW9uPSJzdG9yZV90cnVl IiwgZGVzdD0ibm9fc3F1YXNoIiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iT2Jzb2xldGUuIFVzZSAt LWdpdC1jb21taXQ9SEVBRC4uIGluc3RlYWQuIikKICAgICBvYnNvbGV0ZV9wYXRjaGVzID0gbWFr ZV9vcHRpb24oIi0tbm8tb2Jzb2xldGUiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0ib2Jz b2xldGVfcGF0Y2hlcyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG9ic29sZXRlIG9sZCBw YXRjaGVzIGJlZm9yZSBwb3N0aW5nIHRoaXMgb25lLiIpCiAgICAgb3Blbl9idWcgPSBtYWtlX29w dGlvbigiLS1vcGVuLWJ1ZyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9Im9wZW5fYnVnIiwg ZGVmYXVsdD1GYWxzZSwgaGVscD0iT3BlbnMgdGhlIGFzc29jaWF0ZWQgYnVnIGluIGEgYnJvd3Nl ci4iKQogICAgIHBhcmVudF9jb21tYW5kID0gbWFrZV9vcHRpb24oIi0tcGFyZW50LWNvbW1hbmQi LCBhY3Rpb249InN0b3JlIiwgZGVzdD0icGFyZW50X2NvbW1hbmQiLCBkZWZhdWx0PU5vbmUsIGhl bHA9IihJbnRlcm5hbCkgVGhlIGNvbW1hbmQgdGhhdCBzcGF3bmVkIHRoaXMgaW5zdGFuY2UuIikK QEAgLTU2LDcgKzU0LDUgQEAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgIHJlcXVlc3RfY29t bWl0ID0gbWFrZV9vcHRpb24oIi0tcmVxdWVzdC1jb21taXQiLCBhY3Rpb249InN0b3JlX3RydWUi LCBkZXN0PSJyZXF1ZXN0X2NvbW1pdCIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9Ik1hcmsgdGhlIHBh dGNoIGFzIG5lZWRpbmcgYXV0by1jb21taXQgYWZ0ZXIgcmV2aWV3LiIpCiAgICAgcmV2aWV3ID0g bWFrZV9vcHRpb24oIi0tbm8tcmV2aWV3IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InJl dmlldyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG1hcmsgdGhlIHBhdGNoIGZvciByZXZp ZXcuIikKICAgICByZXZpZXdlciA9IG1ha2Vfb3B0aW9uKCItciIsICItLXJldmlld2VyIiwgYWN0 aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9InJldmlld2VyIiwgaGVscD0iVXBkYXRl IENoYW5nZUxvZ3MgdG8gc2F5IFJldmlld2VkIGJ5IFJFVklFV0VSLiIpCi0gICAgIyBGSVhNRTog UmVtb3ZlIC0tc3F1YXNoLCBvbmNlIHBlb3BsZSBoYXZlIGFkanVzdGVkIHRvIHVzaW5nIC0tZ2l0 LWNvbW1pdC4KLSAgICBzcXVhc2ggPSBtYWtlX29wdGlvbigiLXMiLCAiLS1zcXVhc2giLCBhY3Rp b249InN0b3JlX3RydWUiLCBkZXN0PSJzcXVhc2giLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJPYnNv bGV0ZS4gVGhpcyBpcyBub3cgdGhlIGRlZmF1bHQgYmVoYXZpb3IuIikKICAgICB0ZXN0ID0gbWFr ZV9vcHRpb24oIi0tdGVzdCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InRlc3QiLCBkZWZh dWx0PUZhbHNlLCBoZWxwPSJSdW4gcnVuLXdlYmtpdC10ZXN0cyBiZWZvcmUgY29tbWl0dGluZy4i KQogICAgIHVwZGF0ZSA9IG1ha2Vfb3B0aW9uKCItLW5vLXVwZGF0ZSIsIGFjdGlvbj0ic3RvcmVf ZmFsc2UiLCBkZXN0PSJ1cGRhdGUiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRvbid0IHVwZGF0ZSB0 aGUgd29ya2luZyBkaXJlY3RvcnkuIikK