31546 2009-11-16 04:44:45 -0800 bugzilla-tool needs a land-attachment command 2009-11-16 14:49:04 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 31548 1 eric webkit-unassigned abarth ddkilzer levin oldest_to_newest 163947 0 eric 2009-11-16 04:44:45 -0800 bugzilla-tool needs a land-attachment command The commit-queue (and some users) really want to be able to land just one attachment off of a bug, instead of all of them at once. Also, land-attachment allows you to land patches which are obsolete, or never got an r+, etc. 163948 1 43294 eric 2009-11-16 04:48:24 -0800 Created attachment 43294 Patch 163951 2 43296 eric 2009-11-16 04:54:29 -0800 Created attachment 43296 Fixored 163952 3 43297 eric 2009-11-16 04:57:13 -0800 Created attachment 43297 Fix the help strings 163954 4 43297 abarth 2009-11-16 05:04:26 -0800 Comment on attachment 43297 Fix the help strings As we discussed, we want to maintain the order of attachements given on the command line. 163956 5 43298 eric 2009-11-16 05:16:21 -0800 Created attachment 43298 Maintain argument order when landing 163958 6 43298 abarth 2009-11-16 05:18:42 -0800 Comment on attachment 43298 Maintain argument order when landing This seems fine now 163959 7 eric 2009-11-16 05:25:31 -0800 Committed r51033: <http://trac.webkit.org/changeset/51033> 163981 8 ddkilzer 2009-11-16 06:40:36 -0800 (In reply to comment #7) > Committed r51033: <http://trac.webkit.org/changeset/51033> The commit-queue merged the ChangeLog entry in the "middle" of the file instead of at the beginning. Do we have a bug for this? 164094 9 eric 2009-11-16 14:49:04 -0800 Actually, this is bugzilla-tool, and caused by land-diff, not the commit-queue. The commit-queue uses land-patches (and as of this bug, land-attachment), but we've not seen that produce the wrong ChangeLog in a very long time. Since the commit log has been off this weekend, Adam and I have been using land-diff again, and it looks like land-diff is in fact the culprit. I"ll update bug 28092. 43294 2009-11-16 04:48:24 -0800 2009-11-16 04:54:18 -0800 Patch bug-31546-20091116044823.patch text/plain 4968 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjOTU0NDJlLi4wYjE0M2Y1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgbmVlZHMgYSBsYW5kLWF0 dGFjaG1lbnQgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzE1NDYKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAg ICAgIC0gTW92ZSBhbGwgdGhlIGxvZ2ljIGludG8gQWJzdHJhY3RMYW5kaW5nQ29tbWFuZCBhbmQK KyAgICAgICAgICAgYWRkIGEgbmV3IExhbmRBdHRhY2htZW50IGNvbW1hbmQgc3ViY2xhc3MuCisg ICAgICAgICAtIFNwbGl0IG91dCBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyBsb2dnaW5nIGZyb20g X2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kLgorCisyMDA5LTExLTE2ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgog CiAgICAgICAgIE1vdmUgbW9yZSBwYXRjaC1sYW5kaW5nIGNvZGUgaW50byBXZWJLaXRMYW5kaW5n U2NyaXB0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbGFuZC1hdHRhY2htZW50CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wKaW5kZXggMDBjNzNiMC4uZmUxYjhlYSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbApAQCAtNDA5LDQ1ICs0MDksNjUgQEAgY2xhc3MgTGFuZEFuZFVwZGF0ZUJ1ZyhDb21t YW5kKToKICAgICAgICAgICAgIGxvZygiTm8gYnVnIGlkIHByb3ZpZGVkLiIpCiAKIAotY2xhc3Mg TGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKLSAgICBkZWYgX19pbml0X18oc2VsZik6Citj bGFzcyBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQoQ29tbWFuZCk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIGRlc2NyaXB0aW9uLCBhcmdzX2Rlc2NyaXB0aW9uKToKICAgICAgICAgb3B0aW9u cyA9IFdlYktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlvbnMoKQogICAgICAgICBvcHRp b25zICs9IFdlYktpdExhbmRpbmdTY3JpcHRzLmxhbmRfb3B0aW9ucygpCi0gICAgICAgIENvbW1h bmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIGFsbCBwYXRjaGVzIG9uIGEgYnVnIG9wdGlvbmFsbHkg dGVzdGluZyB0aGVtIGZpcnN0JywgJ0JVR0lEJywgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBD b21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hlcyBvbiB0aGUgZ2l2ZW4gYnVn cywgb3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0JywgJ0JVR0lEIFtC VUdJRFNdJywgb3B0aW9ucz1vcHRpb25zKQogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBf ZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAg ICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHt9Ci0gICAgICAgIHBhdGNoX2NvdW50ID0gMAotICAgICAg ICBmb3IgYnVnX2lkIGluIGFyZ3M6Ci0gICAgICAgICAgICBwYXRjaGVzID0gW10KLSAgICAgICAg ICAgIGlmIG9wdGlvbnMuY29tbWl0X3F1ZXVlOgotICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0 b29sLmJ1Z3MuZmV0Y2hfY29tbWl0X3F1ZXVlX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkLCByZWpl Y3RfaW52YWxpZF9wYXRjaGVzPVRydWUpCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAg ICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hfcmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1Zyhi dWdfaWQpCi0KLSAgICAgICAgICAgIHBhdGNoZXNfZm91bmQgPSBsZW4ocGF0Y2hlcykKLSAgICAg ICAgICAgIGxvZygiJXMgZm91bmQgb24gYnVnICVzLiIgJSAocGx1cmFsaXplKCJyZXZpZXdlZCBw YXRjaCIsIHBhdGNoZXNfZm91bmQpLCBidWdfaWQpKQotCi0gICAgICAgICAgICBwYXRjaF9jb3Vu dCArPSBwYXRjaGVzX2ZvdW5kCi0gICAgICAgICAgICBpZiBwYXRjaGVzX2ZvdW5kOgotICAgICAg ICAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdID0gcGF0Y2hlcworICAgICAgICByYWlz ZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAotICAg ICAgICBsb2coIkxhbmRpbmcgJXMgZnJvbSAlcy4iICUgKHBsdXJhbGl6ZSgicGF0Y2giLCBwYXRj aF9jb3VudCksIHBsdXJhbGl6ZSgiYnVnIiwgbGVuKGFyZ3MpKSkpCisgICAgQHN0YXRpY21ldGhv ZAorICAgIGRlZiBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyhwYXRjaGVzKToKKyAgICAgICAgYnVn c190b19wYXRjaGVzID0ge30KKyAgICAgICAgZm9yIHBhdGNoIGluIHBhdGNoZXM6CisgICAgICAg ICAgICBidWdzX3RvX3BhdGNoZXNbYnVnX2lkXSA9IGJ1Z3NfdG9fcGF0Y2hlcy5nZXQoYnVnX2lk LCBbXSkuYXBwZW5kKHBhdGNoKQogICAgICAgICByZXR1cm4gYnVnc190b19wYXRjaGVzCiAKICAg ICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgaWYgbm90 IGxlbihhcmdzKToKLSAgICAgICAgICAgIGVycm9yKCJidWctaWQocykgcmVxdWlyZWQiKQorICAg ICAgICBpZiBub3QgYXJnczoKKyAgICAgICAgICAgIGVycm9yKCIlcyByZXF1aXJlZCIgJSBzZWxm LmFyZ3VtZW50X25hbWVzKQogCiAgICAgICAgICMgQ2hlY2sgdGhlIHRyZWUgc3RhdHVzIGZpcnN0 IHNvIHdlIGNhbiBmYWlsIGVhcmx5LgogICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5lbnN1 cmVfYnVpbGRlcnNfYXJlX2dyZWVuKHRvb2wuYnVpbGRib3QsIG9wdGlvbnMpCi0gICAgICAgIGJ1 Z3NfdG9fcGF0Y2hlcyA9IHNlbGYuX2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlv bnMsIGFyZ3MsIHRvb2wpCisgICAgICAgIHBhdGNoZXMgPSBzZWxmLl9mZXRjaF9saXN0X29mX3Bh dGNoZXNfdG9fbGFuZChvcHRpb25zLCBhcmdzLCB0b29sKQorICAgICAgICBidWdzX3RvX3BhdGNo ZXMgPSBzZWxmLl9jb2xsZWN0X3BhdGNoZXNfYnlfYnVnKHBhdGNoZXMpCisgICAgICAgIGxvZygi TGFuZGluZyAlcyBmcm9tICVzLiIgJSAocGx1cmFsaXplKCJwYXRjaCIsIHBhdGNoZXMpLCBwbHVy YWxpemUoImJ1ZyIsIGxlbihidWdzX3RvX3BhdGNoZXMpKSkpCiAKICAgICAgICAgV2ViS2l0TGFu ZGluZ1NjcmlwdHMucHJlcGFyZV9jbGVhbl93b3JraW5nX2RpcmVjdG9yeSh0b29sLnNjbSgpLCBv cHRpb25zKQogICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3NfdG9fcGF0Y2hlcy5rZXlzKCk6CiAg ICAgICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5sYW5kX3BhdGNoZXMoYnVnc190b19wYXRj aGVzW2J1Z19pZF0sIG9wdGlvbnMsIHRvb2wpCiAKK2NsYXNzIExhbmRBdHRhY2htZW50KEFic3Ry YWN0UGF0Y2hMYW5kaW5nQ29tbWFuZCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAg ICBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIGEgcGF0 Y2hlcyBmcm9tIGJ1Z3ppbGxhLCBvcHRpb25hbGx5IGJ1aWxkaW5nIGFuZCB0ZXN0aW5nIHRoZW0g Zmlyc3QnLCAnQVRUQUNITUVOVF9JRCBbQVRUQUNITUVOVF9JRFNdJykKKworICAgIEBzdGF0aWNt ZXRob2QKKyAgICBkZWYgX2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlvbnMsIGFy Z3MsIHRvb2wpOgorICAgICAgICByZXR1cm4gbWFwKGxhbWJkYSBwYXRjaF9pZDogdG9vbC5idWdz LmZldGNoX2F0dGFjaG1lbnQocGF0Y2hfaWQpLCBhcmdzKQorCisKK2NsYXNzIExhbmRQYXRjaGVz RnJvbUJ1Z3MoQWJzdHJhY3RQYXRjaExhbmRpbmdDb21tYW5kKToKKyAgICBkZWYgX19pbml0X18o c2VsZik6CisgICAgICAgIEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZC5fX2luaXRfXyhzZWxm LCAnTGFuZHMgYWxsIHBhdGNoZXMgb24gdGhlIGdpdmVuIGJ1Z3MsIG9wdGlvbmFsbHkgYnVpbGRp bmcgYW5kIHRlc3RpbmcgdGhlbSBmaXJzdCcsICdCVUdJRCBbQlVHSURTXScpCisKKyAgICBAc3Rh dGljbWV0aG9kCisgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFuZChvcHRpb25z LCBhcmdzLCB0b29sKToKKyAgICAgICAgYWxsX3BhdGNoZXMgPSBbXQorICAgICAgICBmb3IgYnVn X2lkIGluIGFyZ3M6CisgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIHN0cmFuZ2UgdGhhdCAt LWNvbW1pdC1xdWV1ZSBnZXRzIHNwZWNpYWwgYmVoYXZpb3IgaGVyZS4KKyAgICAgICAgICAgIGlm IG9wdGlvbnMuY29tbWl0X3F1ZXVlOgorICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0b29sLmJ1 Z3MuZmV0Y2hfY29tbWl0X3F1ZXVlX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkLCByZWplY3RfaW52 YWxpZF9wYXRjaGVzPVRydWUpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHBh dGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hfcmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhidWdfaWQp CisKKyAgICAgICAgICAgIGxvZygiJXMgZm91bmQgb24gYnVnICVzLiIgJSAocGx1cmFsaXplKCJy ZXZpZXdlZCBwYXRjaCIsIGxlbihwYXRjaGVzKSksIGJ1Z19pZCkpCisgICAgICAgICAgICBhbGxf cGF0Y2hlcyArPSBwYXRjaGVzCisKKyAgICAgICAgcmV0dXJuIGFsbF9wYXRjaGVzCisKIAogY2xh c3MgQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKENvbW1hbmQpOgogICAgIGRlZiBfX2luaXRf XyhzZWxmKToK 43296 2009-11-16 04:54:29 -0800 2009-11-16 04:57:00 -0800 Fixored bug-31546-20091116045427.patch text/plain 5576 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjOTU0NDJlLi4wYjE0M2Y1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgbmVlZHMgYSBsYW5kLWF0 dGFjaG1lbnQgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzE1NDYKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAg ICAgIC0gTW92ZSBhbGwgdGhlIGxvZ2ljIGludG8gQWJzdHJhY3RMYW5kaW5nQ29tbWFuZCBhbmQK KyAgICAgICAgICAgYWRkIGEgbmV3IExhbmRBdHRhY2htZW50IGNvbW1hbmQgc3ViY2xhc3MuCisg ICAgICAgICAtIFNwbGl0IG91dCBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyBsb2dnaW5nIGZyb20g X2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kLgorCisyMDA5LTExLTE2ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgog CiAgICAgICAgIE1vdmUgbW9yZSBwYXRjaC1sYW5kaW5nIGNvZGUgaW50byBXZWJLaXRMYW5kaW5n U2NyaXB0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbGFuZC1hdHRhY2htZW50CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wKaW5kZXggMDBjNzNiMC4uOTBlYzBhZiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbApAQCAtNDA5LDQ1ICs0MDksNjYgQEAgY2xhc3MgTGFuZEFuZFVwZGF0ZUJ1ZyhDb21t YW5kKToKICAgICAgICAgICAgIGxvZygiTm8gYnVnIGlkIHByb3ZpZGVkLiIpCiAKIAotY2xhc3Mg TGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKLSAgICBkZWYgX19pbml0X18oc2VsZik6Citj bGFzcyBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQoQ29tbWFuZCk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIGRlc2NyaXB0aW9uLCBhcmdzX2Rlc2NyaXB0aW9uKToKICAgICAgICAgb3B0aW9u cyA9IFdlYktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlvbnMoKQogICAgICAgICBvcHRp b25zICs9IFdlYktpdExhbmRpbmdTY3JpcHRzLmxhbmRfb3B0aW9ucygpCi0gICAgICAgIENvbW1h bmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIGFsbCBwYXRjaGVzIG9uIGEgYnVnIG9wdGlvbmFsbHkg dGVzdGluZyB0aGVtIGZpcnN0JywgJ0JVR0lEJywgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBD b21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hlcyBvbiB0aGUgZ2l2ZW4gYnVn cywgb3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0JywgJ0JVR0lEIFtC VUdJRFNdJywgb3B0aW9ucz1vcHRpb25zKQogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBf ZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAg ICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHt9Ci0gICAgICAgIHBhdGNoX2NvdW50ID0gMAotICAgICAg ICBmb3IgYnVnX2lkIGluIGFyZ3M6Ci0gICAgICAgICAgICBwYXRjaGVzID0gW10KLSAgICAgICAg ICAgIGlmIG9wdGlvbnMuY29tbWl0X3F1ZXVlOgotICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0 b29sLmJ1Z3MuZmV0Y2hfY29tbWl0X3F1ZXVlX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkLCByZWpl Y3RfaW52YWxpZF9wYXRjaGVzPVRydWUpCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAg ICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hfcmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1Zyhi dWdfaWQpCi0KLSAgICAgICAgICAgIHBhdGNoZXNfZm91bmQgPSBsZW4ocGF0Y2hlcykKLSAgICAg ICAgICAgIGxvZygiJXMgZm91bmQgb24gYnVnICVzLiIgJSAocGx1cmFsaXplKCJyZXZpZXdlZCBw YXRjaCIsIHBhdGNoZXNfZm91bmQpLCBidWdfaWQpKQotCi0gICAgICAgICAgICBwYXRjaF9jb3Vu dCArPSBwYXRjaGVzX2ZvdW5kCi0gICAgICAgICAgICBpZiBwYXRjaGVzX2ZvdW5kOgotICAgICAg ICAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdID0gcGF0Y2hlcworICAgICAgICByYWlz ZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIKIAotICAg ICAgICBsb2coIkxhbmRpbmcgJXMgZnJvbSAlcy4iICUgKHBsdXJhbGl6ZSgicGF0Y2giLCBwYXRj aF9jb3VudCksIHBsdXJhbGl6ZSgiYnVnIiwgbGVuKGFyZ3MpKSkpCisgICAgQHN0YXRpY21ldGhv ZAorICAgIGRlZiBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyhwYXRjaGVzKToKKyAgICAgICAgYnVn c190b19wYXRjaGVzID0ge30KKyAgICAgICAgZm9yIHBhdGNoIGluIHBhdGNoZXM6CisgICAgICAg ICAgICBidWdfaWQgPSBwYXRjaFsnYnVnX2lkJ10KKyAgICAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hl c1tidWdfaWRdID0gYnVnc190b19wYXRjaGVzLmdldChidWdfaWQsIFtdKS5hcHBlbmQocGF0Y2gp CiAgICAgICAgIHJldHVybiBidWdzX3RvX3BhdGNoZXMKIAogICAgIGRlZiBleGVjdXRlKHNlbGYs IG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAgICAgICBpZiBub3QgbGVuKGFyZ3MpOgotICAgICAg ICAgICAgZXJyb3IoImJ1Zy1pZChzKSByZXF1aXJlZCIpCisgICAgICAgIGlmIG5vdCBhcmdzOgor ICAgICAgICAgICAgZXJyb3IoIiVzIHJlcXVpcmVkIiAlIHNlbGYuYXJndW1lbnRfbmFtZXMpCiAK ICAgICAgICAgIyBDaGVjayB0aGUgdHJlZSBzdGF0dXMgZmlyc3Qgc28gd2UgY2FuIGZhaWwgZWFy bHkuCiAgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLmVuc3VyZV9idWlsZGVyc19hcmVfZ3Jl ZW4odG9vbC5idWlsZGJvdCwgb3B0aW9ucykKLSAgICAgICAgYnVnc190b19wYXRjaGVzID0gc2Vs Zi5fZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywgdG9vbCkKKyAg ICAgICAgcGF0Y2hlcyA9IHNlbGYuX2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlv bnMsIGFyZ3MsIHRvb2wpCisgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHNlbGYuX2NvbGxlY3Rf cGF0Y2hlc19ieV9idWcocGF0Y2hlcykKKyAgICAgICAgbG9nKCJMYW5kaW5nICVzIGZyb20gJXMu IiAlIChwbHVyYWxpemUoInBhdGNoIiwgbGVuKHBhdGNoZXMpKSwgcGx1cmFsaXplKCJidWciLCBs ZW4oYnVnc190b19wYXRjaGVzKSkpKQogCiAgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnBy ZXBhcmVfY2xlYW5fd29ya2luZ19kaXJlY3RvcnkodG9vbC5zY20oKSwgb3B0aW9ucykKICAgICAg ICAgZm9yIGJ1Z19pZCBpbiBidWdzX3RvX3BhdGNoZXMua2V5cygpOgogICAgICAgICAgICAgV2Vi S2l0TGFuZGluZ1NjcmlwdHMubGFuZF9wYXRjaGVzKGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdLCBv cHRpb25zLCB0b29sKQogCitjbGFzcyBMYW5kQXR0YWNobWVudChBYnN0cmFjdFBhdGNoTGFuZGlu Z0NvbW1hbmQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgQWJzdHJhY3RQYXRj aExhbmRpbmdDb21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhIHBhdGNoZXMgZnJvbSBidWd6 aWxsYSwgb3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0JywgJ0FUVEFD SE1FTlRfSUQgW0FUVEFDSE1FTlRfSURTXScpCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVm IF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFuZChvcHRpb25zLCBhcmdzLCB0b29sKToKKyAg ICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGF0Y2hfaWQ6IHRvb2wuYnVncy5mZXRjaF9hdHRhY2ht ZW50KHBhdGNoX2lkKSwgYXJncykKKworCitjbGFzcyBMYW5kUGF0Y2hlc0Zyb21CdWdzKEFic3Ry YWN0UGF0Y2hMYW5kaW5nQ29tbWFuZCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAg ICBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIGFsbCBw YXRjaGVzIG9uIHRoZSBnaXZlbiBidWdzLCBvcHRpb25hbGx5IGJ1aWxkaW5nIGFuZCB0ZXN0aW5n IHRoZW0gZmlyc3QnLCAnQlVHSUQgW0JVR0lEU10nKQorCisgICAgQHN0YXRpY21ldGhvZAorICAg IGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywgdG9vbCk6 CisgICAgICAgIGFsbF9wYXRjaGVzID0gW10KKyAgICAgICAgZm9yIGJ1Z19pZCBpbiBhcmdzOgor ICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBzdHJhbmdlIHRoYXQgLS1jb21taXQtcXVldWUg Z2V0cyBzcGVjaWFsIGJlaGF2aW9yIGhlcmUuCisgICAgICAgICAgICBpZiBvcHRpb25zLmNvbW1p dF9xdWV1ZToKKyAgICAgICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX2NvbW1p dF9xdWV1ZV9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCwgcmVqZWN0X2ludmFsaWRfcGF0Y2hlcz1U cnVlKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5i dWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQorCisgICAgICAgICAg ICBsb2coIiVzIGZvdW5kIG9uIGJ1ZyAlcy4iICUgKHBsdXJhbGl6ZSgicmV2aWV3ZWQgcGF0Y2gi LCBsZW4ocGF0Y2hlcykpLCBidWdfaWQpKQorICAgICAgICAgICAgYWxsX3BhdGNoZXMgKz0gcGF0 Y2hlcworCisgICAgICAgIHJldHVybiBhbGxfcGF0Y2hlcworCiAKIGNsYXNzIENvbW1pdE1lc3Nh Z2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CkBAIC04 NTQsNiArODc1LDcgQEAgY2xhc3MgQnVnemlsbGFUb29sOgogICAgICAgICAgICAgeyAnbmFtZScg OiAnYXBwbHktYXR0YWNobWVudCcsICdvYmplY3QnIDogQXBwbHlBdHRhY2htZW50KCkgfSwKICAg ICAgICAgICAgIHsgJ25hbWUnIDogJ2FwcGx5LXBhdGNoZXMnLCAnb2JqZWN0JyA6IEFwcGx5UGF0 Y2hlc0Zyb21CdWcoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1kaWZmJywgJ29i amVjdCcgOiBMYW5kQW5kVXBkYXRlQnVnKCkgfSwKKyAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xh bmQtYXR0YWNobWVudCcsICdvYmplY3QnIDogTGFuZEF0dGFjaG1lbnQoKSB9LAogICAgICAgICAg ICAgeyAnbmFtZScgOiAnbGFuZC1wYXRjaGVzJywgJ29iamVjdCcgOiBMYW5kUGF0Y2hlc0Zyb21C dWdzKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2NoZWNrLXN0eWxlJywgJ29iamVjdCcg OiBDaGVja1N0eWxlKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2NvbW1pdC1tZXNzYWdl JywgJ29iamVjdCcgOiBDb21taXRNZXNzYWdlRm9yQ3VycmVudERpZmYoKSB9LAo= 43297 2009-11-16 04:57:13 -0800 2009-11-16 05:16:07 -0800 Fix the help strings bug-31546-20091116045711.patch text/plain 5603 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjOTU0NDJlLi4wYjE0M2Y1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgbmVlZHMgYSBsYW5kLWF0 dGFjaG1lbnQgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzE1NDYKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAg ICAgIC0gTW92ZSBhbGwgdGhlIGxvZ2ljIGludG8gQWJzdHJhY3RMYW5kaW5nQ29tbWFuZCBhbmQK KyAgICAgICAgICAgYWRkIGEgbmV3IExhbmRBdHRhY2htZW50IGNvbW1hbmQgc3ViY2xhc3MuCisg ICAgICAgICAtIFNwbGl0IG91dCBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyBsb2dnaW5nIGZyb20g X2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kLgorCisyMDA5LTExLTE2ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgog CiAgICAgICAgIE1vdmUgbW9yZSBwYXRjaC1sYW5kaW5nIGNvZGUgaW50byBXZWJLaXRMYW5kaW5n U2NyaXB0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbGFuZC1hdHRhY2htZW50CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wKaW5kZXggMDBjNzNiMC4uNzFhNzc4ZCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbApAQCAtNDA5LDQ1ICs0MDksNjUgQEAgY2xhc3MgTGFuZEFuZFVwZGF0ZUJ1ZyhDb21t YW5kKToKICAgICAgICAgICAgIGxvZygiTm8gYnVnIGlkIHByb3ZpZGVkLiIpCiAKIAotY2xhc3Mg TGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKLSAgICBkZWYgX19pbml0X18oc2VsZik6Ci0g ICAgICAgIG9wdGlvbnMgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkK LSAgICAgICAgb3B0aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5sYW5kX29wdGlvbnMoKQot ICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1 ZyBvcHRpb25hbGx5IHRlc3RpbmcgdGhlbSBmaXJzdCcsICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9u cykKK2NsYXNzIEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZChDb21tYW5kKToKKyAgICBkZWYg X19pbml0X18oc2VsZiwgZGVzY3JpcHRpb24sIGFyZ3NfZGVzY3JpcHRpb24pOgorICAgICAgICBv cHRpb25zID0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpICsgV2ViS2l0 TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKKyAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCBkZXNjcmlwdGlvbiwgYXJnc19kZXNjcmlwdGlvbiwgb3B0aW9ucz1vcHRpb25zKQogCiAg ICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQo b3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHt9Ci0gICAg ICAgIHBhdGNoX2NvdW50ID0gMAotICAgICAgICBmb3IgYnVnX2lkIGluIGFyZ3M6Ci0gICAgICAg ICAgICBwYXRjaGVzID0gW10KLSAgICAgICAgICAgIGlmIG9wdGlvbnMuY29tbWl0X3F1ZXVlOgot ICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hfY29tbWl0X3F1ZXVlX3Bh dGNoZXNfZnJvbV9idWcoYnVnX2lkLCByZWplY3RfaW52YWxpZF9wYXRjaGVzPVRydWUpCi0gICAg ICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3MuZmV0Y2hf cmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhidWdfaWQpCi0KLSAgICAgICAgICAgIHBhdGNoZXNf Zm91bmQgPSBsZW4ocGF0Y2hlcykKLSAgICAgICAgICAgIGxvZygiJXMgZm91bmQgb24gYnVnICVz LiIgJSAocGx1cmFsaXplKCJyZXZpZXdlZCBwYXRjaCIsIHBhdGNoZXNfZm91bmQpLCBidWdfaWQp KQotCi0gICAgICAgICAgICBwYXRjaF9jb3VudCArPSBwYXRjaGVzX2ZvdW5kCi0gICAgICAgICAg ICBpZiBwYXRjaGVzX2ZvdW5kOgotICAgICAgICAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlc1tidWdf aWRdID0gcGF0Y2hlcworICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xh c3NlcyBtdXN0IGltcGxlbWVudCIKIAotICAgICAgICBsb2coIkxhbmRpbmcgJXMgZnJvbSAlcy4i ICUgKHBsdXJhbGl6ZSgicGF0Y2giLCBwYXRjaF9jb3VudCksIHBsdXJhbGl6ZSgiYnVnIiwgbGVu KGFyZ3MpKSkpCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBfY29sbGVjdF9wYXRjaGVzX2J5 X2J1ZyhwYXRjaGVzKToKKyAgICAgICAgYnVnc190b19wYXRjaGVzID0ge30KKyAgICAgICAgZm9y IHBhdGNoIGluIHBhdGNoZXM6CisgICAgICAgICAgICBidWdfaWQgPSBwYXRjaFsnYnVnX2lkJ10K KyAgICAgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdID0gYnVnc190b19wYXRjaGVzLmdl dChidWdfaWQsIFtdKS5hcHBlbmQocGF0Y2gpCiAgICAgICAgIHJldHVybiBidWdzX3RvX3BhdGNo ZXMKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAgICAg ICBpZiBub3QgbGVuKGFyZ3MpOgotICAgICAgICAgICAgZXJyb3IoImJ1Zy1pZChzKSByZXF1aXJl ZCIpCisgICAgICAgIGlmIG5vdCBhcmdzOgorICAgICAgICAgICAgZXJyb3IoIiVzIHJlcXVpcmVk IiAlIHNlbGYuYXJndW1lbnRfbmFtZXMpCiAKICAgICAgICAgIyBDaGVjayB0aGUgdHJlZSBzdGF0 dXMgZmlyc3Qgc28gd2UgY2FuIGZhaWwgZWFybHkuCiAgICAgICAgIFdlYktpdExhbmRpbmdTY3Jp cHRzLmVuc3VyZV9idWlsZGVyc19hcmVfZ3JlZW4odG9vbC5idWlsZGJvdCwgb3B0aW9ucykKLSAg ICAgICAgYnVnc190b19wYXRjaGVzID0gc2VsZi5fZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xh bmQob3B0aW9ucywgYXJncywgdG9vbCkKKyAgICAgICAgcGF0Y2hlcyA9IHNlbGYuX2ZldGNoX2xp c3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlvbnMsIGFyZ3MsIHRvb2wpCisgICAgICAgIGJ1Z3Nf dG9fcGF0Y2hlcyA9IHNlbGYuX2NvbGxlY3RfcGF0Y2hlc19ieV9idWcocGF0Y2hlcykKKyAgICAg ICAgbG9nKCJMYW5kaW5nICVzIGZyb20gJXMuIiAlIChwbHVyYWxpemUoInBhdGNoIiwgbGVuKHBh dGNoZXMpKSwgcGx1cmFsaXplKCJidWciLCBsZW4oYnVnc190b19wYXRjaGVzKSkpKQogCiAgICAg ICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnByZXBhcmVfY2xlYW5fd29ya2luZ19kaXJlY3Rvcnko dG9vbC5zY20oKSwgb3B0aW9ucykKICAgICAgICAgZm9yIGJ1Z19pZCBpbiBidWdzX3RvX3BhdGNo ZXMua2V5cygpOgogICAgICAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9wYXRjaGVz KGJ1Z3NfdG9fcGF0Y2hlc1tidWdfaWRdLCBvcHRpb25zLCB0b29sKQogCitjbGFzcyBMYW5kQXR0 YWNobWVudChBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQpOgorICAgIGRlZiBfX2luaXRfXyhz ZWxmKToKKyAgICAgICAgQWJzdHJhY3RQYXRjaExhbmRpbmdDb21tYW5kLl9faW5pdF9fKHNlbGYs ICdMYW5kcyBhIHBhdGNoZXMgZnJvbSBidWd6aWxsYSwgb3B0aW9uYWxseSBidWlsZGluZyBhbmQg dGVzdGluZyB0aGVtIGZpcnN0JywgJ0FUVEFDSE1FTlRfSUQgW0FUVEFDSE1FTlRfSURTXScpCisK KyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFu ZChvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGF0Y2hf aWQ6IHRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoX2lkKSwgYXJncykKKworCitjbGFz cyBMYW5kUGF0Y2hlc0Zyb21CdWdzKEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZCk6CisgICAg ZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAgICBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQu X19pbml0X18oc2VsZiwgJ0xhbmRzIGFsbCBwYXRjaGVzIG9uIHRoZSBnaXZlbiBidWdzLCBvcHRp b25hbGx5IGJ1aWxkaW5nIGFuZCB0ZXN0aW5nIHRoZW0gZmlyc3QnLCAnQlVHSUQgW0JVR0lEU10n KQorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3Rv X2xhbmQob3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIGFsbF9wYXRjaGVzID0gW10KKyAg ICAgICAgZm9yIGJ1Z19pZCBpbiBhcmdzOgorICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBz dHJhbmdlIHRoYXQgLS1jb21taXQtcXVldWUgZ2V0cyBzcGVjaWFsIGJlaGF2aW9yIGhlcmUuCisg ICAgICAgICAgICBpZiBvcHRpb25zLmNvbW1pdF9xdWV1ZToKKyAgICAgICAgICAgICAgICBwYXRj aGVzID0gdG9vbC5idWdzLmZldGNoX2NvbW1pdF9xdWV1ZV9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19p ZCwgcmVqZWN0X2ludmFsaWRfcGF0Y2hlcz1UcnVlKQorICAgICAgICAgICAgZWxzZToKKyAgICAg ICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJv bV9idWcoYnVnX2lkKQorCisgICAgICAgICAgICBsb2coIiVzIGZvdW5kIG9uIGJ1ZyAlcy4iICUg KHBsdXJhbGl6ZSgicmV2aWV3ZWQgcGF0Y2giLCBsZW4ocGF0Y2hlcykpLCBidWdfaWQpKQorICAg ICAgICAgICAgYWxsX3BhdGNoZXMgKz0gcGF0Y2hlcworCisgICAgICAgIHJldHVybiBhbGxfcGF0 Y2hlcworCiAKIGNsYXNzIENvbW1pdE1lc3NhZ2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToKICAg ICBkZWYgX19pbml0X18oc2VsZik6CkBAIC04NTQsNiArODc0LDcgQEAgY2xhc3MgQnVnemlsbGFU b29sOgogICAgICAgICAgICAgeyAnbmFtZScgOiAnYXBwbHktYXR0YWNobWVudCcsICdvYmplY3Qn IDogQXBwbHlBdHRhY2htZW50KCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2FwcGx5LXBh dGNoZXMnLCAnb2JqZWN0JyA6IEFwcGx5UGF0Y2hlc0Zyb21CdWcoKSB9LAogICAgICAgICAgICAg eyAnbmFtZScgOiAnbGFuZC1kaWZmJywgJ29iamVjdCcgOiBMYW5kQW5kVXBkYXRlQnVnKCkgfSwK KyAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xhbmQtYXR0YWNobWVudCcsICdvYmplY3QnIDogTGFu ZEF0dGFjaG1lbnQoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1wYXRjaGVzJywg J29iamVjdCcgOiBMYW5kUGF0Y2hlc0Zyb21CdWdzKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUn IDogJ2NoZWNrLXN0eWxlJywgJ29iamVjdCcgOiBDaGVja1N0eWxlKCkgfSwKICAgICAgICAgICAg IHsgJ25hbWUnIDogJ2NvbW1pdC1tZXNzYWdlJywgJ29iamVjdCcgOiBDb21taXRNZXNzYWdlRm9y Q3VycmVudERpZmYoKSB9LAo= 43298 2009-11-16 05:16:21 -0800 2009-11-16 05:18:41 -0800 Maintain argument order when landing bug-31546-20091116051619.patch text/plain 6697 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjOTU0NDJlLi4wYjE0M2Y1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgbmVlZHMgYSBsYW5kLWF0 dGFjaG1lbnQgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzE1NDYKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAg ICAgIC0gTW92ZSBhbGwgdGhlIGxvZ2ljIGludG8gQWJzdHJhY3RMYW5kaW5nQ29tbWFuZCBhbmQK KyAgICAgICAgICAgYWRkIGEgbmV3IExhbmRBdHRhY2htZW50IGNvbW1hbmQgc3ViY2xhc3MuCisg ICAgICAgICAtIFNwbGl0IG91dCBfY29sbGVjdF9wYXRjaGVzX2J5X2J1ZyBsb2dnaW5nIGZyb20g X2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kLgorCisyMDA5LTExLTE2ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgog CiAgICAgICAgIE1vdmUgbW9yZSBwYXRjaC1sYW5kaW5nIGNvZGUgaW50byBXZWJLaXRMYW5kaW5n U2NyaXB0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbGFuZC1hdHRhY2htZW50CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wKaW5kZXggMDBjNzNiMC4uMmFiOTZjZSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbApAQCAtMzM5LDEyICszMzksMTEgQEAgY2xhc3MgV2ViS2l0TGFuZGluZ1NjcmlwdHM6 CiAgICAgICAgIHRvb2wuYnVncy5jbGVhcl9hdHRhY2htZW50X2ZsYWdzKHBhdGNoWydpZCddLCBj b21tZW50X3RleHQpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbGFuZF9wYXRjaGVzKGNs cywgcGF0Y2hlcywgb3B0aW9ucywgdG9vbCk6CisgICAgZGVmIGxhbmRfcGF0Y2hfYW5kX2hhbmRs ZV9lcnJvcnMoY2xzLCBwYXRjaCwgb3B0aW9ucywgdG9vbCk6CiAgICAgICAgIHRyeToKLSAgICAg ICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgotICAgICAgICAgICAgICAgIGNscy5fbGFuZF9w YXRjaChwYXRjaCwgb3B0aW9ucywgdG9vbCkKLSAgICAgICAgICAgIGlmIG9wdGlvbnMuY2xvc2Vf YnVnIGFuZCBwYXRjaGVzOgotICAgICAgICAgICAgICAgIGNscy5fY2xvc2VfYnVnX2lmX25vX2Fj dGl2ZV9wYXRjaGVzKHRvb2wuYnVncywgcGF0Y2hlc1swXVsnYnVnX2lkJ10pCisgICAgICAgICAg ICBjbHMuX2xhbmRfcGF0Y2gocGF0Y2gsIG9wdGlvbnMsIHRvb2wpCisgICAgICAgICAgICBpZiBv cHRpb25zLmNsb3NlX2J1ZzoKKyAgICAgICAgICAgICAgICBjbHMuX2Nsb3NlX2J1Z19pZl9ub19h Y3RpdmVfcGF0Y2hlcyh0b29sLmJ1Z3MsIHBhdGNoWydidWdfaWQnXSkKICAgICAgICAgZXhjZXB0 IENoZWNrb3V0TmVlZHNVcGRhdGUsIGU6CiAgICAgICAgICAgICBsb2coIkNvbW1pdCBmYWlsZWQg YmVjYXVzZSB0aGUgY2hlY2tvdXQgaXMgb3V0IG9mIGRhdGUuICBQbGVhc2UgdXBkYXRlIGFuZCB0 cnkgYWdhaW4uIikKICAgICAgICAgICAgIGxvZygiWW91IGNhbiBwYXNzIC0tbm8tYnVpbGQgdG8g c2tpcCBidWlsZGluZy90ZXN0aW5nIGFmdGVyIHVwZGF0ZSBpZiB5b3UgYmVsaWV2ZSB0aGUgbmV3 IGNvbW1pdHMgZGlkIG5vdCBhZmZlY3QgdGhlIHJlc3VsdHMuIikKQEAgLTQwOSw0NCArNDA4LDY4 IEBAIGNsYXNzIExhbmRBbmRVcGRhdGVCdWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBsb2coIk5v IGJ1ZyBpZCBwcm92aWRlZC4iKQogCiAKLWNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFu ZCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICBvcHRpb25zID0gV2ViS2l0TGFu ZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCi0gICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0 TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCAnTGFuZHMgYWxsIHBhdGNoZXMgb24gYSBidWcgb3B0aW9uYWxseSB0ZXN0aW5nIHRoZW0g Zmlyc3QnLCAnQlVHSUQnLCBvcHRpb25zPW9wdGlvbnMpCitjbGFzcyBBYnN0cmFjdFBhdGNoTGFu ZGluZ0NvbW1hbmQoQ29tbWFuZCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGRlc2NyaXB0aW9u LCBhcmdzX2Rlc2NyaXB0aW9uKToKKyAgICAgICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3Jp cHRzLmNsZWFuaW5nX29wdGlvbnMoKSArIFdlYktpdExhbmRpbmdTY3JpcHRzLmxhbmRfb3B0aW9u cygpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgZGVzY3JpcHRpb24sIGFyZ3NfZGVz Y3JpcHRpb24sIG9wdGlvbnM9b3B0aW9ucykKIAogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYg X2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAg ICAgICBidWdzX3RvX3BhdGNoZXMgPSB7fQotICAgICAgICBwYXRjaF9jb3VudCA9IDAKLSAgICAg ICAgZm9yIGJ1Z19pZCBpbiBhcmdzOgotICAgICAgICAgICAgcGF0Y2hlcyA9IFtdCi0gICAgICAg ICAgICBpZiBvcHRpb25zLmNvbW1pdF9xdWV1ZToKLSAgICAgICAgICAgICAgICBwYXRjaGVzID0g dG9vbC5idWdzLmZldGNoX2NvbW1pdF9xdWV1ZV9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCwgcmVq ZWN0X2ludmFsaWRfcGF0Y2hlcz1UcnVlKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAg ICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWco YnVnX2lkKQotCi0gICAgICAgICAgICBwYXRjaGVzX2ZvdW5kID0gbGVuKHBhdGNoZXMpCi0gICAg ICAgICAgICBsb2coIiVzIGZvdW5kIG9uIGJ1ZyAlcy4iICUgKHBsdXJhbGl6ZSgicmV2aWV3ZWQg cGF0Y2giLCBwYXRjaGVzX2ZvdW5kKSwgYnVnX2lkKSkKLQotICAgICAgICAgICAgcGF0Y2hfY291 bnQgKz0gcGF0Y2hlc19mb3VuZAotICAgICAgICAgICAgaWYgcGF0Y2hlc19mb3VuZDoKLSAgICAg ICAgICAgICAgICBidWdzX3RvX3BhdGNoZXNbYnVnX2lkXSA9IHBhdGNoZXMKKyAgICAgICAgcmFp c2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKLSAg ICAgICAgbG9nKCJMYW5kaW5nICVzIGZyb20gJXMuIiAlIChwbHVyYWxpemUoInBhdGNoIiwgcGF0 Y2hfY291bnQpLCBwbHVyYWxpemUoImJ1ZyIsIGxlbihhcmdzKSkpKQorICAgIEBzdGF0aWNtZXRo b2QKKyAgICBkZWYgX2NvbGxlY3RfcGF0Y2hlc19ieV9idWcocGF0Y2hlcyk6CisgICAgICAgIGJ1 Z3NfdG9fcGF0Y2hlcyA9IHt9CisgICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgorICAgICAg ICAgICAgYnVnX2lkID0gcGF0Y2hbJ2J1Z19pZCddCisgICAgICAgICAgICBidWdzX3RvX3BhdGNo ZXNbYnVnX2lkXSA9IGJ1Z3NfdG9fcGF0Y2hlcy5nZXQoYnVnX2lkLCBbXSkuYXBwZW5kKHBhdGNo KQogICAgICAgICByZXR1cm4gYnVnc190b19wYXRjaGVzCiAKICAgICBkZWYgZXhlY3V0ZShzZWxm LCBvcHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgaWYgbm90IGxlbihhcmdzKToKLSAgICAg ICAgICAgIGVycm9yKCJidWctaWQocykgcmVxdWlyZWQiKQorICAgICAgICBpZiBub3QgYXJnczoK KyAgICAgICAgICAgIGVycm9yKCIlcyByZXF1aXJlZCIgJSBzZWxmLmFyZ3VtZW50X25hbWVzKQog CiAgICAgICAgICMgQ2hlY2sgdGhlIHRyZWUgc3RhdHVzIGZpcnN0IHNvIHdlIGNhbiBmYWlsIGVh cmx5LgogICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5lbnN1cmVfYnVpbGRlcnNfYXJlX2dy ZWVuKHRvb2wuYnVpbGRib3QsIG9wdGlvbnMpCi0gICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHNl bGYuX2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlvbnMsIGFyZ3MsIHRvb2wpCi0K ICAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMucHJlcGFyZV9jbGVhbl93b3JraW5nX2RpcmVj dG9yeSh0b29sLnNjbSgpLCBvcHRpb25zKQotICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3NfdG9f cGF0Y2hlcy5rZXlzKCk6Ci0gICAgICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5sYW5kX3Bh dGNoZXMoYnVnc190b19wYXRjaGVzW2J1Z19pZF0sIG9wdGlvbnMsIHRvb2wpCisKKyAgICAgICAg cGF0Y2hlcyA9IHNlbGYuX2ZldGNoX2xpc3Rfb2ZfcGF0Y2hlc190b19sYW5kKG9wdGlvbnMsIGFy Z3MsIHRvb2wpCisKKyAgICAgICAgIyBJdCdzIG5pY2UgdG8gcHJpbnQgb3V0IHRvdGFsIHN0YXRp c3RpY3MuCisgICAgICAgIGJ1Z3NfdG9fcGF0Y2hlcyA9IHNlbGYuX2NvbGxlY3RfcGF0Y2hlc19i eV9idWcocGF0Y2hlcykKKyAgICAgICAgbG9nKCJMYW5kaW5nICVzIGZyb20gJXMuIiAlIChwbHVy YWxpemUoInBhdGNoIiwgbGVuKHBhdGNoZXMpKSwgcGx1cmFsaXplKCJidWciLCBsZW4oYnVnc190 b19wYXRjaGVzKSkpKQorCisgICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgorICAgICAgICAg ICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9wYXRjaF9hbmRfaGFuZGxlX2Vycm9ycyhwYXRj aCwgb3B0aW9ucywgdG9vbCkKKworCitjbGFzcyBMYW5kQXR0YWNobWVudChBYnN0cmFjdFBhdGNo TGFuZGluZ0NvbW1hbmQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgQWJzdHJh Y3RQYXRjaExhbmRpbmdDb21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyBhIHBhdGNoZXMgZnJv bSBidWd6aWxsYSwgb3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0Jywg J0FUVEFDSE1FTlRfSUQgW0FUVEFDSE1FTlRfSURTXScpCisKKyAgICBAc3RhdGljbWV0aG9kCisg ICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFuZChvcHRpb25zLCBhcmdzLCB0b29s KToKKyAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGF0Y2hfaWQ6IHRvb2wuYnVncy5mZXRjaF9h dHRhY2htZW50KHBhdGNoX2lkKSwgYXJncykKKworCitjbGFzcyBMYW5kUGF0Y2hlc0Zyb21CdWdz KEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgor ICAgICAgICBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRz IGFsbCBwYXRjaGVzIG9uIHRoZSBnaXZlbiBidWdzLCBvcHRpb25hbGx5IGJ1aWxkaW5nIGFuZCB0 ZXN0aW5nIHRoZW0gZmlyc3QnLCAnQlVHSUQgW0JVR0lEU10nKQorCisgICAgQHN0YXRpY21ldGhv ZAorICAgIGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX2xhbmQob3B0aW9ucywgYXJncywg dG9vbCk6CisgICAgICAgIGFsbF9wYXRjaGVzID0gW10KKyAgICAgICAgZm9yIGJ1Z19pZCBpbiBh cmdzOgorICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBzdHJhbmdlIHRoYXQgLS1jb21taXQt cXVldWUgZ2V0cyBzcGVjaWFsIGJlaGF2aW9yIGhlcmUuCisgICAgICAgICAgICBpZiBvcHRpb25z LmNvbW1pdF9xdWV1ZToKKyAgICAgICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNo X2NvbW1pdF9xdWV1ZV9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCwgcmVqZWN0X2ludmFsaWRfcGF0 Y2hlcz1UcnVlKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBwYXRjaGVzID0g dG9vbC5idWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQorCisgICAg ICAgICAgICBsb2coIiVzIGZvdW5kIG9uIGJ1ZyAlcy4iICUgKHBsdXJhbGl6ZSgicmV2aWV3ZWQg cGF0Y2giLCBsZW4ocGF0Y2hlcykpLCBidWdfaWQpKQorICAgICAgICAgICAgYWxsX3BhdGNoZXMg Kz0gcGF0Y2hlcworCisgICAgICAgIHJldHVybiBhbGxfcGF0Y2hlcwogCiAKIGNsYXNzIENvbW1p dE1lc3NhZ2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToKQEAgLTg1NCw2ICs4NzcsNyBAQCBjbGFz cyBCdWd6aWxsYVRvb2w6CiAgICAgICAgICAgICB7ICduYW1lJyA6ICdhcHBseS1hdHRhY2htZW50 JywgJ29iamVjdCcgOiBBcHBseUF0dGFjaG1lbnQoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScg OiAnYXBwbHktcGF0Y2hlcycsICdvYmplY3QnIDogQXBwbHlQYXRjaGVzRnJvbUJ1ZygpIH0sCiAg ICAgICAgICAgICB7ICduYW1lJyA6ICdsYW5kLWRpZmYnLCAnb2JqZWN0JyA6IExhbmRBbmRVcGRh dGVCdWcoKSB9LAorICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1hdHRhY2htZW50JywgJ29i amVjdCcgOiBMYW5kQXR0YWNobWVudCgpIH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdsYW5k LXBhdGNoZXMnLCAnb2JqZWN0JyA6IExhbmRQYXRjaGVzRnJvbUJ1Z3MoKSB9LAogICAgICAgICAg ICAgeyAnbmFtZScgOiAnY2hlY2stc3R5bGUnLCAnb2JqZWN0JyA6IENoZWNrU3R5bGUoKSB9LAog ICAgICAgICAgICAgeyAnbmFtZScgOiAnY29tbWl0LW1lc3NhZ2UnLCAnb2JqZWN0JyA6IENvbW1p dE1lc3NhZ2VGb3JDdXJyZW50RGlmZigpIH0sCg==