28193 2009-08-11 15:25:11 -0700 bugzilla-tool: Re-factor shared landing logic into helper class to share more code 2009-08-11 15:35:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 26715 1 eric webkit-unassigned abarth oldest_to_newest 139130 0 eric 2009-08-11 15:25:11 -0700 bugzilla-tool: Re-factor shared landing logic into helper class to share more code I did this originally a part of bug 26715, but it really should be a separate issue. 139138 1 34604 eric 2009-08-11 15:30:08 -0700 Created attachment 34604 Patch v1 139140 2 34604 abarth 2009-08-11 15:33:07 -0700 Comment on attachment 34604 Patch v1 Would be nice to factor out all the WebKit stuff into modules/webkit.py at some point. 139141 3 eric 2009-08-11 15:33:39 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool Committed r47069 M WebCore/editing/haiku/EditorHaiku.cpp M WebCore/ChangeLog M WebCore/page/haiku/EventHandlerHaiku.cpp M WebCore/platform/haiku/ClipboardHaiku.cpp M WebCore/platform/haiku/DragDataHaiku.cpp r47068 = a6669f4fb846d758f172b3974b9f79bcd5242a69 (trunk) M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool r47069 = 67e74353dfc8c4855ce730e06c50d05018528641 (trunk) First, rewinding head to replay your work on top of it... Nothing to do. http://trac.webkit.org/changeset/47069 34604 2009-08-11 15:30:08 -0700 2009-08-11 15:33:06 -0700 Patch v1 bug-28193-20090811153007.patch text/plain 11085 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYjU4YzFkLi5mOWQ3MWU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2w6IFJlLWZhY3RvciBzaGFy ZWQgbGFuZGluZyBsb2dpYyBpbnRvIGhlbHBlciBjbGFzcyB0byBzaGFyZSBtb3JlIGNvZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MTkzCisKKyAg ICAgICAgQWRkZWQgbmV3IFdlYktpdExhbmRpbmdTY3JpcHRzIGNsYXNzIHRvIGhvbGQgdGhpcyBz aGFyZWQgbG9naWMuCisgICAgICAgIEFsc28gYWRkZWQgYSB2aWV3X3NvdXJjZV91cmwgZnVuY3Rp b24gdG8gbW92ZSBtb3JlIHdlYmtpdC1zcGVjaWZpYyB1cmxzIG91dCBvZiBidWd6aWxsYS10b29s IGNvcmUuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6CisKIDIwMDktMDgtMTEg IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gVHJlYXQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKaW5k ZXggYjNjMGQ2Ny4uYTU4ZTk5NSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6 aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbApAQCAtNTYs NiArNTYsOSBAQCBkZWYgcGx1cmFsaXplKG5vdW4sIGNvdW50KToKICAgICAgICAgbm91biA9IHBs dXJhbChub3VuKQogICAgIHJldHVybiAiJWQgJXMiICUgKGNvdW50LCBub3VuKQogCitkZWYgdmll d19zb3VyY2VfdXJsKHJldmlzaW9uX251bWJlcik6CisgICAgIHJldHVybiAiaHR0cDovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvJXMiICUgcmV2aXNpb25fbnVtYmVyCisKICMgVGhlc2UgY291 bGQgYmUgcHV0IGluIHNvbWUgc29ydCBvZiBjaGFuZ2Vsb2dzLnB5LgogZGVmIGxhdGVzdF9jaGFu Z2Vsb2dfZW50cnkoY2hhbmdlbG9nX3BhdGgpOgogICAgICMgZS5nLiAyMDA5LTA2LTAzICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KQEAgLTIxNSwyMCArMjE4LDg1IEBAIGNsYXNzIEFw cGx5UGF0Y2hlc0Zyb21CdWcoQ29tbWFuZCk6CiBkZWYgYnVnX2NvbW1lbnRfZnJvbV9jb21taXRf dGV4dChzY20sIGNvbW1pdF90ZXh0KToKICAgICBtYXRjaCA9IHJlLnNlYXJjaChzY20uY29tbWl0 X3N1Y2Nlc3NfcmVnZXhwKCksIGNvbW1pdF90ZXh0LCByZS5NVUxUSUxJTkUpCiAgICAgc3ZuX3Jl dmlzaW9uID0gbWF0Y2guZ3JvdXAoJ3N2bl9yZXZpc2lvbicpCi0gICAgY29tbWl0X3RleHQgKz0g KCJcbmh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LyVzIiAlIHN2bl9yZXZpc2lvbikK KyAgICBjb21taXRfdGV4dCArPSAoIlxuJXMiICUgdmlld19zb3VyY2VfdXJsKHN2bl9yZXZpc2lv bikpCiAgICAgcmV0dXJuIGNvbW1pdF90ZXh0CiAKIAorY2xhc3MgV2ViS2l0TGFuZGluZ1Njcmlw dHM6CisgICAgIEBzdGF0aWNtZXRob2QKKyAgICAgZGVmIGNsZWFuaW5nX29wdGlvbnMoKToKKyAg ICAgICAgIHJldHVybiBbCisgICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tZm9yY2UtY2xlYW4i LCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJmb3JjZV9jbGVhbiIsIGRlZmF1bHQ9RmFsc2Us IGhlbHA9IkNsZWFuIHdvcmtpbmcgZGlyZWN0b3J5IGJlZm9yZSBhcHBseWluZyBwYXRjaGVzIChy ZW1vdmVzIGxvY2FsIGNoYW5nZXMgYW5kIGNvbW1pdHMpIiksCisgICAgICAgICAgICAgbWFrZV9v cHRpb24oIi0tbm8tY2xlYW4iLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xlYW4iLCBk ZWZhdWx0PVRydWUsIGhlbHA9IkRvbid0IGNoZWNrIGlmIHRoZSB3b3JraW5nIGRpcmVjdG9yeSBp cyBjbGVhbiBiZWZvcmUgYXBwbHlpbmcgcGF0Y2hlcyIpLAorICAgICAgICAgXQorCisgICAgIEBz dGF0aWNtZXRob2QKKyAgICAgZGVmIGxhbmRfb3B0aW9ucygpOgorICAgICAgICAgcmV0dXJuIFsK KyAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby1jbG9zZSIsIGFjdGlvbj0ic3RvcmVfZmFs c2UiLCBkZXN0PSJjbG9zZV9idWciLCBkZWZhdWx0PVRydWUsIGhlbHA9IkxlYXZlIGJ1ZyBvcGVu IGFmdGVyIGxhbmRpbmcuIiksCisgICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tYnVpbGQi LCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iYnVpbGQiLCBkZWZhdWx0PVRydWUsIGhlbHA9 IkNvbW1pdCB3aXRob3V0IGJ1aWxkaW5nIGZpcnN0LCBpbXBsaWVzIC0tbm8tdGVzdC4iKSwKKyAg ICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby10ZXN0IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIs IGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IHJ1bm5pbmcg cnVuLXdlYmtpdC10ZXN0cy4iKSwKKyAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1xdWlldCIs IGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InF1aWV0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0i UHJvZHVjZSBsZXNzIGNvbnNvbGUgb3V0cHV0LiIpLAorICAgICAgICAgICAgIG1ha2Vfb3B0aW9u KCItLWNvbW1pdC1xdWV1ZSIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImNvbW1pdF9xdWV1 ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IlJ1biBpbiBjb21taXQgcXVldWUgbW9kZSAobm8gdXNl ciBpbnRlcmFjdGlvbikuIiksCisgICAgICAgICBdCisKKyAgICAgQHN0YXRpY21ldGhvZAorICAg ICBkZWYgcnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3MsIHF1aWV0PUZhbHNlKToKKyAgICAgICAg IGNoaWxkX3N0ZG91dCA9IHN1YnByb2Nlc3MuUElQRSBpZiBxdWlldCBlbHNlIE5vbmUKKyAgICAg ICAgIGNoaWxkX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIHN0ZG91dD1jaGlsZF9z dGRvdXQpCisgICAgICAgICBpZiBjaGlsZF9wcm9jZXNzLnN0ZG91dDoKKyAgICAgICAgICAgICBj aGlsZF9wcm9jZXNzLmNvbW11bmljYXRlKCkKKyAgICAgICAgIHJldHVybl9jb2RlID0gY2hpbGRf cHJvY2Vzcy53YWl0KCkKKyAgICAgICAgIGlmIHJldHVybl9jb2RlOgorICAgICAgICAgICAgIHJh aXNlIFNjcmlwdEVycm9yKCIlcyBmYWlsZWQgd2l0aCBleGl0IGNvZGUgJWQiICUgKCIgIi5qb2lu KGFyZ3MpLCByZXR1cm5fY29kZSkpCisKKyAgICAgIyBXZSBtaWdodCBuZWVkIHRvIHBhc3Mgc2Nt IGludG8gdGhpcyBmdW5jdGlvbiBmb3Igc2NtLmNoZWNrb3V0X3Jvb3QKKyAgICAgQHN0YXRpY21l dGhvZAorICAgICBkZWYgd2Via2l0X3NjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKToKKyAgICAgICAg IHJldHVybiBvcy5wYXRoLmpvaW4oIldlYktpdFRvb2xzIiwgIlNjcmlwdHMiLCBzY3JpcHRfbmFt ZSkKKworICAgICBAY2xhc3NtZXRob2QKKyAgICAgZGVmIHJ1bl93ZWJraXRfc2NyaXB0KGNscywg c2NyaXB0X25hbWUsIHF1aWV0PUZhbHNlKToKKyAgICAgICAgIHByaW50ICJSdW5uaW5nIFdlYktp dCBTY3JpcHQgIiArIHNjcmlwdF9uYW1lCisgICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9m YWlsKGNscy53ZWJraXRfc2NyaXB0X3BhdGgoc2NyaXB0X25hbWUpLCBxdWlldCkKKworICAgICBA Y2xhc3NtZXRob2QKKyAgICAgZGVmIGJ1aWxkX3dlYmtpdChjbHMsIHF1aWV0PUZhbHNlKToKKyAg ICAgICAgIGNscy5ydW5fd2Via2l0X3NjcmlwdCgiYnVpbGQtd2Via2l0IiwgcXVpZXQpCisKKyAg ICAgQGNsYXNzbWV0aG9kCisgICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzKGNscywgbGF1bmNoX3Nh ZmFyaSwgcXVpZXQ9RmFsc2UpOgorICAgICAgICAgYXJncyA9IFtjbHMud2Via2l0X3NjcmlwdF9w YXRoKCJydW4td2Via2l0LXRlc3RzIildCisgICAgICAgICBpZiBub3QgbGF1bmNoX3NhZmFyaToK KyAgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1uby1sYXVuY2gtc2FmYXJpIikKKyAgICAgICAg IGlmIHF1aWV0OgorICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLXF1aWV0IikKKyAgICAgICAg IGNscy5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncykKKworICAgICBAc3RhdGljbWV0aG9kCisg ICAgIGRlZiBzZXR1cF9mb3JfbGFuZGluZyhzY20sIG9wdGlvbnMpOgorICAgICAgICAgb3MuY2hk aXIoc2NtLmNoZWNrb3V0X3Jvb3QpCisgICAgICAgICBzY20uZW5zdXJlX25vX2xvY2FsX2NvbW1p dHMob3B0aW9ucy5mb3JjZV9jbGVhbikKKyAgICAgICAgIGlmIG9wdGlvbnMuY2xlYW46CisgICAg ICAgICAgICAgc2NtLmVuc3VyZV9jbGVhbl93b3JraW5nX2RpcmVjdG9yeShvcHRpb25zLmZvcmNl X2NsZWFuKQorCisgICAgIEBjbGFzc21ldGhvZAorICAgICBkZWYgYnVpbGRfYW5kX2NvbW1pdChj bHMsIHNjbSwgb3B0aW9ucyk6CisgICAgICAgICBpZiBvcHRpb25zLmJ1aWxkOgorICAgICAgICAg ICAgIGNscy5idWlsZF93ZWJraXQocXVpZXQ9b3B0aW9ucy5xdWlldCkKKyAgICAgICAgICAgICBp ZiBvcHRpb25zLnRlc3Q6CisgICAgICAgICAgICAgICAgIGNscy5ydW5fd2Via2l0X3Rlc3RzKGxh dW5jaF9zYWZhcmk9bm90IG9wdGlvbnMuY29tbWl0X3F1ZXVlLCBxdWlldD1vcHRpb25zLnF1aWV0 KQorICAgICAgICAgY29tbWl0X21lc3NhZ2UgPSBjb21taXRfbWVzc2FnZV9mb3JfdGhpc19jb21t aXQoc2NtKQorICAgICAgICAgY29tbWl0X2xvZyA9IHNjbS5jb21taXRfd2l0aF9tZXNzYWdlKGNv bW1pdF9tZXNzYWdlLm1lc3NhZ2UoKSkKKyAgICAgICAgIHJldHVybiBidWdfY29tbWVudF9mcm9t X2NvbW1pdF90ZXh0KHNjbSwgY29tbWl0X2xvZykKKworCiBjbGFzcyBMYW5kQW5kVXBkYXRlQnVn KENvbW1hbmQpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IFsK ICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItciIsICItLXJldmlld2VyIiwgYWN0aW9uPSJzdG9y ZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9InJldmlld2VyIiwgaGVscD0iVXBkYXRlIENoYW5nZUxv Z3MgdG8gc2F5IFJldmlld2VkIGJ5IFJFVklFV0VSLiIpLAotICAgICAgICAgICAgbWFrZV9vcHRp b24oIi0tbm8tY2xvc2UiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xvc2VfYnVnIiwg ZGVmYXVsdD1UcnVlLCBoZWxwPSJMZWF2ZSBidWcgb3BlbiBhZnRlciBsYW5kaW5nLiIpLAotICAg ICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tYnVpbGQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwg ZGVzdD0iYnVpbGQiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IGJ1aWxkaW5n IGZpcnN0LCBpbXBsaWVzIC0tbm8tdGVzdC4iKSwKLSAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCIt LW5vLXRlc3QiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0idGVzdCIsIGRlZmF1bHQ9VHJ1 ZSwgaGVscD0iQ29tbWl0IHdpdGhvdXQgcnVubmluZyBydW4td2Via2l0LXRlc3RzLiIpLAotICAg ICAgICAgICAgbWFrZV9vcHRpb24oIi0tcXVpZXQiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0 PSJxdWlldCIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IlByb2R1Y2UgbGVzcyBjb25zb2xlIG91dHB1 dC4iKSwKLSAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLWNvbW1pdC1xdWV1ZSIsIGFjdGlvbj0i c3RvcmVfdHJ1ZSIsIGRlc3Q9ImNvbW1pdF9xdWV1ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IlJ1 biBpbiBjb21taXQgcXVldWUgbW9kZSAobm8gdXNlciBpbnRlcmFjdGlvbikuIiksCiAgICAgICAg IF0KKyAgICAgICAgb3B0aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5sYW5kX29wdGlvbnMo KQogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdMYW5kcyB0aGUgY3VycmVudCB3b3Jr aW5nIGRpcmVjdG9yeSBkaWZmIGFuZCB1cGRhdGVzIHRoZSBidWcgaWYgcHJvdmlkZWQuJywgJ1tC VUdJRF0nLCBvcHRpb25zPW9wdGlvbnMpCiAKICAgICBkZWYgZ3Vlc3NfcmV2aWV3ZXJfZnJvbV9i dWcoc2VsZiwgYnVncywgYnVnX2lkKToKQEAgLTI2Miw3ICszMzAsNyBAQCBjbGFzcyBMYW5kQW5k VXBkYXRlQnVnKENvbW1hbmQpOgogCiAgICAgICAgIHNlbGYudXBkYXRlX2NoYW5nZWxvZ3Nfd2l0 aF9yZXZpZXdlcihvcHRpb25zLnJldmlld2VyLCBidWdfaWQsIHRvb2wpCiAKLSAgICAgICAgY29t bWVudF90ZXh0ID0gTGFuZFBhdGNoZXNGcm9tQnVncy5idWlsZF9hbmRfY29tbWl0KHRvb2wuc2Nt KCksIG9wdGlvbnMpCisgICAgICAgIGNvbW1lbnRfdGV4dCA9IFdlYktpdExhbmRpbmdTY3JpcHRz LmJ1aWxkX2FuZF9jb21taXQodG9vbC5zY20oKSwgb3B0aW9ucykKICAgICAgICAgaWYgYnVnX2lk OgogICAgICAgICAgICAgbG9nKCJVcGRhdGluZyBidWcgJXMiICUgYnVnX2lkKQogICAgICAgICAg ICAgaWYgb3B0aW9ucy5jbG9zZV9idWc6CkBAIC0yNzgsNjcgKzM0NiwxMCBAQCBjbGFzcyBMYW5k QW5kVXBkYXRlQnVnKENvbW1hbmQpOgogCiBjbGFzcyBMYW5kUGF0Y2hlc0Zyb21CdWdzKENvbW1h bmQpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgb3B0aW9ucyA9IFsKLSAgICAg ICAgICAgIG1ha2Vfb3B0aW9uKCItLWZvcmNlLWNsZWFuIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwg ZGVzdD0iZm9yY2VfY2xlYW4iLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJDbGVhbiB3b3JraW5nIGRp cmVjdG9yeSBiZWZvcmUgYXBwbHlpbmcgcGF0Y2hlcyAocmVtb3ZlcyBsb2NhbCBjaGFuZ2VzIGFu ZCBjb21taXRzKSIpLAotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY2xlYW4iLCBhY3Rp b249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xlYW4iLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRvbid0 IGNoZWNrIGlmIHRoZSB3b3JraW5nIGRpcmVjdG9yeSBpcyBjbGVhbiBiZWZvcmUgYXBwbHlpbmcg cGF0Y2hlcyIpLAotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY2xvc2UiLCBhY3Rpb249 InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xvc2VfYnVnIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJMZWF2 ZSBidWcgb3BlbiBhZnRlciBsYW5kaW5nLiIpLAotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0t bm8tYnVpbGQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iYnVpbGQiLCBkZWZhdWx0PVRy dWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IGJ1aWxkaW5nIGZpcnN0LCBpbXBsaWVzIC0tbm8tdGVz dC4iKSwKLSAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLXRlc3QiLCBhY3Rpb249InN0b3Jl X2ZhbHNlIiwgZGVzdD0idGVzdCIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iQ29tbWl0IHdpdGhvdXQg cnVubmluZyBydW4td2Via2l0LXRlc3RzLiIpLAotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0t cXVpZXQiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJxdWlldCIsIGRlZmF1bHQ9RmFsc2Us IGhlbHA9IlByb2R1Y2UgbGVzcyBjb25zb2xlIG91dHB1dC4iKSwKLSAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLWNvbW1pdC1xdWV1ZSIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImNvbW1p dF9xdWV1ZSIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IlJ1biBpbiBjb21taXQgcXVldWUgbW9kZSAo bm8gdXNlciBpbnRlcmFjdGlvbikuIiksCi0gICAgICAgIF0KKyAgICAgICAgb3B0aW9ucyA9IFdl YktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlvbnMoKQorICAgICAgICBvcHRpb25zICs9 IFdlYktpdExhbmRpbmdTY3JpcHRzLmxhbmRfb3B0aW9ucygpCiAgICAgICAgIENvbW1hbmQuX19p bml0X18oc2VsZiwgJ0xhbmRzIGFsbCBwYXRjaGVzIG9uIGEgYnVnIG9wdGlvbmFsbHkgdGVzdGlu ZyB0aGVtIGZpcnN0JywgJ0JVR0lEJywgb3B0aW9ucz1vcHRpb25zKQogCi0gICAgQHN0YXRpY21l dGhvZAotICAgIGRlZiBydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgcXVpZXQ9RmFsc2UpOgot ICAgICAgICBjaGlsZF9zdGRvdXQgPSBzdWJwcm9jZXNzLlBJUEUgaWYgcXVpZXQgZWxzZSBOb25l Ci0gICAgICAgIGNoaWxkX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIHN0ZG91dD1j aGlsZF9zdGRvdXQpCi0gICAgICAgIGlmIGNoaWxkX3Byb2Nlc3Muc3Rkb3V0OgotICAgICAgICAg ICAgY2hpbGRfcHJvY2Vzcy5jb21tdW5pY2F0ZSgpCi0gICAgICAgIHJldHVybl9jb2RlID0gY2hp bGRfcHJvY2Vzcy53YWl0KCkKLSAgICAgICAgaWYgcmV0dXJuX2NvZGU6Ci0gICAgICAgICAgICBy YWlzZSBTY3JpcHRFcnJvcigiJXMgZmFpbGVkIHdpdGggZXhpdCBjb2RlICVkIiAlICgiICIuam9p bihhcmdzKSwgcmV0dXJuX2NvZGUpKQotCi0gICAgIyBXZSBtaWdodCBuZWVkIHRvIHBhc3Mgc2Nt IGludG8gdGhpcyBmdW5jdGlvbiBmb3Igc2NtLmNoZWNrb3V0X3Jvb3QKLSAgICBAc3RhdGljbWV0 aG9kCi0gICAgZGVmIHdlYmtpdF9zY3JpcHRfcGF0aChzY3JpcHRfbmFtZSk6Ci0gICAgICAgIHJl dHVybiBvcy5wYXRoLmpvaW4oIldlYktpdFRvb2xzIiwgIlNjcmlwdHMiLCBzY3JpcHRfbmFtZSkK LQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0X3NjcmlwdChjbHMsIHNjcmlw dF9uYW1lLCBxdWlldD1GYWxzZSk6Ci0gICAgICAgIHByaW50ICJSdW5uaW5nIFdlYktpdCBTY3Jp cHQgIiArIHNjcmlwdF9uYW1lCi0gICAgICAgIGNscy5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoY2xz LndlYmtpdF9zY3JpcHRfcGF0aChzY3JpcHRfbmFtZSksIHF1aWV0KQotCi0gICAgQGNsYXNzbWV0 aG9kCi0gICAgZGVmIGJ1aWxkX3dlYmtpdChjbHMsIHF1aWV0PUZhbHNlKToKLSAgICAgICAgY2xz LnJ1bl93ZWJraXRfc2NyaXB0KCJidWlsZC13ZWJraXQiLCBxdWlldCkKLQotICAgIEBjbGFzc21l dGhvZAotICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzKGNscywgbGF1bmNoX3NhZmFyaSwgcXVpZXQ9 RmFsc2UpOgotICAgICAgICBhcmdzID0gW2Nscy53ZWJraXRfc2NyaXB0X3BhdGgoInJ1bi13ZWJr aXQtdGVzdHMiKV0KLSAgICAgICAgaWYgbm90IGxhdW5jaF9zYWZhcmk6Ci0gICAgICAgICAgICBh cmdzLmFwcGVuZCgiLS1uby1sYXVuY2gtc2FmYXJpIikKLSAgICAgICAgaWYgcXVpZXQ6Ci0gICAg ICAgICAgICBhcmdzLmFwcGVuZCgiLS1xdWlldCIpCi0gICAgICAgIGNscy5ydW5fYW5kX3Rocm93 X2lmX2ZhaWwoYXJncykKLQotICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgc2V0dXBfZm9yX2xh bmRpbmcoc2NtLCBvcHRpb25zKToKLSAgICAgICAgb3MuY2hkaXIoc2NtLmNoZWNrb3V0X3Jvb3Qp Ci0gICAgICAgIHNjbS5lbnN1cmVfbm9fbG9jYWxfY29tbWl0cyhvcHRpb25zLmZvcmNlX2NsZWFu KQotICAgICAgICBpZiBvcHRpb25zLmNsZWFuOgotICAgICAgICAgICAgc2NtLmVuc3VyZV9jbGVh bl93b3JraW5nX2RpcmVjdG9yeShvcHRpb25zLmZvcmNlX2NsZWFuKQotCi0gICAgQGNsYXNzbWV0 aG9kCi0gICAgZGVmIGJ1aWxkX2FuZF9jb21taXQoY2xzLCBzY20sIG9wdGlvbnMpOgotICAgICAg ICBpZiBvcHRpb25zLmJ1aWxkOgotICAgICAgICAgICAgY2xzLmJ1aWxkX3dlYmtpdChxdWlldD1v cHRpb25zLnF1aWV0KQotICAgICAgICAgICAgaWYgb3B0aW9ucy50ZXN0OgotICAgICAgICAgICAg ICAgIGNscy5ydW5fd2Via2l0X3Rlc3RzKGxhdW5jaF9zYWZhcmk9bm90IG9wdGlvbnMuY29tbWl0 X3F1ZXVlLCBxdWlldD1vcHRpb25zLnF1aWV0KQotICAgICAgICBjb21taXRfbWVzc2FnZSA9IGNv bW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdChzY20pCi0gICAgICAgIGNvbW1pdF9sb2cgPSBz Y20uY29tbWl0X3dpdGhfbWVzc2FnZShjb21taXRfbWVzc2FnZS5tZXNzYWdlKCkpCi0gICAgICAg IHJldHVybiBidWdfY29tbWVudF9mcm9tX2NvbW1pdF90ZXh0KHNjbSwgY29tbWl0X2xvZykKLQog ICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBsYW5kX3BhdGNoZXMoY2xzLCBidWdfaWQsIHBhdGNo ZXMsIG9wdGlvbnMsIHRvb2wpOgogICAgICAgICB0cnk6CkBAIC0zNDYsNyArMzU3LDcgQEAgY2xh c3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKICAgICAgICAgICAgIGZvciBwYXRjaCBp biBwYXRjaGVzOgogICAgICAgICAgICAgICAgIHRvb2wuc2NtKCkudXBkYXRlX3dlYmtpdCgpICMg VXBkYXRlIGJlZm9yZSBldmVyeSBwYXRjaCBpbiBjYXNlIHRoZSB0cmVlIGhhcyBjaGFuZ2VkCiAg ICAgICAgICAgICAgICAgdG9vbC5zY20oKS5hcHBseV9wYXRjaChwYXRjaCwgZm9yY2U9b3B0aW9u cy5jb21taXRfcXVldWUpCi0gICAgICAgICAgICAgICAgY29tbWVudF90ZXh0ID0gY2xzLmJ1aWxk X2FuZF9jb21taXQodG9vbC5zY20oKSwgb3B0aW9ucykKKyAgICAgICAgICAgICAgICBjb21tZW50 X3RleHQgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9hbmRfY29tbWl0KHRvb2wuc2NtKCks IG9wdGlvbnMpCiAgICAgICAgICAgICAgICAgdG9vbC5idWdzLmNsZWFyX2F0dGFjaG1lbnRfcmV2 aWV3X2ZsYWcocGF0Y2hbJ2lkJ10sIGNvbW1lbnRfdGV4dCkKIAogICAgICAgICAgICAgaWYgb3B0 aW9ucy5jbG9zZV9idWc6CkBAIC0zNzUsNyArMzg2LDcgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9t QnVncyhDb21tYW5kKToKIAogICAgICAgICBsb2coIkxhbmRpbmcgJXMgZnJvbSAlcy4iICUgKHBs dXJhbGl6ZSgicGF0Y2giLCBwYXRjaF9jb3VudCksIHBsdXJhbGl6ZSgiYnVnIiwgbGVuKGFyZ3Mp KSkpCiAKLSAgICAgICAgc2VsZi5zZXR1cF9mb3JfbGFuZGluZyh0b29sLnNjbSgpLCBvcHRpb25z KQorICAgICAgICBXZWJLaXRMYW5kaW5nU2NyaXB0cy5zZXR1cF9mb3JfbGFuZGluZyh0b29sLnNj bSgpLCBvcHRpb25zKQogCiAgICAgICAgIGZvciBidWdfaWQgaW4gYnVnc190b19wYXRjaGVzLmtl eXMoKToKICAgICAgICAgICAgIHNlbGYubGFuZF9wYXRjaGVzKGJ1Z19pZCwgYnVnc190b19wYXRj aGVzW2J1Z19pZF0sIG9wdGlvbnMsIHRvb2wp