215796 2020-08-24 21:57:42 -0700 REGRESSION(r265601): invalid blame URL copied when `include_revision` is `false` 2020-08-25 11:38:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215440 1 hi hi dbates hi joepeck keith_miller webkit-bug-importer oldest_to_newest 1682574 0 hi 2020-08-24 21:57:42 -0700 # STEPS TO REPRODUCE: 1. copy `CopyWebKitPermalink.sublime-settings` into `Packages/User` 2. set `"include_revision"` to `false` 3. attempt to "Copy WebKit Permalink to Blame" in any file in the tree => URL is missing "?" 1682575 1 407172 hi 2020-08-24 21:59:58 -0700 Created attachment 407172 Patch 1682579 2 407172 dbates 2020-08-24 22:40:55 -0700 Comment on attachment 407172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407172&action=review > Tools/CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py:194 > + return 'https://trac.webkit.org/browser/{}/{}?{}{}{}'.format(branch, path, revision, annotate_blame, line_number) This doesn't look correct. Looks like ?&rev can be formed. 1682706 3 407172 hi 2020-08-25 10:46:24 -0700 Comment on attachment 407172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407172&action=review >> Tools/CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py:194 >> + return 'https://trac.webkit.org/browser/{}/{}?{}{}{}'.format(branch, path, revision, annotate_blame, line_number) > > This doesn't look correct. Looks like ?&rev can be formed. Yes, that was somewhat intentional. I figured this would be easier and more straightforward than adding a bunch of `if`s to determine whether to put the `?` on the `revision` or on the `annotate_blame`. AFAIK, having `?&` in a URL is valid, and it worked just fine with <https://trac.webkit.org/>. 1682719 4 ews-feeder 2020-08-25 11:37:49 -0700 Committed r266135: <https://trac.webkit.org/changeset/266135> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407172. 1682720 5 webkit-bug-importer 2020-08-25 11:38:20 -0700 <rdar://problem/67749448> 407172 2020-08-24 21:59:58 -0700 2020-08-25 11:37:50 -0700 Patch bug-215796-20200824215957.patch text/plain 2087 hi ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0N2Q5 NGNiMzAwN2QxNWUwNzRhOGY2MDQxY2JiMTI5ODBkNjc2ZGJkLi5iMWVkYzljOTY4NTQ5ZjFlZWU2 NTMwOTc1ZGU2MDc5ZWMzODI4ZWJmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDgtMjQgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI2NTYwMSk6IGlu dmFsaWQgYmxhbWUgVVJMIGNvcGllZCB3aGVuIGBpbmNsdWRlX3JldmlzaW9uYCBpcyBgZmFsc2Vg CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU3OTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIENvcHlQ ZXJtYWxpbmsvU3VibGltZSBUZXh0L0NvcHlXZWJLaXRQZXJtYWxpbmsvQ29weVdlYktpdFBlcm1h bGluay5weToKKyAgICAgICAgKENvcHlXZWJLaXRQZXJtYWxpbmtDb21tYW5kLnBlcm1hbGlua19m b3JfcGF0aCk6CisgICAgICAgIEFsd2F5cyBhZGQgYD9gIHRvIHRoZSBVUkwgYmVmb3JlIHRoZSBy ZXZpc2lvbiBhbmQvb3IgYmxhbWUgYW5kIGhhdmUgZWFjaCBoYXZlIHRoZWlyIG93biBgJmAuCisK IDIwMjAtMDgtMjQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAg ICAgIFtyZXN1bHRzZGJweV0gRml4IHBpcCBwYWNrYWdlCmRpZmYgLS1naXQgYS9Ub29scy9Db3B5 UGVybWFsaW5rL1N1YmxpbWUgVGV4dC9Db3B5V2ViS2l0UGVybWFsaW5rL0NvcHlXZWJLaXRQZXJt YWxpbmsucHkgYi9Ub29scy9Db3B5UGVybWFsaW5rL1N1YmxpbWUgVGV4dC9Db3B5V2ViS2l0UGVy bWFsaW5rL0NvcHlXZWJLaXRQZXJtYWxpbmsucHkKaW5kZXggNTYwNGEwNTZiZDkyYjI3MWVkNzll ZmU4MzhiNzZkZDc4MDgxMTBlMC4uY2RhNDdhYjE3NzIxN2I3NDlhMTA4ODIwMjc3MTI2MjcyN2M3 N2NmNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ29weVBlcm1hbGluay9TdWJsaW1lIFRleHQvQ29weVdl YktpdFBlcm1hbGluay9Db3B5V2ViS2l0UGVybWFsaW5rLnB5CQorKysgYi9Ub29scy9Db3B5UGVy bWFsaW5rL1N1YmxpbWUgVGV4dC9Db3B5V2ViS2l0UGVybWFsaW5rL0NvcHlXZWJLaXRQZXJtYWxp bmsucHkJCkBAIC0xODcsMTEgKzE4NywxMSBAQCBjbGFzcyBDb3B5V2ViS2l0UGVybWFsaW5rQ29t bWFuZChzdWJsaW1lX3BsdWdpbi5UZXh0Q29tbWFuZCk6CiAKICAgICBAc3RhdGljbWV0aG9kCiAg ICAgZGVmIHBlcm1hbGlua19mb3JfcGF0aChwYXRoLCBsaW5lX251bWJlciwgcmV2aXNpb25faW5m bywgYW5ub3RhdGVfYmxhbWUpOgotICAgICAgICByZXZpc2lvbiA9ICc/cmV2PScgKyBzdHIocmV2 aXNpb25faW5mb1sncmV2aXNpb24nXSkgaWYgJ3JldmlzaW9uJyBpbiByZXZpc2lvbl9pbmZvIGVs c2UgJycKKyAgICAgICAgcmV2aXNpb24gPSAnJnJldj0nICsgc3RyKHJldmlzaW9uX2luZm9bJ3Jl dmlzaW9uJ10pIGlmICdyZXZpc2lvbicgaW4gcmV2aXNpb25faW5mbyBlbHNlICcnCiAgICAgICAg IGxpbmVfbnVtYmVyID0gJyNMJyArIHN0cihsaW5lX251bWJlcikgaWYgbGluZV9udW1iZXIgZWxz ZSAnJwogICAgICAgICBicmFuY2ggPSByZXZpc2lvbl9pbmZvLmdldCgnYnJhbmNoJywgJ3RydW5r JykKICAgICAgICAgYW5ub3RhdGVfYmxhbWUgPSAnJmFubm90YXRlPWJsYW1lJyBpZiBhbm5vdGF0 ZV9ibGFtZSBlbHNlICcnCi0gICAgICAgIHJldHVybiAnaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcv YnJvd3Nlci97fS97fXt9e317fScuZm9ybWF0KGJyYW5jaCwgcGF0aCwgcmV2aXNpb24sIGFubm90 YXRlX2JsYW1lLCBsaW5lX251bWJlcikKKyAgICAgICAgcmV0dXJuICdodHRwczovL3RyYWMud2Vi a2l0Lm9yZy9icm93c2VyL3t9L3t9P3t9e317fScuZm9ybWF0KGJyYW5jaCwgcGF0aCwgcmV2aXNp b24sIGFubm90YXRlX2JsYW1lLCBsaW5lX251bWJlcikKIAogICAgIEBzdGF0aWNtZXRob2QKICAg ICBkZWYgaXNfc3ZuX2RpcmVjdG9yeShkaXJlY3RvcnkpOgo=