218134 2020-10-23 13:00:45 -0700 [webkitscmpy] Assume default branch when no branch specified 2020-11-11 16:35:39 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dean_johnson dewei_zhu slewis webkit-bug-importer oldest_to_newest 1701122 0 jbedard 2020-10-23 13:00:45 -0700 Currently, if the most recent commit to SVN was not on the default branch, we will attempt to compute identifiers on that branch rather than the default branch. This is also true in Git, but less serious because this can only happen if the user has their checkout on that branch. I'm not entirely certain what we want the behavior here to be, but I'm fairly certain the current behavior is wrong. 1701123 1 webkit-bug-importer 2020-10-23 13:01:16 -0700 <rdar://problem/70631274> 1701124 2 jbedard 2020-10-23 13:01:53 -0700 I think the correct behavior here is to always assume the default branch when no branch is specified, that way the script does not behave differently based on the state of the checkout. 1701132 3 412208 jbedard 2020-10-23 13:31:22 -0700 Created attachment 412208 Patch 1706667 4 jbedard 2020-11-11 16:35:39 -0800 After working on https://bugs.webkit.org/show_bug.cgi?id=218827, I'm quite convinced we should land this change. 412208 2020-10-23 13:31:22 -0700 2020-10-23 13:31:22 -0700 Patch bug-218134-20201023133122.patch text/plain 4061 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODkzOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTEwLTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFzc3VtZSBkZWZhdWx0IGJyYW5jaCB3aGVuIG5v IGJyYW5jaCBzcGVjaWZpZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxODEzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzA2MzEyNzQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogVmVyc2lvbiBidW1w LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5jb21taXQpOiBQcmVmZXIgdGhlIGRlZmF1bHQgYnJh bmNoIG92ZXIgdGhlIGN1cnJlbnQgYnJhbmNoLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAgKFN2bi5jb21t aXQpOiBEaXR0by4KKwogMjAyMC0xMC0yMyAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjY4NzYxLgpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2ODkzNykKKysrIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkp CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBp bnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRy YS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVy c2lvbigwLCAyLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMiwgNSkKIAogQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnZGF0ZXV0aWwnLCBWZXJzaW9uKDIsIDgsIDEpLCBweXBpX25hbWU9 J3B5dGhvbi1kYXRldXRpbCcpKQogCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZp c2lvbiAyNjg5MzcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTE4NSwxNiArMTg1LDEzIEBA IGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAg ICAgICAgICAgKQogICAgICAgICAgICAgICAgIGJyYW5jaCA9IHBhcnNlZF9icmFuY2gKKyAgICAg ICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgYnJhbmNoID0gYnJhbmNoIG9yIGRlZmF1bHRf YnJhbmNoCiAKLSAgICAgICAgICAgIGJhc2VsaW5lID0gYnJhbmNoIG9yICdIRUFEJwotICAgICAg ICAgICAgaXNfZGVmYXVsdCA9IGJhc2VsaW5lID09IGRlZmF1bHRfYnJhbmNoCi0gICAgICAgICAg ICBpZiBiYXNlbGluZSA9PSAnSEVBRCc6Ci0gICAgICAgICAgICAgICAgaXNfZGVmYXVsdCA9IGRl ZmF1bHRfYnJhbmNoIGluIHNlbGYuX2JyYW5jaGVzX2ZvcihiYXNlbGluZSkKLQotICAgICAgICAg ICAgaWYgaXNfZGVmYXVsdCBhbmQgcGFyc2VkX2JyYW5jaF9wb2ludDoKKyAgICAgICAgICAgIGlm IGJyYW5jaCA9PSBkZWZhdWx0X2JyYW5jaCBhbmQgcGFyc2VkX2JyYW5jaF9wb2ludDoKICAgICAg ICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignQ2Fubm90IHByb3ZpZGUgYSBicmFuY2gg cG9pbnQgZm9yIGEgY29tbWl0IG9uIHRoZSBkZWZhdWx0IGJyYW5jaCcpCiAKLSAgICAgICAgICAg IGJhc2VfY291bnQgPSBzZWxmLl9jb21taXRfY291bnQoYmFzZWxpbmUgaWYgaXNfZGVmYXVsdCBl bHNlICd7fS4ue30nLmZvcm1hdChkZWZhdWx0X2JyYW5jaCwgYmFzZWxpbmUpKQorICAgICAgICAg ICAgYmFzZV9jb3VudCA9IHNlbGYuX2NvbW1pdF9jb3VudChicmFuY2ggaWYgYnJhbmNoID09IGRl ZmF1bHRfYnJhbmNoIGVsc2UgJ3t9Li57fScuZm9ybWF0KGRlZmF1bHRfYnJhbmNoLCBicmFuY2gp KQogCiAgICAgICAgICAgICBpZiBpZGVudGlmaWVyID4gYmFzZV9jb3VudDoKICAgICAgICAgICAg ICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignSWRlbnRpZmllciB7fSBjYW5ub3QgYmUgZm91bmQg b24gdGhlIHNwZWNpZmllZCBicmFuY2ggaW4gdGhlIGN1cnJlbnQgY2hlY2tvdXQnLmZvcm1hdChp ZGVudGlmaWVyKSkKQEAgLTIwOCw3ICsyMDUsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAg ICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiRmFpbGVkIHRvIHJldHJpZXZlIGNvbW1pdCBp bmZvcm1hdGlvbiBmb3IgJ2l7fUB7fSciLmZvcm1hdChpZGVudGlmaWVyLCBicmFuY2ggb3IgJ0hF QUQnKSkKIAogICAgICAgICAgICAgIyBOZWdhdGl2ZSBpZGVudGlmaWVycyBhcmUgYWN0dWFsbHkg Y29tbWl0cyBvbiB0aGUgZGVmYXVsdCBicmFuY2gsIHdlIHdpbGwgbmVlZCB0byByZS1jb21wdXRl IHRoZSBpZGVudGlmaWVyCi0gICAgICAgICAgICBpZiBpZGVudGlmaWVyIDwgMCBhbmQgaXNfZGVm YXVsdDoKKyAgICAgICAgICAgIGlmIGlkZW50aWZpZXIgPCAwIGFuZCBicmFuY2ggPT0gZGVmYXVs dF9icmFuY2g6CiAgICAgICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0lsbGVnYWwg bmVnYXRpdmUgaWRlbnRpZmllciBvbiB0aGUgZGVmYXVsdCBicmFuY2gnKQogICAgICAgICAgICAg aWYgaWRlbnRpZmllciA8IDA6CiAgICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IE5vbmUKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2Fs L3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI2ODkzNykKKysrIFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29y a2luZyBjb3B5KQpAQCAtMjU4LDcgKzI1OCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAg ICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgICAg IGJyYW5jaCA9IHBhcnNlZF9icmFuY2gKLSAgICAgICAgICAgIGJyYW5jaCA9IGJyYW5jaCBvciBz ZWxmLmJyYW5jaAorICAgICAgICAgICAgYnJhbmNoID0gYnJhbmNoIG9yIHNlbGYuZGVmYXVsdF9i cmFuY2gKIAogICAgICAgICAgICAgaWYgYnJhbmNoID09IHNlbGYuZGVmYXVsdF9icmFuY2ggYW5k IHBhcnNlZF9icmFuY2hfcG9pbnQ6CiAgICAgICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRp b24oJ0Nhbm5vdCBwcm92aWRlIGEgYnJhbmNoIHBvaW50IGZvciBhIGNvbW1pdCBvbiB0aGUgZGVm YXVsdCBicmFuY2gnKQo=