27970 2009-08-04 00:01:25 -0700 bugzilla-tool --commit-queue should only land commit-queue+ patches 2009-08-04 01:20:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 27918 1 abarth webkit-unassigned eric oldest_to_newest 136909 0 abarth 2009-08-04 00:01:25 -0700 I don't think the land-commit-queue command makes sense. It's more robust to drive the commit-queue from another process. When we do that, we want to only commit patches that have the commit-queue+ flag, so we should make land-patches --commit-queue do the filtering. 136910 1 abarth 2009-08-04 00:02:25 -0700 This patch requires the infrastructure from Bug 27918. 136912 2 34039 abarth 2009-08-04 00:05:30 -0700 Created attachment 34039 Patch v1 136920 3 34039 eric 2009-08-04 00:27:36 -0700 Comment on attachment 34039 Patch v1 Yay minus lines! 136931 4 abarth 2009-08-04 01:20:07 -0700 Committed revision 46751. 34039 2009-08-04 00:05:30 -0700 2009-08-04 00:27:35 -0700 Patch v1 bug-27970-20090804000529.patch text/plain 4301 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYmVhOTI2Li5mOWI5YTVhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDgt MDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBidWd6aWxsYS10b29sIC0tY29tbWl0LXF1ZXVl IHNob3VsZCBvbmx5IGxhbmQgY29tbWl0LXF1ZXVlKyBwYXRjaGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzk3MAorCisgICAgICAgIFdoZW4gd2Ug Y2FsbCBsYW5kLXBhdGNoZXMgd2l0aCAtLWNvbW1pdC1xdWV1ZSwgd2Ugc2hvdWxkIGZpbHRlciB0 aGUKKyAgICAgICAgcGF0Y2hlcyB3ZSBsYW5kIHRvIG9ubHkgdGhvc2UgdGhhdCBoYXZlIHRoZSBj b21taXQtcXVldWUrIGZsYWcgc2V0LgorICAgICAgICBUaGF0IHdheSwgd2hlbiB3ZSBjYWxsIGJ1 Z3ppbGxhLXRvb2wgZnJvbSBhIG1haW4gY29tbWl0IHF1ZXVlIHByb2Nlc3MsCisgICAgICAgIHdl IHdvbid0IGxhbmQgdGhlIHdyb25nIHBhdGNoZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3pp bGxhLXRvb2w6CisKIDIwMDktMDgtMDMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbAppbmRleCAyN2UyZWFmLi43MTc2MGU4IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10 b29sCkBAIC0zNDQsOSArMzQ0LDE0IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFu ZCk6CiAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHt9CiAgICAgICAgIHBhdGNoX2NvdW50ID0g MAogICAgICAgICBmb3IgYnVnX2lkIGluIGFyZ3M6Ci0gICAgICAgICAgICBwYXRjaGVzID0gdG9v bC5idWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQorICAgICAgICAg ICAgcGF0Y2hlcyA9IFtdCisgICAgICAgICAgICBpZiBvcHRpb25zLmNvbW1pdF9xdWV1ZToKKyAg ICAgICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX2NvbW1pdF9xdWV1ZV9wYXRj aGVzX2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAg cGF0Y2hlcyA9IHRvb2wuYnVncy5mZXRjaF9yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19p ZCkKICAgICAgICAgICAgIGlmIG5vdCBsZW4ocGF0Y2hlcyk6Ci0gICAgICAgICAgICAgICAgZXhp dCgiTm8gcmV2aWV3ZWQgcGF0Y2hlcyBmb3VuZCBvbiAlcyIgJSBidWdfaWQpCisgICAgICAgICAg ICAgICAgbG9nKCJObyByZXZpZXdlZCBwYXRjaGVzIGZvdW5kIG9uICVzLiIgJSBidWdfaWQpCisg ICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgIHBhdGNoX2NvdW50ICs9IGxlbihw YXRjaGVzKQogICAgICAgICAgICAgYnVnc190b19wYXRjaGVzW2J1Z19pZF0gPSBwYXRjaGVzCiAK QEAgLTM1NCw0MSArMzU5LDkgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToK IAogICAgICAgICBzZWxmLnNldHVwX2Zvcl9sYW5kaW5nKHRvb2wuc2NtKCksIG9wdGlvbnMpCiAK LSAgICAgICAgZm9yIGJ1Z19pZCBpbiBhcmdzOgorICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3Nf dG9fcGF0Y2hlcy5rZXlzKCk6CiAgICAgICAgICAgICBzZWxmLmxhbmRfcGF0Y2hlcyhidWdfaWQs IGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdLCBvcHRpb25zLCB0b29sKQogCi1jbGFzcyBMYW5kUGF0 Y2hlc0Zyb21Db21taXRRdWV1ZShDb21tYW5kKToKLSAgICBkZWYgX19pbml0X18oc2VsZik6Ci0g ICAgICAgIG9wdGlvbnMgPSBbCi0gICAgICAgICAgICBtYWtlX29wdGlvbigiLS1mb3JjZS1jbGVh biIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImZvcmNlX2NsZWFuIiwgZGVmYXVsdD1GYWxz ZSwgaGVscD0iQ2xlYW4gd29ya2luZyBkaXJlY3RvcnkgYmVmb3JlIGFwcGx5aW5nIHBhdGNoZXMg KHJlbW92ZXMgbG9jYWwgY2hhbmdlcyBhbmQgY29tbWl0cykiKSwKLSAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLW5vLWNsZWFuIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsZWFuIiwg ZGVmYXVsdD1UcnVlLCBoZWxwPSJEb24ndCBjaGVjayBpZiB0aGUgd29ya2luZyBkaXJlY3Rvcnkg aXMgY2xlYW4gYmVmb3JlIGFwcGx5aW5nIHBhdGNoZXMiKSwKLSAgICAgICAgICAgIG1ha2Vfb3B0 aW9uKCItLW5vLWNsb3NlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsb3NlX2J1ZyIs IGRlZmF1bHQ9VHJ1ZSwgaGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0ZXIgbGFuZGluZy4iKSwKLSAg ICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLWJ1aWxkIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIs IGRlc3Q9ImJ1aWxkIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91dCBidWlsZGlu ZyBmaXJzdCwgaW1wbGllcyAtLW5vLXRlc3QuIiksCi0gICAgICAgICAgICBtYWtlX29wdGlvbigi LS1uby10ZXN0IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRy dWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IHJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cy4iKSwKLSAg ICAgICAgXQotICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hl cyBvbiBhIGJ1ZyBvcHRpb25hbGx5IHRlc3RpbmcgdGhlbSBmaXJzdCcsICdCVUdJRCcsIG9wdGlv bnM9b3B0aW9ucykKLQotICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wp OgotICAgICAgICAjIERlZmF1bHQgdG8gY29tbWl0X3F1ZXVlIG1vZGUuCi0gICAgICAgIG9wdGlv bnMuY29tbWl0X3F1ZXVlID0gVHJ1ZQotCi0gICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHt9Ci0g ICAgICAgIHBhdGNoX2NvdW50ID0gMAotICAgICAgICBidWdzID0gdG9vbC5idWdzLmZldGNoX2J1 Z19pZHNfZnJvbV9jb21taXRfcXVldWUoKQotICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3M6Ci0g ICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX2NvbW1pdF9xdWV1ZV9wYXRjaGVz X2Zyb21fYnVnKGJ1Z19pZCkKLSAgICAgICAgICAgIGlmIG5vdCBsZW4ocGF0Y2hlcyk6Ci0gICAg ICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgIHBhdGNoX2NvdW50ICs9IGxlbihwYXRj aGVzKQotICAgICAgICAgICAgYnVnc190b19wYXRjaGVzW2J1Z19pZF0gPSBwYXRjaGVzCi0KLSAg ICAgICAgbG9nKCJMYW5kaW5nICVzIGZyb20gJXMuIiAlIChwbHVyYWxpemUoInBhdGNoIiwgcGF0 Y2hfY291bnQpLCBwbHVyYWxpemUoImJ1ZyIsIGxlbihidWdzKSkpKQotCi0gICAgICAgIExhbmRQ YXRjaGVzRnJvbUJ1Z3Muc2V0dXBfZm9yX2xhbmRpbmcodG9vbC5zY20oKSwgb3B0aW9ucykKLQot ICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3M6Ci0gICAgICAgICAgICBMYW5kUGF0Y2hlc0Zyb21C dWdzLmxhbmRfcGF0Y2hlcyhidWdfaWQsIGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdLCBvcHRpb25z LCB0b29sKQotCiAKIGNsYXNzIENvbW1pdE1lc3NhZ2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToK ICAgICBkZWYgX19pbml0X18oc2VsZik6CkBAIC01ODEsNyArNTU0LDYgQEAgY2xhc3MgQnVnemls bGFUb29sOgogICAgICAgICBzZWxmLmNhY2hlZF9zY20gPSBOb25lCiAgICAgICAgIHNlbGYuYnVn cyA9IEJ1Z3ppbGxhKCkKICAgICAgICAgc2VsZi5jb21tYW5kcyA9IFsKLSAgICAgICAgICAgIHsg J25hbWUnIDogJ2xhbmQtY29tbWl0LXF1ZXVlJywgJ29iamVjdCcgOiBMYW5kUGF0Y2hlc0Zyb21D b21taXRRdWV1ZSgpIH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdidWdzLXRvLWNvbW1pdCcs ICdvYmplY3QnIDogQnVnc0luQ29tbWl0UXVldWUoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScg OiAncGF0Y2hlcy10by1jb21taXQnLCAnb2JqZWN0JyA6IFBhdGNoZXNJbkNvbW1pdFF1ZXVlKCkg fSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ3Jldmlld2VkLXBhdGNoZXMnLCAnb2JqZWN0JyA6 IFJldmlld2VkUGF0Y2hlc09uQnVnKCkgfSw=