WKR does not include my nick when commit-queue lands my patch
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jan 2017 04:25:51 +0000 (04:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jan 2017 04:25:51 +0000 (04:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167388

Patch by Joseph Pecoraro <pecoraro@apple.com> 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@211134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/tool/commands/newcommitbot.py
Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py

index dea7a1d2e033d1e35697f20e8ee80f330c37a960..2854dc5b1495f337741c4f0ea8990d8eb63056b3 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         Fold USER_TIMING into WEB_TIMING and make it a RuntimeEnabledFeature
index 40c6217dcea22246c487774e8b5402825662aa2f..abfdbe4595033eb0ecfd0bbc1404a838a06d8eeb 100644 (file)
@@ -113,17 +113,6 @@ class NewCommitBot(AbstractQueue, StepSequenceErrorHandler):
 
     @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:
                 continue
@@ -136,10 +125,22 @@ class NewCommitBot(AbstractQueue, StepSequenceErrorHandler):
                 for email in contributor.emails:
                     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:
             author = patch_by.group('author')
index 7d3a383c54ebf17048295408fc08363dc7c48840..444e352dd40f4c27817c2b6598584a11af9efe9f 100644 (file)
@@ -67,6 +67,22 @@ instead of "false".
             "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):
         self.assertEqual(NewCommitBot._summarize_commit_log("""------------------------------------------------------------------------
 r143104 | commit-queue@webkit.org | 2013-02-16 09:09:01 -0800 (Sat, 16 Feb 2013) | 27 lines