29202 2009-09-11 11:55:20 -0700 bugzilla-tool post-diff should know how to mark commit-queue=? 2009-10-26 15:41:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth dglazkov levin oldest_to_newest 146691 0 eric 2009-09-11 11:55:20 -0700 bugzilla-tool post-diff should know how to mark commit-queue=? Would be easy to write. The question is what the default should be. I assume it should default to not marking. Although maybe it should do a lookup of your bugzilla username in committers.py and default to true for non-committers? Would that be too subtle? 146693 1 abarth 2009-09-11 11:56:29 -0700 I'm not sure this is worth doing by default. 156566 2 41588 eric 2009-10-21 11:23:00 -0700 Created attachment 41588 Add --commit-queue support 156608 3 41588 abarth 2009-10-21 12:34:18 -0700 Comment on attachment 41588 Add --commit-queue support I don't think we should call it --commit-queue. That name is already taken in land-patches as a command line argument. 156612 4 eric 2009-10-21 12:40:41 -0700 Well, it's very easy to change the name on land-patches, since that's only ever used by one person... me. I think --commit-queue or --request-commit seem most appropriate to me. do you have suggestions? 156619 5 eric 2009-10-21 12:51:56 -0700 --request-auto-commit could work too, but seems kinda long. 156631 6 abarth 2009-10-21 13:43:18 -0700 (In reply to comment #4) > --request-commit I like this one. 156656 7 41613 eric 2009-10-21 14:58:32 -0700 Created attachment 41613 Add --request-commit support 156808 8 41613 abarth 2009-10-21 23:58:17 -0700 Comment on attachment 41613 Add --request-commit support ok 156820 9 41613 commit-queue 2009-10-22 00:18:48 -0700 Comment on attachment 41613 Add --request-commit support Rejecting patch 41613 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Last 500 characters of output: tory/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool M WebKitTools/Scripts/modules/bugzilla.py A repository hook failed: MERGE request failed on '/repository/webkit/trunk': Commit blocked by pre-commit hook (exit code 1) with output: svnlook: Can't write to stream: Broken pipe The following ChangeLog files contain OOPS: trunk/WebKitTools/ChangeLog Please don't ever say "OOPS" in a ChangeLog file. at /usr/local/libexec/git-core//git-svn line 469 156822 10 eric 2009-10-22 00:20:34 -0700 I need to make svn-apply smarter to handle these ChagneLogs. :( 157975 11 eric 2009-10-26 15:40:08 -0700 svn-apply is now smarter, but waiting review. Faster to just land this by hand. 157976 12 eric 2009-10-26 15:41:23 -0700 Committed r50107: <http://trac.webkit.org/changeset/50107> 41588 2009-10-21 11:23:00 -0700 2009-10-21 14:58:29 -0700 Add --commit-queue support bug-29202-20091021112258.patch text/plain 8369 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYmQ2NWU3Li45ODA2NGVjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTkgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBidWd6aWxsYS10b29sIHBv c3QtZGlmZiBzaG91bGQga25vdyBob3cgdG8gbWFyayBjb21taXQtcXVldWU9PworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkyMDIKKworICAgICAgICAq IFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgIC0gQWRkIC0tY29tbWl0LXF1ZXVlIG9w dGlvbiB0byBwb3N0LWRpZmYsIHBvc3QtY29tbWl0cyBhbmQgY3JlYXRlLWJ1Zy4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHk6CisgICAgICAgICAtIEFkZGVkIHN1cHBvcnQg Zm9yIC0tY29tbWl0LXF1ZXVlIHRvIGFkZF9wYXRjaF90b19idWcgYW5kIGNyZWF0ZV9idWdfd2l0 aF9wYXRjaC4KKyAgICAgICAgIC0gQWRkZWQgX2ZpbGxfYXR0YWNobWVudF9mb3JtIHRvIHNoYXJl IGNvZGUgYmV0d2VlbiBhZGRfcGF0Y2hfdG9fYnVnIGFuZCBjcmVhdGVfYnVnX3dpdGhfcGF0Y2gu CisKKzIwMDktMTAtMjEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIGJ1Z3ppbGxhLXRvb2wgY29t bWl0LXF1ZXVlIGRvZXMgbm90IG5vdGljZSBtb2RpZmljYXRpb25zIHRvIGNvbW1pdHRlcnMucHkK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDg0CiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCAyMjkxNTdiLi41ODZlNWIxIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC00MjQsNiArNDI0LDcgQEAgY2xhc3MgUG9zdERpZmZB c1BhdGNoVG9CdWcoQ29tbWFuZCk6CiAgICAgICAgIHJldHVybiBbCiAgICAgICAgICAgICBtYWtl X29wdGlvbigiLS1uby1vYnNvbGV0ZSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJvYnNv bGV0ZV9wYXRjaGVzIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBub3Qgb2Jzb2xldGUgb2xkIHBh dGNoZXMgYmVmb3JlIHBvc3RpbmcgdGhpcyBvbmUuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlv bigiLS1uby1yZXZpZXciLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0icmV2aWV3IiwgZGVm YXVsdD1UcnVlLCBoZWxwPSJEbyBub3QgbWFyayB0aGUgcGF0Y2ggZm9yIHJldmlldy4iKSwKKyAg ICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLWNvbW1pdC1xdWV1ZSIsIGFjdGlvbj0ic3RvcmVfdHJ1 ZSIsIGRlc3Q9ImNvbW1pdF9xdWV1ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9Ik1hcmsgdGhlIHBh dGNoIGFzIG5lZWRpbmcgYXV0by1jb21taXQgYWZ0ZXIgcmV2aWV3LiIpLAogICAgICAgICBdCiAK ICAgICBAc3RhdGljbWV0aG9kCkBAIC00NDcsNyArNDQ4LDcgQEAgY2xhc3MgUG9zdERpZmZBc1Bh dGNoVG9CdWcoQ29tbWFuZCk6CiAgICAgICAgIGRpZmZfZmlsZSA9IFN0cmluZ0lPLlN0cmluZ0lP KGRpZmYpICMgYWRkX3BhdGNoX3RvX2J1ZyBleHBlY3RzIGEgZmlsZS1saWtlIG9iamVjdAogCiAg ICAgICAgIGRlc2NyaXB0aW9uID0gb3B0aW9ucy5kZXNjcmlwdGlvbiBvciAiUGF0Y2ggdjEiCi0g ICAgICAgIHRvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19pZCwgZGlmZl9maWxlLCBkZXNj cmlwdGlvbiwgbWFya19mb3JfcmV2aWV3PW9wdGlvbnMucmV2aWV3KQorICAgICAgICB0b29sLmJ1 Z3MuYWRkX3BhdGNoX3RvX2J1ZyhidWdfaWQsIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24sIG1hcmtf Zm9yX3Jldmlldz1vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPW9wdGlvbnMu Y29tbWl0X3F1ZXVlKQogCiAKIGNsYXNzIFBvc3RDb21taXRzQXNQYXRjaGVzVG9CdWcoQ29tbWFu ZCk6CkBAIC00OTcsNyArNDk4LDcgQEAgY2xhc3MgUG9zdENvbW1pdHNBc1BhdGNoZXNUb0J1ZyhD b21tYW5kKToKICAgICAgICAgICAgIGRpZmZfZmlsZSA9IHNlbGYuX2RpZmZfZmlsZV9mb3JfY29t bWl0KHRvb2wsIGNvbW1pdF9pZCkKICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0gb3B0aW9ucy5k ZXNjcmlwdGlvbiBvciBjb21taXRfbWVzc2FnZS5kZXNjcmlwdGlvbihsc3RyaXA9VHJ1ZSwgc3Ry aXBfdXJsPVRydWUpCiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSBzZWxmLl9jb21tZW50X3Rl eHRfZm9yX2NvbW1pdChvcHRpb25zLCBjb21taXRfbWVzc2FnZSwgdG9vbCwgY29tbWl0X2lkKQot ICAgICAgICAgICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmX2ZpbGUs IGRlc2NyaXB0aW9uLCBjb21tZW50X3RleHQsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmll dykKKyAgICAgICAgICAgIHRvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19pZCwgZGlmZl9m aWxlLCBkZXNjcmlwdGlvbiwgY29tbWVudF90ZXh0LCBtYXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5y ZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1vcHRpb25zLmNvbW1pdF9xdWV1ZSkKIAogCiBj bGFzcyBSb2xsb3V0Q29tbWl0KENvbW1hbmQpOgpAQCAtNTY0LDYgKzU2NSw3IEBAIGNsYXNzIENy ZWF0ZUJ1ZyhDb21tYW5kKToKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLWNvbXBvbmVudCIs IGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjb21wb25lbnQiLCBoZWxwPSJD b21wb25lbnQgZm9yIHRoZSBuZXcgYnVnLiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0t bm8tcHJvbXB0IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InByb21wdCIsIGRlZmF1bHQ9 VHJ1ZSwgaGVscD0iRG8gbm90IHByb21wdCBmb3IgYnVnIHRpdGxlIGFuZCBjb21tZW50OyB1c2Ug Y29tbWl0IGxvZyBpbnN0ZWFkLiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tcmV2 aWV3IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InJldmlldyIsIGRlZmF1bHQ9VHJ1ZSwg aGVscD0iRG8gbm90IG1hcmsgdGhlIHBhdGNoIGZvciByZXZpZXcuIiksCisgICAgICAgICAgICBt YWtlX29wdGlvbigiLS1jb21taXQtcXVldWUiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJj b21taXRfcXVldWUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYXJrIHRoZSBwYXRjaCBhcyBuZWVk aW5nIGF1dG8tY29tbWl0IGFmdGVyIHJldmlldy4iKSwKICAgICAgICAgXQogICAgICAgICBDb21t YW5kLl9faW5pdF9fKHNlbGYsICdDcmVhdGUgYSBidWcgZnJvbSBsb2NhbCBjaGFuZ2VzIG9yIGxv Y2FsIGNvbW1pdHMuJywgJ1tDT01NSVRJU0hdJywgb3B0aW9ucz1vcHRpb25zKQogCkBAIC01ODcs NyArNTg5LDcgQEAgY2xhc3MgQ3JlYXRlQnVnKENvbW1hbmQpOgogCiAgICAgICAgIGRpZmYgPSB0 b29sLnNjbSgpLmNyZWF0ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdChjb21taXRfaWQpCiAgICAg ICAgIGRpZmZfZmlsZSA9IFN0cmluZ0lPLlN0cmluZ0lPKGRpZmYpICMgY3JlYXRlX2J1Z193aXRo X3BhdGNoIGV4cGVjdHMgYSBmaWxlLWxpa2Ugb2JqZWN0Ci0gICAgICAgIGJ1Z19pZCA9IHRvb2wu YnVncy5jcmVhdGVfYnVnX3dpdGhfcGF0Y2goYnVnX3RpdGxlLCBjb21tZW50X3RleHQsIG9wdGlv bnMuY29tcG9uZW50LCBkaWZmX2ZpbGUsICJQYXRjaCB2MSIsIGNjPW9wdGlvbnMuY2MsIG1hcmtf Zm9yX3Jldmlldz1vcHRpb25zLnJldmlldykKKyAgICAgICAgYnVnX2lkID0gdG9vbC5idWdzLmNy ZWF0ZV9idWdfd2l0aF9wYXRjaChidWdfdGl0bGUsIGNvbW1lbnRfdGV4dCwgb3B0aW9ucy5jb21w b25lbnQsIGRpZmZfZmlsZSwgIlBhdGNoIHYxIiwgY2M9b3B0aW9ucy5jYywgbWFya19mb3JfcmV2 aWV3PW9wdGlvbnMucmV2aWV3LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9b3B0aW9ucy5jb21taXRf cXVldWUpCiAKICAgICAgICAgaWYgYnVnX2lkIGFuZCBsZW4oY29tbWl0X2lkcykgPiAxOgogICAg ICAgICAgICAgb3B0aW9ucy5idWdfaWQgPSBidWdfaWQKQEAgLTYwNyw3ICs2MDksNyBAQCBjbGFz cyBDcmVhdGVCdWcoQ29tbWFuZCk6CiAKICAgICAgICAgZGlmZiA9IHRvb2wuc2NtKCkuY3JlYXRl X3BhdGNoKCkKICAgICAgICAgZGlmZl9maWxlID0gU3RyaW5nSU8uU3RyaW5nSU8oZGlmZikgIyBj cmVhdGVfYnVnX3dpdGhfcGF0Y2ggZXhwZWN0cyBhIGZpbGUtbGlrZSBvYmplY3QKLSAgICAgICAg YnVnX2lkID0gdG9vbC5idWdzLmNyZWF0ZV9idWdfd2l0aF9wYXRjaChidWdfdGl0bGUsIGNvbW1l bnRfdGV4dCwgb3B0aW9ucy5jb21wb25lbnQsIGRpZmZfZmlsZSwgIlBhdGNoIHYxIiwgY2M9b3B0 aW9ucy5jYywgbWFya19mb3JfcmV2aWV3PW9wdGlvbnMucmV2aWV3KQorICAgICAgICBidWdfaWQg PSB0b29sLmJ1Z3MuY3JlYXRlX2J1Z193aXRoX3BhdGNoKGJ1Z190aXRsZSwgY29tbWVudF90ZXh0 LCBvcHRpb25zLmNvbXBvbmVudCwgZGlmZl9maWxlLCAiUGF0Y2ggdjEiLCBjYz1vcHRpb25zLmNj LCBtYXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1v cHRpb25zLmNvbW1pdF9xdWV1ZSkKIAogICAgIGRlZiBwcm9tcHRfZm9yX2J1Z190aXRsZV9hbmRf Y29tbWVudChzZWxmKToKICAgICAgICAgYnVnX3RpdGxlID0gcmF3X2lucHV0KCJCdWcgdGl0bGU6 ICIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkKaW5kZXggZGFmM2YxOS4u ZmU4MWI0OCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxh LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpAQCAtMjk0 LDcgKzI5NCwxOCBAQCBjbGFzcyBCdWd6aWxsYToKIAogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0 ZWQgPSBUcnVlCiAKLSAgICBkZWYgYWRkX3BhdGNoX3RvX2J1ZyhzZWxmLCBidWdfaWQsIHBhdGNo X2ZpbGVfb2JqZWN0LCBkZXNjcmlwdGlvbiwgY29tbWVudF90ZXh0PU5vbmUsIG1hcmtfZm9yX3Jl dmlldz1GYWxzZSk6CisgICAgZGVmIF9maWxsX2F0dGFjaG1lbnRfZm9ybShzZWxmLCBkZXNjcmlw dGlvbiwgcGF0Y2hfZmlsZV9vYmplY3QsIGNvbW1lbnRfdGV4dD1Ob25lLCBtYXJrX2Zvcl9yZXZp ZXc9RmFsc2UsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1GYWxzZSwgYnVnX2lkPU5vbmUpOgorICAg ICAgICBzZWxmLmJyb3dzZXJbJ2Rlc2NyaXB0aW9uJ10gPSBkZXNjcmlwdGlvbgorICAgICAgICBz ZWxmLmJyb3dzZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQorICAgICAgICBzZWxmLmJyb3dzZXJbJ2Zs YWdfdHlwZS0xJ10gPSAoJz8nLCkgaWYgbWFya19mb3JfcmV2aWV3IGVsc2UgKCdYJywpCisgICAg ICAgIHNlbGYuYnJvd3NlclsnZmxhZ190eXBlLTMnXSA9ICgnPycsKSBpZiBtYXJrX2Zvcl9jb21t aXRfcXVldWUgZWxzZSAoJ1gnLCkKKyAgICAgICAgaWYgYnVnX2lkOgorICAgICAgICAgICAgcGF0 Y2hfbmFtZSA9ICJidWctJXMtJXMucGF0Y2giICUgKGJ1Z19pZCwgdGltZXN0YW1wKCkpCisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICBwYXRjaF9uYW1lID0iJXMucGF0Y2giICUgdGltZXN0YW1w KCkKKyAgICAgICAgc2VsZi5icm93c2VyLmFkZF9maWxlKHBhdGNoX2ZpbGVfb2JqZWN0LCAidGV4 dC9wbGFpbiIsIHBhdGNoX25hbWUsICdkYXRhJykKKworICAgIGRlZiBhZGRfcGF0Y2hfdG9fYnVn KHNlbGYsIGJ1Z19pZCwgcGF0Y2hfZmlsZV9vYmplY3QsIGRlc2NyaXB0aW9uLCBjb21tZW50X3Rl eHQ9Tm9uZSwgbWFya19mb3JfcmV2aWV3PUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFs c2UpOgogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCiAgICAgICAgIAogICAgICAgICBsb2co J0FkZGluZyBwYXRjaCAiJXMiIHRvIGJ1ZyAlcycgJSAoZGVzY3JpcHRpb24sIGJ1Z19pZCkpCkBA IC0zMDQsMTMgKzMxNSwxMCBAQCBjbGFzcyBCdWd6aWxsYToKICAgICAgICAgCiAgICAgICAgIHNl bGYuYnJvd3Nlci5vcGVuKCIlc2F0dGFjaG1lbnQuY2dpP2FjdGlvbj1lbnRlciZidWdpZD0lcyIg JSAoc2VsZi5idWdfc2VydmVyX3VybCwgYnVnX2lkKSkKICAgICAgICAgc2VsZi5icm93c2VyLnNl bGVjdF9mb3JtKG5hbWU9ImVudHJ5Zm9ybSIpCi0gICAgICAgIHNlbGYuYnJvd3NlclsnZGVzY3Jp cHRpb24nXSA9IGRlc2NyaXB0aW9uCi0gICAgICAgIHNlbGYuYnJvd3NlclsnaXNwYXRjaCddID0g KCIxIiwpCisgICAgICAgIHNlbGYuX2ZpbGxfYXR0YWNobWVudF9mb3JtKGRlc2NyaXB0aW9uLCBw YXRjaF9maWxlX29iamVjdCwgbWFya19mb3JfcmV2aWV3PW1hcmtfZm9yX3JldmlldywgbWFya19m b3JfY29tbWl0X3F1ZXVlPW1hcmtfZm9yX2NvbW1pdF9xdWV1ZSwgYnVnX2lkPWJ1Z19pZCkKICAg ICAgICAgaWYgY29tbWVudF90ZXh0OgogICAgICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKICAg ICAgICAgICAgIHNlbGYuYnJvd3NlclsnY29tbWVudCddID0gY29tbWVudF90ZXh0Ci0gICAgICAg IHNlbGYuYnJvd3NlclsnZmxhZ190eXBlLTEnXSA9ICgnPycsKSBpZiBtYXJrX2Zvcl9yZXZpZXcg ZWxzZSAoJ1gnLCkKLSAgICAgICAgc2VsZi5icm93c2VyLmFkZF9maWxlKHBhdGNoX2ZpbGVfb2Jq ZWN0LCAidGV4dC9wbGFpbiIsICJidWctJXMtJXMucGF0Y2giICUgKGJ1Z19pZCwgdGltZXN0YW1w KCkpKQogICAgICAgICBzZWxmLmJyb3dzZXIuc3VibWl0KCkKIAogICAgIGRlZiBwcm9tcHRfZm9y X2NvbXBvbmVudChzZWxmLCBjb21wb25lbnRzKToKQEAgLTMzNCw3ICszNDIsNyBAQCBjbGFzcyBC dWd6aWxsYToKICAgICAgICAgICAgIGVycm9yX21lc3NhZ2UgPSAiXG4iICsgJ1xuJy5qb2luKFsi ICAiICsgbGluZS5zdHJpcCgpIGZvciBsaW5lIGluIHRleHRfbGluZXMgaWYgbGluZS5zdHJpcCgp XSkKICAgICAgICAgcmFpc2UgQnVnemlsbGFFcnJvcigiQnVnIG5vdCBjcmVhdGVkOiAlcyIgJSBl cnJvcl9tZXNzYWdlKQogCi0gICAgZGVmIGNyZWF0ZV9idWdfd2l0aF9wYXRjaChzZWxmLCBidWdf dGl0bGUsIGJ1Z19kZXNjcmlwdGlvbiwgY29tcG9uZW50LCBwYXRjaF9maWxlX29iamVjdCwgcGF0 Y2hfZGVzY3JpcHRpb24sIGNjLCBtYXJrX2Zvcl9yZXZpZXc9RmFsc2UpOgorICAgIGRlZiBjcmVh dGVfYnVnX3dpdGhfcGF0Y2goc2VsZiwgYnVnX3RpdGxlLCBidWdfZGVzY3JpcHRpb24sIGNvbXBv bmVudCwgcGF0Y2hfZmlsZV9vYmplY3QsIHBhdGNoX2Rlc2NyaXB0aW9uLCBjYywgbWFya19mb3Jf cmV2aWV3PUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UpOgogICAgICAgICBzZWxm LmF1dGhlbnRpY2F0ZSgpCiAKICAgICAgICAgbG9nKCdDcmVhdGluZyBidWcgd2l0aCBwYXRjaCBk ZXNjcmlwdGlvbiAiJXMiJyAlIHBhdGNoX2Rlc2NyaXB0aW9uKQpAQCAtMzU1LDEwICszNjMsOCBA QCBjbGFzcyBCdWd6aWxsYToKICAgICAgICAgaWYgYnVnX2Rlc2NyaXB0aW9uOgogICAgICAgICAg ICAgbG9nKGJ1Z19kZXNjcmlwdGlvbikKICAgICAgICAgICAgIHNlbGYuYnJvd3NlclsnY29tbWVu dCddID0gYnVnX2Rlc2NyaXB0aW9uCi0gICAgICAgIHNlbGYuYnJvd3NlclsnZGVzY3JpcHRpb24n XSA9IHBhdGNoX2Rlc2NyaXB0aW9uCi0gICAgICAgIHNlbGYuYnJvd3NlclsnaXNwYXRjaCddID0g KCIxIiwpCi0gICAgICAgIHNlbGYuYnJvd3NlclsnZmxhZ190eXBlLTEnXSA9ICgnPycsKSBpZiBt YXJrX2Zvcl9yZXZpZXcgZWxzZSAoJ1gnLCkKLSAgICAgICAgc2VsZi5icm93c2VyLmFkZF9maWxl KHBhdGNoX2ZpbGVfb2JqZWN0LCAidGV4dC9wbGFpbiIsICIlcy5wYXRjaCIgJSB0aW1lc3RhbXAo KSwgJ2RhdGEnKQorCisgICAgICAgIHNlbGYuX2ZpbGxfYXR0YWNobWVudF9mb3JtKHBhdGNoX2Rl c2NyaXB0aW9uLCBwYXRjaF9maWxlX29iamVjdCwgbWFya19mb3JfcmV2aWV3PW1hcmtfZm9yX3Jl dmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPW1hcmtfZm9yX2NvbW1pdF9xdWV1ZSkKICAgICAg ICAgcmVzcG9uc2UgPSBzZWxmLmJyb3dzZXIuc3VibWl0KCkKIAogICAgICAgICBidWdfaWQgPSBz ZWxmLl9jaGVja19jcmVhdGVfYnVnX3Jlc3BvbnNlKHJlc3BvbnNlLnJlYWQoKSk= 41613 2009-10-21 14:58:32 -0700 2009-10-22 00:18:48 -0700 Add --request-commit support bug-29202-20091021145831.patch text/plain 8385 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYmQ2NWU3Li45ODA2NGVjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTkgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBidWd6aWxsYS10b29sIHBv c3QtZGlmZiBzaG91bGQga25vdyBob3cgdG8gbWFyayBjb21taXQtcXVldWU9PworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkyMDIKKworICAgICAgICAq IFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgIC0gQWRkIC0tY29tbWl0LXF1ZXVlIG9w dGlvbiB0byBwb3N0LWRpZmYsIHBvc3QtY29tbWl0cyBhbmQgY3JlYXRlLWJ1Zy4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHk6CisgICAgICAgICAtIEFkZGVkIHN1cHBvcnQg Zm9yIC0tY29tbWl0LXF1ZXVlIHRvIGFkZF9wYXRjaF90b19idWcgYW5kIGNyZWF0ZV9idWdfd2l0 aF9wYXRjaC4KKyAgICAgICAgIC0gQWRkZWQgX2ZpbGxfYXR0YWNobWVudF9mb3JtIHRvIHNoYXJl IGNvZGUgYmV0d2VlbiBhZGRfcGF0Y2hfdG9fYnVnIGFuZCBjcmVhdGVfYnVnX3dpdGhfcGF0Y2gu CisKKzIwMDktMTAtMjEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIGJ1Z3ppbGxhLXRvb2wgY29t bWl0LXF1ZXVlIGRvZXMgbm90IG5vdGljZSBtb2RpZmljYXRpb25zIHRvIGNvbW1pdHRlcnMucHkK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDg0CiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCA1YmNjOGNmLi44ZTg5OWI1IDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC00MjUsNiArNDI1LDcgQEAgY2xhc3MgUG9zdERpZmZB c1BhdGNoVG9CdWcoQ29tbWFuZCk6CiAgICAgICAgIHJldHVybiBbCiAgICAgICAgICAgICBtYWtl X29wdGlvbigiLS1uby1vYnNvbGV0ZSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJvYnNv bGV0ZV9wYXRjaGVzIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBub3Qgb2Jzb2xldGUgb2xkIHBh dGNoZXMgYmVmb3JlIHBvc3RpbmcgdGhpcyBvbmUuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlv bigiLS1uby1yZXZpZXciLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0icmV2aWV3IiwgZGVm YXVsdD1UcnVlLCBoZWxwPSJEbyBub3QgbWFyayB0aGUgcGF0Y2ggZm9yIHJldmlldy4iKSwKKyAg ICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLXJlcXVlc3QtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90 cnVlIiwgZGVzdD0icmVxdWVzdF9jb21taXQiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYXJrIHRo ZSBwYXRjaCBhcyBuZWVkaW5nIGF1dG8tY29tbWl0IGFmdGVyIHJldmlldy4iKSwKICAgICAgICAg XQogCiAgICAgQHN0YXRpY21ldGhvZApAQCAtNDQ4LDcgKzQ0OSw3IEBAIGNsYXNzIFBvc3REaWZm QXNQYXRjaFRvQnVnKENvbW1hbmQpOgogICAgICAgICBkaWZmX2ZpbGUgPSBTdHJpbmdJTy5TdHJp bmdJTyhkaWZmKSAjIGFkZF9wYXRjaF90b19idWcgZXhwZWN0cyBhIGZpbGUtbGlrZSBvYmplY3QK IAogICAgICAgICBkZXNjcmlwdGlvbiA9IG9wdGlvbnMuZGVzY3JpcHRpb24gb3IgIlBhdGNoIHYx IgotICAgICAgICB0b29sLmJ1Z3MuYWRkX3BhdGNoX3RvX2J1ZyhidWdfaWQsIGRpZmZfZmlsZSwg ZGVzY3JpcHRpb24sIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldykKKyAgICAgICAgdG9v bC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmX2ZpbGUsIGRlc2NyaXB0aW9uLCBt YXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1vcHRp b25zLnJlcXVlc3RfY29tbWl0KQogCiAKIGNsYXNzIFBvc3RDb21taXRzQXNQYXRjaGVzVG9CdWco Q29tbWFuZCk6CkBAIC00OTgsNyArNDk5LDcgQEAgY2xhc3MgUG9zdENvbW1pdHNBc1BhdGNoZXNU b0J1ZyhDb21tYW5kKToKICAgICAgICAgICAgIGRpZmZfZmlsZSA9IHNlbGYuX2RpZmZfZmlsZV9m b3JfY29tbWl0KHRvb2wsIGNvbW1pdF9pZCkKICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0gb3B0 aW9ucy5kZXNjcmlwdGlvbiBvciBjb21taXRfbWVzc2FnZS5kZXNjcmlwdGlvbihsc3RyaXA9VHJ1 ZSwgc3RyaXBfdXJsPVRydWUpCiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSBzZWxmLl9jb21t ZW50X3RleHRfZm9yX2NvbW1pdChvcHRpb25zLCBjb21taXRfbWVzc2FnZSwgdG9vbCwgY29tbWl0 X2lkKQotICAgICAgICAgICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZm X2ZpbGUsIGRlc2NyaXB0aW9uLCBjb21tZW50X3RleHQsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25z LnJldmlldykKKyAgICAgICAgICAgIHRvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19pZCwg ZGlmZl9maWxlLCBkZXNjcmlwdGlvbiwgY29tbWVudF90ZXh0LCBtYXJrX2Zvcl9yZXZpZXc9b3B0 aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1vcHRpb25zLnJlcXVlc3RfY29tbWl0 KQogCiAKIGNsYXNzIFJvbGxvdXRDb21taXQoQ29tbWFuZCk6CkBAIC01NjUsNiArNTY2LDcgQEAg Y2xhc3MgQ3JlYXRlQnVnKENvbW1hbmQpOgogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tY29t cG9uZW50IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImNvbXBvbmVudCIs IGhlbHA9IkNvbXBvbmVudCBmb3IgdGhlIG5ldyBidWcuIiksCiAgICAgICAgICAgICBtYWtlX29w dGlvbigiLS1uby1wcm9tcHQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0icHJvbXB0Iiwg ZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBub3QgcHJvbXB0IGZvciBidWcgdGl0bGUgYW5kIGNvbW1l bnQ7IHVzZSBjb21taXQgbG9nIGluc3RlYWQuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigi LS1uby1yZXZpZXciLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0icmV2aWV3IiwgZGVmYXVs dD1UcnVlLCBoZWxwPSJEbyBub3QgbWFyayB0aGUgcGF0Y2ggZm9yIHJldmlldy4iKSwKKyAgICAg ICAgICAgIG1ha2Vfb3B0aW9uKCItLXJlcXVlc3QtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVl IiwgZGVzdD0icmVxdWVzdF9jb21taXQiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYXJrIHRoZSBw YXRjaCBhcyBuZWVkaW5nIGF1dG8tY29tbWl0IGFmdGVyIHJldmlldy4iKSwKICAgICAgICAgXQog ICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdDcmVhdGUgYSBidWcgZnJvbSBsb2NhbCBj aGFuZ2VzIG9yIGxvY2FsIGNvbW1pdHMuJywgJ1tDT01NSVRJU0hdJywgb3B0aW9ucz1vcHRpb25z KQogCkBAIC01ODgsNyArNTkwLDcgQEAgY2xhc3MgQ3JlYXRlQnVnKENvbW1hbmQpOgogCiAgICAg ICAgIGRpZmYgPSB0b29sLnNjbSgpLmNyZWF0ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdChjb21t aXRfaWQpCiAgICAgICAgIGRpZmZfZmlsZSA9IFN0cmluZ0lPLlN0cmluZ0lPKGRpZmYpICMgY3Jl YXRlX2J1Z193aXRoX3BhdGNoIGV4cGVjdHMgYSBmaWxlLWxpa2Ugb2JqZWN0Ci0gICAgICAgIGJ1 Z19pZCA9IHRvb2wuYnVncy5jcmVhdGVfYnVnX3dpdGhfcGF0Y2goYnVnX3RpdGxlLCBjb21tZW50 X3RleHQsIG9wdGlvbnMuY29tcG9uZW50LCBkaWZmX2ZpbGUsICJQYXRjaCB2MSIsIGNjPW9wdGlv bnMuY2MsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldykKKyAgICAgICAgYnVnX2lkID0g dG9vbC5idWdzLmNyZWF0ZV9idWdfd2l0aF9wYXRjaChidWdfdGl0bGUsIGNvbW1lbnRfdGV4dCwg b3B0aW9ucy5jb21wb25lbnQsIGRpZmZfZmlsZSwgIlBhdGNoIHYxIiwgY2M9b3B0aW9ucy5jYywg bWFya19mb3JfcmV2aWV3PW9wdGlvbnMucmV2aWV3LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9b3B0 aW9ucy5yZXF1ZXN0X2NvbW1pdCkKIAogICAgICAgICBpZiBidWdfaWQgYW5kIGxlbihjb21taXRf aWRzKSA+IDE6CiAgICAgICAgICAgICBvcHRpb25zLmJ1Z19pZCA9IGJ1Z19pZApAQCAtNjA4LDcg KzYxMCw3IEBAIGNsYXNzIENyZWF0ZUJ1ZyhDb21tYW5kKToKIAogICAgICAgICBkaWZmID0gdG9v bC5zY20oKS5jcmVhdGVfcGF0Y2goKQogICAgICAgICBkaWZmX2ZpbGUgPSBTdHJpbmdJTy5TdHJp bmdJTyhkaWZmKSAjIGNyZWF0ZV9idWdfd2l0aF9wYXRjaCBleHBlY3RzIGEgZmlsZS1saWtlIG9i amVjdAotICAgICAgICBidWdfaWQgPSB0b29sLmJ1Z3MuY3JlYXRlX2J1Z193aXRoX3BhdGNoKGJ1 Z190aXRsZSwgY29tbWVudF90ZXh0LCBvcHRpb25zLmNvbXBvbmVudCwgZGlmZl9maWxlLCAiUGF0 Y2ggdjEiLCBjYz1vcHRpb25zLmNjLCBtYXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5yZXZpZXcpCisg ICAgICAgIGJ1Z19pZCA9IHRvb2wuYnVncy5jcmVhdGVfYnVnX3dpdGhfcGF0Y2goYnVnX3RpdGxl LCBjb21tZW50X3RleHQsIG9wdGlvbnMuY29tcG9uZW50LCBkaWZmX2ZpbGUsICJQYXRjaCB2MSIs IGNjPW9wdGlvbnMuY2MsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldywgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPW9wdGlvbnMucmVxdWVzdF9jb21taXQpCiAKICAgICBkZWYgcHJvbXB0X2Zv cl9idWdfdGl0bGVfYW5kX2NvbW1lbnQoc2VsZik6CiAgICAgICAgIGJ1Z190aXRsZSA9IHJhd19p bnB1dCgiQnVnIHRpdGxlOiAiKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL2J1Z3ppbGxhLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5 CmluZGV4IGRhZjNmMTkuLmZlODFiNDggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9idWd6aWxsYS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVn emlsbGEucHkKQEAgLTI5NCw3ICsyOTQsMTggQEAgY2xhc3MgQnVnemlsbGE6CiAKICAgICAgICAg c2VsZi5hdXRoZW50aWNhdGVkID0gVHJ1ZQogCi0gICAgZGVmIGFkZF9wYXRjaF90b19idWcoc2Vs ZiwgYnVnX2lkLCBwYXRjaF9maWxlX29iamVjdCwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dD1O b25lLCBtYXJrX2Zvcl9yZXZpZXc9RmFsc2UpOgorICAgIGRlZiBfZmlsbF9hdHRhY2htZW50X2Zv cm0oc2VsZiwgZGVzY3JpcHRpb24sIHBhdGNoX2ZpbGVfb2JqZWN0LCBjb21tZW50X3RleHQ9Tm9u ZSwgbWFya19mb3JfcmV2aWV3PUZhbHNlLCBtYXJrX2Zvcl9jb21taXRfcXVldWU9RmFsc2UsIGJ1 Z19pZD1Ob25lKToKKyAgICAgICAgc2VsZi5icm93c2VyWydkZXNjcmlwdGlvbiddID0gZGVzY3Jp cHRpb24KKyAgICAgICAgc2VsZi5icm93c2VyWydpc3BhdGNoJ10gPSAoIjEiLCkKKyAgICAgICAg c2VsZi5icm93c2VyWydmbGFnX3R5cGUtMSddID0gKCc/JywpIGlmIG1hcmtfZm9yX3JldmlldyBl bHNlICgnWCcsKQorICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdfdHlwZS0zJ10gPSAoJz8nLCkg aWYgbWFya19mb3JfY29tbWl0X3F1ZXVlIGVsc2UgKCdYJywpCisgICAgICAgIGlmIGJ1Z19pZDoK KyAgICAgICAgICAgIHBhdGNoX25hbWUgPSAiYnVnLSVzLSVzLnBhdGNoIiAlIChidWdfaWQsIHRp bWVzdGFtcCgpKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcGF0Y2hfbmFtZSA9IiVzLnBh dGNoIiAlIHRpbWVzdGFtcCgpCisgICAgICAgIHNlbGYuYnJvd3Nlci5hZGRfZmlsZShwYXRjaF9m aWxlX29iamVjdCwgInRleHQvcGxhaW4iLCBwYXRjaF9uYW1lLCAnZGF0YScpCisKKyAgICBkZWYg YWRkX3BhdGNoX3RvX2J1ZyhzZWxmLCBidWdfaWQsIHBhdGNoX2ZpbGVfb2JqZWN0LCBkZXNjcmlw dGlvbiwgY29tbWVudF90ZXh0PU5vbmUsIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPUZhbHNlKToKICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQogICAgICAg ICAKICAgICAgICAgbG9nKCdBZGRpbmcgcGF0Y2ggIiVzIiB0byBidWcgJXMnICUgKGRlc2NyaXB0 aW9uLCBidWdfaWQpKQpAQCAtMzA0LDEzICszMTUsMTAgQEAgY2xhc3MgQnVnemlsbGE6CiAgICAg ICAgIAogICAgICAgICBzZWxmLmJyb3dzZXIub3BlbigiJXNhdHRhY2htZW50LmNnaT9hY3Rpb249 ZW50ZXImYnVnaWQ9JXMiICUgKHNlbGYuYnVnX3NlcnZlcl91cmwsIGJ1Z19pZCkpCiAgICAgICAg IHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJlbnRyeWZvcm0iKQotICAgICAgICBzZWxm LmJyb3dzZXJbJ2Rlc2NyaXB0aW9uJ10gPSBkZXNjcmlwdGlvbgotICAgICAgICBzZWxmLmJyb3dz ZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQorICAgICAgICBzZWxmLl9maWxsX2F0dGFjaG1lbnRfZm9y bShkZXNjcmlwdGlvbiwgcGF0Y2hfZmlsZV9vYmplY3QsIG1hcmtfZm9yX3Jldmlldz1tYXJrX2Zv cl9yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1tYXJrX2Zvcl9jb21taXRfcXVldWUsIGJ1 Z19pZD1idWdfaWQpCiAgICAgICAgIGlmIGNvbW1lbnRfdGV4dDoKICAgICAgICAgICAgIGxvZyhj b21tZW50X3RleHQpCiAgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ2NvbW1lbnQnXSA9IGNvbW1l bnRfdGV4dAotICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdfdHlwZS0xJ10gPSAoJz8nLCkgaWYg bWFya19mb3JfcmV2aWV3IGVsc2UgKCdYJywpCi0gICAgICAgIHNlbGYuYnJvd3Nlci5hZGRfZmls ZShwYXRjaF9maWxlX29iamVjdCwgInRleHQvcGxhaW4iLCAiYnVnLSVzLSVzLnBhdGNoIiAlIChi dWdfaWQsIHRpbWVzdGFtcCgpKSkKICAgICAgICAgc2VsZi5icm93c2VyLnN1Ym1pdCgpCiAKICAg ICBkZWYgcHJvbXB0X2Zvcl9jb21wb25lbnQoc2VsZiwgY29tcG9uZW50cyk6CkBAIC0zMzQsNyAr MzQyLDcgQEAgY2xhc3MgQnVnemlsbGE6CiAgICAgICAgICAgICBlcnJvcl9tZXNzYWdlID0gIlxu IiArICdcbicuam9pbihbIiAgIiArIGxpbmUuc3RyaXAoKSBmb3IgbGluZSBpbiB0ZXh0X2xpbmVz IGlmIGxpbmUuc3RyaXAoKV0pCiAgICAgICAgIHJhaXNlIEJ1Z3ppbGxhRXJyb3IoIkJ1ZyBub3Qg Y3JlYXRlZDogJXMiICUgZXJyb3JfbWVzc2FnZSkKIAotICAgIGRlZiBjcmVhdGVfYnVnX3dpdGhf cGF0Y2goc2VsZiwgYnVnX3RpdGxlLCBidWdfZGVzY3JpcHRpb24sIGNvbXBvbmVudCwgcGF0Y2hf ZmlsZV9vYmplY3QsIHBhdGNoX2Rlc2NyaXB0aW9uLCBjYywgbWFya19mb3JfcmV2aWV3PUZhbHNl KToKKyAgICBkZWYgY3JlYXRlX2J1Z193aXRoX3BhdGNoKHNlbGYsIGJ1Z190aXRsZSwgYnVnX2Rl c2NyaXB0aW9uLCBjb21wb25lbnQsIHBhdGNoX2ZpbGVfb2JqZWN0LCBwYXRjaF9kZXNjcmlwdGlv biwgY2MsIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPUZhbHNl KToKICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQogCiAgICAgICAgIGxvZygnQ3JlYXRpbmcg YnVnIHdpdGggcGF0Y2ggZGVzY3JpcHRpb24gIiVzIicgJSBwYXRjaF9kZXNjcmlwdGlvbikKQEAg LTM1NSwxMCArMzYzLDggQEAgY2xhc3MgQnVnemlsbGE6CiAgICAgICAgIGlmIGJ1Z19kZXNjcmlw dGlvbjoKICAgICAgICAgICAgIGxvZyhidWdfZGVzY3JpcHRpb24pCiAgICAgICAgICAgICBzZWxm LmJyb3dzZXJbJ2NvbW1lbnQnXSA9IGJ1Z19kZXNjcmlwdGlvbgotICAgICAgICBzZWxmLmJyb3dz ZXJbJ2Rlc2NyaXB0aW9uJ10gPSBwYXRjaF9kZXNjcmlwdGlvbgotICAgICAgICBzZWxmLmJyb3dz ZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQotICAgICAgICBzZWxmLmJyb3dzZXJbJ2ZsYWdfdHlwZS0x J10gPSAoJz8nLCkgaWYgbWFya19mb3JfcmV2aWV3IGVsc2UgKCdYJywpCi0gICAgICAgIHNlbGYu YnJvd3Nlci5hZGRfZmlsZShwYXRjaF9maWxlX29iamVjdCwgInRleHQvcGxhaW4iLCAiJXMucGF0 Y2giICUgdGltZXN0YW1wKCksICdkYXRhJykKKworICAgICAgICBzZWxmLl9maWxsX2F0dGFjaG1l bnRfZm9ybShwYXRjaF9kZXNjcmlwdGlvbiwgcGF0Y2hfZmlsZV9vYmplY3QsIG1hcmtfZm9yX3Jl dmlldz1tYXJrX2Zvcl9yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1tYXJrX2Zvcl9jb21t aXRfcXVldWUpCiAgICAgICAgIHJlc3BvbnNlID0gc2VsZi5icm93c2VyLnN1Ym1pdCgpCiAKICAg ICAgICAgYnVnX2lkID0gc2VsZi5fY2hlY2tfY3JlYXRlX2J1Z19yZXNwb25zZShyZXNwb25zZS5y ZWFkKCkp