27847 2009-07-30 12:03:15 -0700 bugzilla-tool post-commits trunk..head errors out 2009-07-31 15:52:50 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned ddkilzer evan oldest_to_newest 135913 0 eric 2009-07-30 12:03:15 -0700 bugzilla-tool post-commits trunk..head errors out bugzilla-tool post-commits trunk..head Skipping fe5ba4cc272372cbd6c14261081e8d0b856cde87: No bug id found in commit log or specified with --bug-id. fatal: Not a valid object name ^20daa58114c8c3829861a53d405c117352d9ca4f Traceback (most recent call last): File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 668, in <module> main() File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 665, in main return tool.main() File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 660, in main return command_object.execute(command_options, command_args, self) File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 431, in execute commit_message = tool.scm().commit_message_for_local_commit(commit_id) File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py", line 380, in commit_message_for_local_commit commit_lines = self.run_command(['git', 'cat-file', 'commit', commit_id]).splitlines() File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py", line 108, in run_command raise ScriptError('Failed to run "%s" exit_code: %d cwd: %s' % (args, exit_code, cwd)) modules.scm.ScriptError: Failed to run "['git', 'cat-file', 'commit', '^20daa58114c8c3829861a53d405c117352d9ca4f']" exit_code: 128 cwd: None Note this is because of our git rev-parse usage: git rev-parse --revs-only trunk..HEAD fe5ba4cc272372cbd6c14261081e8d0b856cde87 ^20daa58114c8c3829861a53d405c117352d9ca4f We really want rev-list (most of the time): git rev-list trunk..HEAD fe5ba4cc272372cbd6c14261081e8d0b856cde87 7a3f6b9a5aabf51fe0d54688805d0fd0e9dc657c 4c929dac07dd08bf2328b755a1054189e158478f I propose that we define our bugzilla-tool post-commits behavior as follows: 1. 0 args means "rev-list trunk..HEAD" 2. 1 arg, "COMMIT" means cherry pick, aka "rev-list COMMIT^..COMMIT" 3. 2 args "A B" means cherry-pick those 2 4. a ".." range arg "A..B" means "rev-list A..B" (theoretically we could support multiple ranges, but that seems gratuitous) 5. a "..." range arg is an error (never really makes sense for post-commits" This mostly means replacing our current rev-parse usage with rev-list, and adding a default case for 0 args, and making ... and error. Also, we have to detect the lack of .. and modify what we pass to rev-list a little. Does this sound sane? 135915 1 evan 2009-07-30 12:06:17 -0700 More generally, something like revs_to_upload = [] for arg in argv: if '..' in arg: args = `git rev-list arg`.splitlines() else: args = [arg] revs_to_upload += args covers cases 2 through 4 without special-casing. 135925 2 ddkilzer 2009-07-30 12:10:14 -0700 (In reply to comment #0) > I propose that we define our bugzilla-tool post-commits behavior as follows: > > 1. 0 args means "rev-list trunk..HEAD" > 2. 1 arg, "COMMIT" means cherry pick, aka "rev-list COMMIT^..COMMIT" > 3. 2 args "A B" means cherry-pick those 2 > 4. a ".." range arg "A..B" means "rev-list A..B" (theoretically we could > support multiple ranges, but that seems gratuitous) > 5. a "..." range arg is an error (never really makes sense for post-commits" I agree with this functionality. Are there any git commands that behave the same way? Doesn't git-rev-parse support all common forms of specifying ranges in git, or do we have to "help" it for items 1 and 2 by pre-processing the args? 135926 3 ddkilzer 2009-07-30 12:10:50 -0700 (In reply to comment #1) > More generally, something like > > revs_to_upload = [] > for arg in argv: > if '..' in arg: > args = `git rev-list arg`.splitlines() > else: > args = [arg] > revs_to_upload += args > > covers cases 2 through 4 without special-casing. I like this. Then only case 1 and 5 need special handling. 135927 4 eric 2009-07-30 12:14:07 -0700 I think we're defining new behavior here. "git show" expects to cherry pick what is passed it. But it doesn't accept ranges. "git diff" will take a single commit passed to it and turn it into "COMMIT..HEAD" (which is what git-send-bugzilla used to do). So our behavior is different and will need some custom code (at least as far as I can tell). Also, as Evan could tell you, "..." are treated differently for different commands. I think "..." makes no sense for us, and anyone passing it to post-commits likely meant ".." and did so in error, so I think we should error out. For sanity sake, we could print 1-line descriptions of what we're about to upload before we do so. We could even ask for confirmation, although that's probably unnecessary. 135992 5 33832 eric 2009-07-30 13:56:46 -0700 Created attachment 33832 First attempt --- 3 files changed, 36 insertions(+), 23 deletions(-) 136039 6 33832 ddkilzer 2009-07-30 15:03:03 -0700 Comment on attachment 33832 First attempt > + # This function supports the following argument formats: > + # no args : rev-list trunk..HEAD > + # A..B : rev-list A..B > + # A...B : error! > + # A B : [A, B] (different from git diff, which would use "rev-list A..B") > + def commit_ids_from_commitish_arguments(self, args): > + if not len(args): > + args.append('trunk..HEAD') > + > + commit_ids = [] > + for commitish in args: > + if '...' in commitish: > + error("'...' is not supported (found in %s). Did you mean '..'?" % commitish) > + elif '..' in commitish: > + commit_ids += self.run_command(['git', 'rev-list', commitish]).splitlines() > + else: > + commit_ids.append(commitish) > + return commit_ids I think individual commits should still be passed through git rev-parse: > + else: > + commit_ids += self.run_command(['git', 'rev-parse', '--revs-only', commitish]).splitlines() This allows you to specify a branch name or a tag name that turns into a single commit. r=me with this change. Everything else looks good. 136276 7 33904 eric 2009-07-31 15:42:22 -0700 Created attachment 33904 Revised per review comments --- 3 files changed, 37 insertions(+), 23 deletions(-) 136278 8 eric 2009-07-31 15:46:31 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool M WebKitTools/Scripts/modules/scm.py Committed r46644 M WebKitTools/ChangeLog M WebKitTools/Scripts/modules/scm.py M WebKitTools/Scripts/bugzilla-tool r46644 = 759067c20868401e074f16c80c192f60c0d33e61 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46644 136279 9 33904 ddkilzer 2009-07-31 15:48:31 -0700 Comment on attachment 33904 Revised per review comments r=me 136284 10 eric 2009-07-31 15:52:50 -0700 I was mostly just testing to make sure post-commits still worked after the suggested edits. ;) Thanks for the second review! 33832 2009-07-30 13:56:46 -0700 2009-07-31 15:42:18 -0700 First attempt bug-27847-20090730135646.patch text/plain 4742 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzOWYyNzAzLi40NDNkNDE2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDct MzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgcG9zdC1jb21taXRzIHRy dW5rLi5oZWFkIGVycm9ycyBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI3ODQ3CisKKyAgICAgICAgUmVuYW1lIGNvbW1pdF9pZHNfZnJvbV9yYW5n ZV9hcmd1bWVudHMgdG8gY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMKKyAgICAg ICAgYW5kIG1ha2UgaXQgaGFuZGxlIHRoZSBuZXcgYXJndW1lbnRzIGZvcm1hdCBwcm9wb3NlZCBp biB0aGUgYnVnLgorCisgICAgICAgICogU2NyaXB0cy9idWd6aWxsYS10b29sOgorICAgICAgICAq IFNjcmlwdHMvbW9kdWxlcy9zY20ucHk6CisKIDIwMDktMDctMzAgIEpha3ViIFdpZWN6b3JlayAg PGZhdzIxN0BnbWFpbC5jb20+CiAKICAgICAgICAgW1F0XSBGaXggYnVpbGQgd2l0aCBHQ0MgNC40 LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IGQ0YTM5MzQuLjQwMzg2MGMgMTAwNzU1 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTQxNSwxOSArNDE1LDE1IEBAIGNsYXNzIFBvc3RD b21taXRzQXNQYXRjaGVzVG9CdWcoQ29tbWFuZCk6CiAgICAgICAgIGlmIG5vdCBhcmdzOgogICAg ICAgICAgICAgZXJyb3IoIiVzIGFyZ3VtZW50IGlzIHJlcXVpcmVkIiAlIHNlbGYuYXJndW1lbnRf bmFtZXMpCiAKLSAgICAgICAgY29tbWl0X2lkcyA9IFtdCi0gICAgICAgIGZvciBjb21taXRpc2gg aW4gYXJnczoKLSAgICAgICAgICAgIHJlc3VsdHMgPSB0b29sLnNjbSgpLmNvbW1pdF9pZHNfZnJv bV9yYW5nZV9hcmd1bWVudHMoW2NvbW1pdGlzaF0sIGNoZXJyeV9waWNrPVRydWUpCi0gICAgICAg ICAgICBpZiBub3QgcmVzdWx0cyBvciBsZW4ocmVzdWx0cykgPCAxOgotICAgICAgICAgICAgICAg IGVycm9yKCJ1bmFibGUgdG8gcGFyc2UgY29tbWl0IGZyb20gJyVzJyIgJSBjb21taXRpc2gpCi0g ICAgICAgICAgICBjb21taXRfaWRzICs9IHJlc3VsdHMKLQorICAgICAgICBjb21taXRfaWRzID0g dG9vbC5zY20oKS5jb21taXRfaWRzX2Zyb21fY29tbWl0aXNoX2FyZ3VtZW50cyhhcmdzKQogICAg ICAgICBpZiBsZW4oY29tbWl0X2lkcykgPiAxMDoKICAgICAgICAgICAgIGVycm9yKCJBcmUgeW91 IHN1cmUgeW91IHdhbnQgdG8gYXR0YWNoICVzIHBhdGNoZXM/IiAlIChwbHVyYWxpemUoJ3BhdGNo JywgbGVuKGNvbW1pdF9pZHMpKSkpCiAgICAgICAgICAgICAjIENvdWxkIGFkZCBhIC0tcGF0Y2hl cy1saW1pdCBvcHRpb24uCiAKICAgICAgICAgaGF2ZV9vYnNvbGV0ZWRfcGF0Y2hlcyA9IHNldCgp CiAgICAgICAgIGZvciBjb21taXRfaWQgaW4gY29tbWl0X2lkczoKKyAgICAgICAgICAgICMgRklY TUU6IGNvbW1pdF9tZXNzYWdlIGlzIHRoZSB3cm9uZyBwbGFjZSB0byBsb29rIGZvciB0aGUgYnVn X2lkCisgICAgICAgICAgICAjIHRoZSBDaGFuZ2VMb2dzIHNob3VsZCBoYXZlIHRoZSBidWcgaWQs IGJ1dCB0aGUgbG9jYWwgY29tbWl0IG1lc3NhZ2UgbWlnaHQgbm90LgogICAgICAgICAgICAgY29t bWl0X21lc3NhZ2UgPSB0b29sLnNjbSgpLmNvbW1pdF9tZXNzYWdlX2Zvcl9sb2NhbF9jb21taXQo Y29tbWl0X2lkKQogCiAgICAgICAgICAgICBidWdfaWQgPSBvcHRpb25zLmJ1Z19pZCBvciBjb21t aXRfbWVzc2FnZS5wYXJzZV9idWdfaWQoKQpAQCAtNDYyLDggKzQ1OCw3IEBAIGNsYXNzIENyZWF0 ZUJ1ZyhDb21tYW5kKToKICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAnQ3JlYXRlIGEg YnVnIGZyb20gbG9jYWwgY2hhbmdlcyBvciBsb2NhbCBjb21taXRzLicsICdbQ09NTUlUSVNIXScs IG9wdGlvbnM9b3B0aW9ucykKIAogICAgIGRlZiBjcmVhdGVfYnVnX2Zyb21fY29tbWl0KHNlbGYs IG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAgICAgICBjb21taXRfaWRzID0gdG9vbC5zY20oKS5j b21taXRfaWRzX2Zyb21fcmFuZ2VfYXJndW1lbnRzKGFyZ3MsIGNoZXJyeV9waWNrPVRydWUpCi0K KyAgICAgICAgY29tbWl0X2lkcyA9IHRvb2wuc2NtKCkuY29tbWl0X2lkc19mcm9tX2NvbW1pdGlz aF9hcmd1bWVudHMoYXJncykKICAgICAgICAgaWYgbGVuKGNvbW1pdF9pZHMpID4gMzoKICAgICAg ICAgICAgIGVycm9yKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gY3JlYXRlIG9uZSBidWcgd2l0 aCAlcyBwYXRjaGVzPyIgJSBsZW4oY29tbWl0X2lkcykpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv c2NtLnB5CmluZGV4IGJiODBjODMuLjUzNmZhNjMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9zY20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3Nj bS5weQpAQCAtMzUsNyArMzUsNyBAQCBpbXBvcnQgc3VicHJvY2VzcwogCiAjIEltcG9ydCBXZWJL aXQtc3BlY2lmaWMgbW9kdWxlcy4KIGZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBlcnJvciwg bG9nCi1mcm9tIG1vZHVsZXMuYnVnemlsbGEgaW1wb3J0IEJ1Z3ppbGxhCitmcm9tIG1vZHVsZXMu YnVnemlsbGEgaW1wb3J0IEJ1Z3ppbGxhICMgRklYTUU6IFRoaXMgc2hvdWxkIG5vdCBiZSBpbXBv cnRlZCBieSBzY20ucHkKIAogZGVmIGRldGVjdF9zY21fc3lzdGVtKHBhdGgpOgogICAgIGlmIFNW Ti5pbl93b3JraW5nX2RpcmVjdG9yeShwYXRoKToKQEAgLTM2MiwxOSArMzYyLDI0IEBAIGNsYXNz IEdpdChTQ00pOgogICAgICAgICAgICAgcmV0dXJuICJEcnkgcnVuLCBubyByZW1vdGUgY29tbWl0 LiIKICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoWydnaXQnLCAnc3ZuJywgJ2Rjb21t aXQnXSkKIAotICAgIGRlZiBjb21taXRfaWRzX2Zyb21fcmFuZ2VfYXJndW1lbnRzKHNlbGYsIGFy Z3MsIGNoZXJyeV9waWNrPUZhbHNlKToKLSAgICAgICAgIyBGaXJzdCBnZXQgdGhlIGNvbW1pdC1p ZHMgZm9yIHRoZSBwYXNzZWQgaW4gcmV2aXNpb25zLgotICAgICAgICByZXZpc2lvbnMgPSBzZWxm LnJ1bl9jb21tYW5kKFsnZ2l0JywgJ3Jldi1wYXJzZScsICctLXJldnMtb25seSddICsgYXJncyku c3BsaXRsaW5lcygpCi0KLSAgICAgICAgaWYgY2hlcnJ5X3BpY2s6Ci0gICAgICAgICAgICByZXR1 cm4gcmV2aXNpb25zCi0KLSAgICAgICAgIyBJZiB3ZSdyZSBub3QgY2hlcnJ5IHBpY2tpbmcgYW5k IHdlcmUgb25seSBwYXNzZWQgb25lIHJldmlzaW9uLCBhc3N1bWUgIl5yZXZpc2lvbiBoZWFkIiBh a2EgInJldmlzaW9uLi5oZWFkIi4KLSAgICAgICAgaWYgbGVuKHJldmlzaW9ucykgPCAyOgotICAg ICAgICAgICAgcmV2aXNpb25zWzBdID0gIl4iICsgcmV2aXNpb25zWzBdCi0gICAgICAgICAgICBy ZXZpc2lvbnMuYXBwZW5kKCJIRUFEIikKLQotICAgICAgICByZXR1cm4gc2VsZi5ydW5fY29tbWFu ZChbJ2dpdCcsICdyZXYtbGlzdCddICsgcmV2aXNpb25zKS5zcGxpdGxpbmVzKCkKKyAgICAjIFRo aXMgZnVuY3Rpb24gc3VwcG9ydHMgdGhlIGZvbGxvd2luZyBhcmd1bWVudCBmb3JtYXRzOgorICAg ICMgbm8gYXJncyA6IHJldi1saXN0IHRydW5rLi5IRUFECisgICAgIyBBLi5CICAgIDogcmV2LWxp c3QgQS4uQgorICAgICMgQS4uLkIgICA6IGVycm9yIQorICAgICMgQSBCICAgICA6IFtBLCBCXSAg KGRpZmZlcmVudCBmcm9tIGdpdCBkaWZmLCB3aGljaCB3b3VsZCB1c2UgInJldi1saXN0IEEuLkIi KQorICAgIGRlZiBjb21taXRfaWRzX2Zyb21fY29tbWl0aXNoX2FyZ3VtZW50cyhzZWxmLCBhcmdz KToKKyAgICAgICAgaWYgbm90IGxlbihhcmdzKToKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCd0 cnVuay4uSEVBRCcpCisKKyAgICAgICAgY29tbWl0X2lkcyA9IFtdCisgICAgICAgIGZvciBjb21t aXRpc2ggaW4gYXJnczoKKyAgICAgICAgICAgIGlmICcuLi4nIGluIGNvbW1pdGlzaDoKKyAgICAg ICAgICAgICAgICBlcnJvcigiJy4uLicgaXMgbm90IHN1cHBvcnRlZCAoZm91bmQgaW4gJXMpLiBE aWQgeW91IG1lYW4gJy4uJz8iICUgY29tbWl0aXNoKQorICAgICAgICAgICAgZWxpZiAnLi4nIGlu IGNvbW1pdGlzaDoKKyAgICAgICAgICAgICAgICBjb21taXRfaWRzICs9IHNlbGYucnVuX2NvbW1h bmQoWydnaXQnLCAncmV2LWxpc3QnLCBjb21taXRpc2hdKS5zcGxpdGxpbmVzKCkKKyAgICAgICAg ICAgIGVsc2U6CisgICAgICAgICAgICAgICAgY29tbWl0X2lkcy5hcHBlbmQoY29tbWl0aXNoKQor ICAgICAgICByZXR1cm4gY29tbWl0X2lkcwogCiAgICAgZGVmIGNvbW1pdF9tZXNzYWdlX2Zvcl9s b2NhbF9jb21taXQoc2VsZiwgY29tbWl0X2lkKToKICAgICAgICAgY29tbWl0X2xpbmVzID0gc2Vs Zi5ydW5fY29tbWFuZChbJ2dpdCcsICdjYXQtZmlsZScsICdjb21taXQnLCBjb21taXRfaWRdKS5z cGxpdGxpbmVzKCk= 33904 2009-07-31 15:42:22 -0700 2009-07-31 15:48:31 -0700 Revised per review comments bug-27847-20090731154221.patch text/plain 4970 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3ZDA2ZmFhLi41MWVjMDM1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMDktMDct MzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgcG9zdC1jb21taXRzIHRy dW5rLi5oZWFkIGVycm9ycyBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI3ODQ3CisKKyAgICAgICAgUmVuYW1lIGNvbW1pdF9pZHNfZnJvbV9yYW5n ZV9hcmd1bWVudHMgdG8gY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMKKyAgICAg ICAgYW5kIG1ha2UgaXQgaGFuZGxlIHRoZSBuZXcgYXJndW1lbnRzIGZvcm1hdCBwcm9wb3NlZCBp biB0aGUgYnVnLgorCisgICAgICAgICogU2NyaXB0cy9idWd6aWxsYS10b29sOgorICAgICAgICAq IFNjcmlwdHMvbW9kdWxlcy9zY20ucHk6CisKKzIwMDktMDctMzAgIEVyaWMgU2VpZGVsICA8ZXJp Y0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgogCiAgICAg ICAgIGNsZWFuIHVwIGJ1aWxkLXdlYmtpdCB0byB1c2UgbGVzcyBjb3B5L3Bhc3RlIGNvZGUgYW5k IHJlbW92ZSB1bm5lZWRlZCBTVkcgd2FybmluZwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmlu ZGV4IDhmYzA3OTYuLjJlN2ViMGEgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVn emlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTQx NSwxOSArNDE1LDE1IEBAIGNsYXNzIFBvc3RDb21taXRzQXNQYXRjaGVzVG9CdWcoQ29tbWFuZCk6 CiAgICAgICAgIGlmIG5vdCBhcmdzOgogICAgICAgICAgICAgZXJyb3IoIiVzIGFyZ3VtZW50IGlz IHJlcXVpcmVkIiAlIHNlbGYuYXJndW1lbnRfbmFtZXMpCiAKLSAgICAgICAgY29tbWl0X2lkcyA9 IFtdCi0gICAgICAgIGZvciBjb21taXRpc2ggaW4gYXJnczoKLSAgICAgICAgICAgIHJlc3VsdHMg PSB0b29sLnNjbSgpLmNvbW1pdF9pZHNfZnJvbV9yYW5nZV9hcmd1bWVudHMoW2NvbW1pdGlzaF0s IGNoZXJyeV9waWNrPVRydWUpCi0gICAgICAgICAgICBpZiBub3QgcmVzdWx0cyBvciBsZW4ocmVz dWx0cykgPCAxOgotICAgICAgICAgICAgICAgIGVycm9yKCJ1bmFibGUgdG8gcGFyc2UgY29tbWl0 IGZyb20gJyVzJyIgJSBjb21taXRpc2gpCi0gICAgICAgICAgICBjb21taXRfaWRzICs9IHJlc3Vs dHMKLQorICAgICAgICBjb21taXRfaWRzID0gdG9vbC5zY20oKS5jb21taXRfaWRzX2Zyb21fY29t bWl0aXNoX2FyZ3VtZW50cyhhcmdzKQogICAgICAgICBpZiBsZW4oY29tbWl0X2lkcykgPiAxMDoK ICAgICAgICAgICAgIGVycm9yKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gYXR0YWNoICVzIHBh dGNoZXM/IiAlIChwbHVyYWxpemUoJ3BhdGNoJywgbGVuKGNvbW1pdF9pZHMpKSkpCiAgICAgICAg ICAgICAjIENvdWxkIGFkZCBhIC0tcGF0Y2hlcy1saW1pdCBvcHRpb24uCiAKICAgICAgICAgaGF2 ZV9vYnNvbGV0ZWRfcGF0Y2hlcyA9IHNldCgpCiAgICAgICAgIGZvciBjb21taXRfaWQgaW4gY29t bWl0X2lkczoKKyAgICAgICAgICAgICMgRklYTUU6IGNvbW1pdF9tZXNzYWdlIGlzIHRoZSB3cm9u ZyBwbGFjZSB0byBsb29rIGZvciB0aGUgYnVnX2lkCisgICAgICAgICAgICAjIHRoZSBDaGFuZ2VM b2dzIHNob3VsZCBoYXZlIHRoZSBidWcgaWQsIGJ1dCB0aGUgbG9jYWwgY29tbWl0IG1lc3NhZ2Ug bWlnaHQgbm90LgogICAgICAgICAgICAgY29tbWl0X21lc3NhZ2UgPSB0b29sLnNjbSgpLmNvbW1p dF9tZXNzYWdlX2Zvcl9sb2NhbF9jb21taXQoY29tbWl0X2lkKQogCiAgICAgICAgICAgICBidWdf aWQgPSBvcHRpb25zLmJ1Z19pZCBvciBjb21taXRfbWVzc2FnZS5wYXJzZV9idWdfaWQoKQpAQCAt NDYyLDggKzQ1OCw3IEBAIGNsYXNzIENyZWF0ZUJ1ZyhDb21tYW5kKToKICAgICAgICAgQ29tbWFu ZC5fX2luaXRfXyhzZWxmLCAnQ3JlYXRlIGEgYnVnIGZyb20gbG9jYWwgY2hhbmdlcyBvciBsb2Nh bCBjb21taXRzLicsICdbQ09NTUlUSVNIXScsIG9wdGlvbnM9b3B0aW9ucykKIAogICAgIGRlZiBj cmVhdGVfYnVnX2Zyb21fY29tbWl0KHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAgICAg ICBjb21taXRfaWRzID0gdG9vbC5zY20oKS5jb21taXRfaWRzX2Zyb21fcmFuZ2VfYXJndW1lbnRz KGFyZ3MsIGNoZXJyeV9waWNrPVRydWUpCi0KKyAgICAgICAgY29tbWl0X2lkcyA9IHRvb2wuc2Nt KCkuY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMoYXJncykKICAgICAgICAgaWYg bGVuKGNvbW1pdF9pZHMpID4gMzoKICAgICAgICAgICAgIGVycm9yKCJBcmUgeW91IHN1cmUgeW91 IHdhbnQgdG8gY3JlYXRlIG9uZSBidWcgd2l0aCAlcyBwYXRjaGVzPyIgJSBsZW4oY29tbWl0X2lk cykpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CmluZGV4IGJiODBjODMuLmM4ODhiNmEg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMzUsNyArMzUsNyBAQCBpbXBvcnQg c3VicHJvY2VzcwogCiAjIEltcG9ydCBXZWJLaXQtc3BlY2lmaWMgbW9kdWxlcy4KIGZyb20gbW9k dWxlcy5sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nCi1mcm9tIG1vZHVsZXMuYnVnemlsbGEgaW1w b3J0IEJ1Z3ppbGxhCitmcm9tIG1vZHVsZXMuYnVnemlsbGEgaW1wb3J0IEJ1Z3ppbGxhICMgRklY TUU6IFRoaXMgc2hvdWxkIG5vdCBiZSBpbXBvcnRlZCBieSBzY20ucHkKIAogZGVmIGRldGVjdF9z Y21fc3lzdGVtKHBhdGgpOgogICAgIGlmIFNWTi5pbl93b3JraW5nX2RpcmVjdG9yeShwYXRoKToK QEAgLTM2MiwxOSArMzYyLDI1IEBAIGNsYXNzIEdpdChTQ00pOgogICAgICAgICAgICAgcmV0dXJu ICJEcnkgcnVuLCBubyByZW1vdGUgY29tbWl0LiIKICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2Nv bW1hbmQoWydnaXQnLCAnc3ZuJywgJ2Rjb21taXQnXSkKIAotICAgIGRlZiBjb21taXRfaWRzX2Zy b21fcmFuZ2VfYXJndW1lbnRzKHNlbGYsIGFyZ3MsIGNoZXJyeV9waWNrPUZhbHNlKToKLSAgICAg ICAgIyBGaXJzdCBnZXQgdGhlIGNvbW1pdC1pZHMgZm9yIHRoZSBwYXNzZWQgaW4gcmV2aXNpb25z LgotICAgICAgICByZXZpc2lvbnMgPSBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0JywgJ3Jldi1wYXJz ZScsICctLXJldnMtb25seSddICsgYXJncykuc3BsaXRsaW5lcygpCi0KLSAgICAgICAgaWYgY2hl cnJ5X3BpY2s6Ci0gICAgICAgICAgICByZXR1cm4gcmV2aXNpb25zCi0KLSAgICAgICAgIyBJZiB3 ZSdyZSBub3QgY2hlcnJ5IHBpY2tpbmcgYW5kIHdlcmUgb25seSBwYXNzZWQgb25lIHJldmlzaW9u LCBhc3N1bWUgIl5yZXZpc2lvbiBoZWFkIiBha2EgInJldmlzaW9uLi5oZWFkIi4KLSAgICAgICAg aWYgbGVuKHJldmlzaW9ucykgPCAyOgotICAgICAgICAgICAgcmV2aXNpb25zWzBdID0gIl4iICsg cmV2aXNpb25zWzBdCi0gICAgICAgICAgICByZXZpc2lvbnMuYXBwZW5kKCJIRUFEIikKLQotICAg ICAgICByZXR1cm4gc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdyZXYtbGlzdCddICsgcmV2aXNp b25zKS5zcGxpdGxpbmVzKCkKKyAgICAjIFRoaXMgZnVuY3Rpb24gc3VwcG9ydHMgdGhlIGZvbGxv d2luZyBhcmd1bWVudCBmb3JtYXRzOgorICAgICMgbm8gYXJncyA6IHJldi1saXN0IHRydW5rLi5I RUFECisgICAgIyBBLi5CICAgIDogcmV2LWxpc3QgQS4uQgorICAgICMgQS4uLkIgICA6IGVycm9y IQorICAgICMgQSBCICAgICA6IFtBLCBCXSAgKGRpZmZlcmVudCBmcm9tIGdpdCBkaWZmLCB3aGlj aCB3b3VsZCB1c2UgInJldi1saXN0IEEuLkIiKQorICAgIGRlZiBjb21taXRfaWRzX2Zyb21fY29t bWl0aXNoX2FyZ3VtZW50cyhzZWxmLCBhcmdzKToKKyAgICAgICAgaWYgbm90IGxlbihhcmdzKToK KyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCd0cnVuay4uSEVBRCcpCisKKyAgICAgICAgY29tbWl0 X2lkcyA9IFtdCisgICAgICAgIGZvciBjb21taXRpc2ggaW4gYXJnczoKKyAgICAgICAgICAgIGlm ICcuLi4nIGluIGNvbW1pdGlzaDoKKyAgICAgICAgICAgICAgICBlcnJvcigiJy4uLicgaXMgbm90 IHN1cHBvcnRlZCAoZm91bmQgaW4gJyVzJykuIERpZCB5b3UgbWVhbiAnLi4nPyIgJSBjb21taXRp c2gpCisgICAgICAgICAgICBlbGlmICcuLicgaW4gY29tbWl0aXNoOgorICAgICAgICAgICAgICAg IGNvbW1pdF9pZHMgKz0gc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdyZXYtbGlzdCcsIGNvbW1p dGlzaF0pLnNwbGl0bGluZXMoKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAj IFR1cm4gc2luZ2xlIGNvbW1pdHMgb3IgYnJhbmNoIG9yIHRhZyBuYW1lcyBpbnRvIGNvbW1pdCBp ZHMuCisgICAgICAgICAgICAgICAgY29tbWl0X2lkcyArPSBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0 JywgJ3Jldi1wYXJzZScsICctLXJldnMtb25seScsIGNvbW1pdGlzaF0pLnNwbGl0bGluZXMoKQor ICAgICAgICByZXR1cm4gY29tbWl0X2lkcwogCiAgICAgZGVmIGNvbW1pdF9tZXNzYWdlX2Zvcl9s b2NhbF9jb21taXQoc2VsZiwgY29tbWl0X2lkKToKICAgICAgICAgY29tbWl0X2xpbmVzID0gc2Vs Zi5ydW5fY29tbWFuZChbJ2dpdCcsICdjYXQtZmlsZScsICdjb21taXQnLCBjb21taXRfaWRdKS5z cGxpdGxpbmVzKCk=