Title: [211134] trunk/Tools
- Revision
- 211134
- Author
- [email protected]
- Date
- 2017-01-24 20:25:51 -0800 (Tue, 24 Jan 2017)
Log 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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (211133 => 211134)
--- trunk/Tools/ChangeLog 2017-01-25 04:23:27 UTC (rev 211133)
+++ trunk/Tools/ChangeLog 2017-01-25 04:25:51 UTC (rev 211134)
@@ -1,5 +1,18 @@
2017-01-24 Joseph Pecoraro <[email protected]>
+ 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 <[email protected]>
+
Fold USER_TIMING into WEB_TIMING and make it a RuntimeEnabledFeature
https://bugs.webkit.org/show_bug.cgi?id=167394
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py (211133 => 211134)
--- trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2017-01-25 04:23:27 UTC (rev 211133)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2017-01-25 04:25:51 UTC (rev 211134)
@@ -113,17 +113,6 @@
@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 @@
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')
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py (211133 => 211134)
--- trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py 2017-01-25 04:23:27 UTC (rev 211133)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py 2017-01-25 04:25:51 UTC (rev 211134)
@@ -67,6 +67,22 @@
"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 | [email protected] | 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 <[email protected]> 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 | [email protected] | 2013-02-16 09:09:01 -0800 (Sat, 16 Feb 2013) | 27 lines
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
