Changeset 211134 in webkit

Timestamp:

Jan 24, 2017, 8:25:51 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

WKR does not include my nick when commit-queue lands my patch
​https://bugs.webkit.org/show_bug.cgi?id=167388

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-01-24
Reviewed by Ryosuke Niwa.

• Scripts/webkitpy/tool/commands/newcommitbot.py:

(NewCommitBot._summarize_commit_log):

• Scripts/webkitpy/tool/commands/newcommitbot_unittest.py:

Perform nickname insertion before grabbing "Patch by" details.
This way we can include the nickname with the full name.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/newcommitbot.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/newcommitbot_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
+
+        WKR does not include my nick when commit-queue lands my patch
+        https://bugs.webkit.org/show_bug.cgi?id=167388
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/tool/commands/newcommitbot.py:
+        (NewCommitBot._summarize_commit_log):
+        * Scripts/webkitpy/tool/commands/newcommitbot_unittest.py:
+        Perform nickname insertion before grabbing "Patch by" details.
+        This way we can include the nickname with the full name.
+
 2017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -114 +114 @@
     @classmethod
     def _summarize_commit_log(self, commit_log, committer_list=CommitterList()):
-        patch_by = self._patch_by_regex.search(commit_log)
-        commit_log = self._patch_by_regex.sub('', commit_log, count=1)
-
-        rollout = self._rollout_regex.search(commit_log)
-        commit_log = self._rollout_regex.sub('', commit_log, count=1)
-
-        requested_by = self._requested_by_regex.search(commit_log)
-
-        commit_log = self._bugzilla_url_regex.sub(r'https://webkit.org/b/\g<id>', commit_log)
-        commit_log = self._trac_url_regex.sub(r'https://trac.webkit.org/r\g<revision>', commit_log)
-
         for contributor in committer_list.contributors():
             if not contributor.irc_nicknames:
@@ -137 +126 @@
                     commit_log = commit_log.replace(' %s ' % email, ' %s ' % name_with_nick)
 
+        patch_by = self._patch_by_regex.search(commit_log)
+        commit_log = self._patch_by_regex.sub('', commit_log, count=1)
+
+        rollout = self._rollout_regex.search(commit_log)
+        commit_log = self._rollout_regex.sub('', commit_log, count=1)
+
+        requested_by = self._requested_by_regex.search(commit_log)
+
+        commit_log = self._bugzilla_url_regex.sub(r'https://webkit.org/b/\g<id>', commit_log)
+        commit_log = self._trac_url_regex.sub(r'https://trac.webkit.org/r\g<revision>', commit_log)
+
         lines = commit_log.split('\n')[1:-2]  # Ignore lines with ----------.
 
         firstline = re.match(r'^(?P<revision>r\d+) \| (?P<email>[^\|]+) \| (?P<timestamp>[^|]+) \| [^\n]+', lines[0])
         assert firstline
+
         author = firstline.group('email')
         if patch_by:

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

@@ -67 +67 @@
             "https://trac.webkit.org/r140066 by Simon Fraser (smfr)"
             " Allow PaintInfo to carry all PaintBehavior flags https://webkit.org/b/106980 Reviewed by Beth Dakin (dethbakin).")
+
+        self.assertEqual(NewCommitBot._summarize_commit_log("""------------------------------------------------------------------------
+r211085 | commit-queue@webkit.org | 2017-01-24 09:01:44 -0800 (Tue, 24 Jan 2017) | 9 lines
+
+Remove always true openGLMultisamplingEnabled setting
+https://bugs.webkit.org/show_bug.cgi?id=167364
+
+Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-01-24
+Reviewed by Sam Weinig.
+
+* html/canvas/WebGLRenderingContextBase.cpp:
+(WebCore::WebGLRenderingContextBase::create):
+* page/Settings.in:
+------------------------------------------------------------------------"""),
+            "https://trac.webkit.org/r211085 by Joseph Pecoraro (JoePeck)"
+            " Remove always true openGLMultisamplingEnabled setting https://webkit.org/b/167364 Reviewed by Sam Weinig (weinig).")
 
     def test_summarize_commit_log_rollout(self):