Changeset 272800 in webkit

Timestamp:

Feb 12, 2021, 12:38:03 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkit-patch] Post both revision and identifier to bugzilla
​https://bugs.webkit.org/show_bug.cgi?id=221829
<rdar://problem/74282619>

Reviewed by Aakash Jain.

• Scripts/webkitpy/tool/commands/download_unittest.py:
• Scripts/webkitpy/tool/commands/upload_unittest.py:
• Scripts/webkitpy/tool/comments.py:

(bug_comment_from_svn_revision): Include subversion revision.

• Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:

(CloseBugForLandDiffTest.test_empty_state):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (6 diffs)
• Scripts/webkitpy/tool/commands/upload_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/comments.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-12  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkit-patch] Post both revision and identifier to bugzilla
+        https://bugs.webkit.org/show_bug.cgi?id=221829
+        <rdar://problem/74282619>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        * Scripts/webkitpy/tool/comments.py:
+        (bug_comment_from_svn_revision): Include subversion revision.
+        * Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
+        (CloseBugForLandDiffTest.test_empty_state):
+
 2021-02-12  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

@@ -195 +195 @@
 MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--quiet'], cwd=/mock-checkout
 Committed r49824: <https://commits.webkit.org/r49824>
-Committed 5@main: <https://commits.webkit.org/5@main>
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>
 No bug id provided.
 """
@@ -324 +324 @@
 MOCK bug comment: bug_id=50000, cc=None, see_also=None
 --- Begin comment ---
-Committed 5@main: <https://commits.webkit.org/5@main>
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>
 --- End comment ---
 
@@ -495 +495 @@
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 """
         with self.mock_svn_remote():
@@ -515 +515 @@
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 MOCK reopen_bug 50005 with comment 'Reverted r852 and r963 for reason:
 
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 """
         with self.mock_svn_remote():
@@ -538 +538 @@
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 MOCK reopen_bug 50005 with comment 'Reverted r852, r963, and r3001 for reason:
 
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 MOCK reopen_bug 50004 with comment 'Reverted r852, r963, and r3001 for reason:
 
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 """
         with self.mock_svn_remote():
@@ -566 +566 @@
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 MOCK reopen_bug 50005 with comment 'Reverted r852, r963, and r999 for reason:
 
 Reason
 
-Committed 5@main: <https://commits.webkit.org/5@main>'
+Committed r49824 (5@main): <https://commits.webkit.org/5@main>'
 """
         with self.mock_svn_remote():

trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

@@ -203 +203 @@
 MOCK comment
 
-Committed 5@main: <https://commits.webkit.org/5@main>
+Committed r9876 (5@main): <https://commits.webkit.org/5@main>
 --- End comment ---
 

trunk/Tools/Scripts/webkitpy/tool/comments.py

@@ -38 +38 @@
     repo = remote.Svn('https://svn.webkit.org/repository/webkit')
     identifier = str(repo.commit(revision=svn_revision)).replace('trunk', 'main')
-    return "Committed {}: <{}>".format(identifier, urls.view_identifier_url(identifier))
+    return 'Committed r{} ({}): <{}>'.format(svn_revision, identifier, urls.view_identifier_url(identifier))
 
 

trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py

@@ -60 +60 @@
             self.assertEqual(
                 captured.root.log.getvalue(),
-                'Committed 5@main: <https://commits.webkit.org/5@main>\nNo bug id provided.\n'
+                'Committed r49824 (5@main): <https://commits.webkit.org/5@main>\nNo bug id provided.\n'
             )