Title: [266135] trunk/Tools
- Revision
- 266135
- Author
- [email protected]
- Date
- 2020-08-25 11:37:45 -0700 (Tue, 25 Aug 2020)
Log Message
REGRESSION(r265601): invalid blame URL copied when `include_revision` is `false`
https://bugs.webkit.org/show_bug.cgi?id=215796
Reviewed by Daniel Bates.
* CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py:
(CopyWebKitPermalinkCommand.permalink_for_path):
Always add `?` to the URL before the revision and/or blame and have each have their own `&`.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (266134 => 266135)
--- trunk/Tools/ChangeLog 2020-08-25 18:07:57 UTC (rev 266134)
+++ trunk/Tools/ChangeLog 2020-08-25 18:37:45 UTC (rev 266135)
@@ -1,3 +1,14 @@
+2020-08-25 Devin Rousso <[email protected]>
+
+ REGRESSION(r265601): invalid blame URL copied when `include_revision` is `false`
+ https://bugs.webkit.org/show_bug.cgi?id=215796
+
+ Reviewed by Daniel Bates.
+
+ * CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py:
+ (CopyWebKitPermalinkCommand.permalink_for_path):
+ Always add `?` to the URL before the revision and/or blame and have each have their own `&`.
+
2020-08-25 Jer Noble <[email protected]>
[Mac] REGRESSION(r262322): Focusable elements are focused when exiting from video fullscreen mode.
Modified: trunk/Tools/CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py (266134 => 266135)
--- trunk/Tools/CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py 2020-08-25 18:07:57 UTC (rev 266134)
+++ trunk/Tools/CopyPermalink/Sublime Text/CopyWebKitPermalink/CopyWebKitPermalink.py 2020-08-25 18:37:45 UTC (rev 266135)
@@ -187,11 +187,11 @@
@staticmethod
def permalink_for_path(path, line_number, revision_info, annotate_blame):
- revision = '?rev=' + str(revision_info['revision']) if 'revision' in revision_info else ''
+ revision = '&rev=' + str(revision_info['revision']) if 'revision' in revision_info else ''
line_number = '#L' + str(line_number) if line_number else ''
branch = revision_info.get('branch', 'trunk')
annotate_blame = '&annotate=blame' if annotate_blame else ''
- return 'https://trac.webkit.org/browser/{}/{}{}{}{}'.format(branch, path, revision, annotate_blame, line_number)
+ return 'https://trac.webkit.org/browser/{}/{}?{}{}{}'.format(branch, path, revision, annotate_blame, line_number)
@staticmethod
def is_svn_directory(directory):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
