Changeset 143119 in webkit
- Timestamp:
- Feb 16, 2013 5:03:59 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
-
ChangeLog (modified) (1 diff)
-
Scripts/webkitpy/tool/commands/newcommitbot.py (modified) (3 diffs)
-
Scripts/webkitpy/tool/commands/newcommitbot_unittest.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r143109 r143119 1 2013-02-16 Ryosuke Niwa <rniwa@webkit.org> 2 3 new-commit-bot should report the full name of committer and reviewer instead of just nicks 4 https://bugs.webkit.org/show_bug.cgi?id=110040 5 6 Reviewed by Darin Adler. 7 8 Have it report names like "Ryosuke Niwa (rniwa)" instead of just "rniwa". 9 10 * Scripts/webkitpy/tool/commands/newcommitbot.py: 11 (NewCommitBot): 12 (NewCommitBot._summarize_commit_log): 13 * Scripts/webkitpy/tool/commands/newcommitbot_unittest.py: 14 1 15 2013-02-16 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py
r143109 r143119 101 101 102 102 _patch_by_regex = re.compile(r'^Patch\s+by\s+(?P<author>.+?)\s+on(\s+\d{4}-\d{2}-\d{2})?\n?', re.MULTILINE | re.IGNORECASE) 103 _rollout_regex = re.compile(r'(rolling out|reverting) (?P<revisions>r?\d+((,\s*|,?\s*and\s+)?r?\d+)*)\.? ', re.MULTILINE | re.IGNORECASE)104 _requested_by_regex = re.compile(r'^\"?(?P<reason>.+?)\"? \(Requested\s+by\s+(?P<author>.+ )\s+on\s+#webkit\)\.', re.MULTILINE | re.IGNORECASE)103 _rollout_regex = re.compile(r'(rolling out|reverting) (?P<revisions>r?\d+((,\s*|,?\s*and\s+)?r?\d+)*)\.?\s*', re.MULTILINE | re.IGNORECASE) 104 _requested_by_regex = re.compile(r'^\"?(?P<reason>.+?)\"? \(Requested\s+by\s+(?P<author>.+?)\s+on\s+#webkit\)\.', re.MULTILINE | re.IGNORECASE) 105 105 _bugzilla_url_regex = re.compile(r'http(s?)://bugs\.webkit\.org/show_bug\.cgi\?id=(?P<id>\d+)', re.MULTILINE) 106 106 _trac_url_regex = re.compile(r'http(s?)://trac.webkit.org/changeset/(?P<revision>\d+)', re.MULTILINE) … … 122 122 if not contributor.irc_nicknames: 123 123 continue 124 nickname = contributor.irc_nicknames[0] 125 commit_log = commit_log.replace(contributor.full_name, nickname) 126 for email in contributor.emails: 127 commit_log = commit_log.replace(email, nickname) 124 name_with_nick = "%s (%s)" % (contributor.full_name, contributor.irc_nicknames[0]) 125 if contributor.full_name in commit_log: 126 commit_log = commit_log.replace(contributor.full_name, name_with_nick) 127 for email in contributor.emails: 128 commit_log = commit_log.replace(' <' + email + '>', '') 129 else: 130 for email in contributor.emails: 131 commit_log = commit_log.replace(email, name_with_nick) 128 132 129 133 lines = commit_log.split('\n')[1:-2] # Ignore lines with ----------. 130 134 131 firstline = re.match(r'^(?P<revision>r\d+) \| (?P<email>[^\ s\|]+) \| (?P<timestamp>[^|]+) \| [^\n]+', lines[0])135 firstline = re.match(r'^(?P<revision>r\d+) \| (?P<email>[^\|]+) \| (?P<timestamp>[^|]+) \| [^\n]+', lines[0]) 132 136 assert firstline 133 137 author = firstline.group('email') … … 140 144 if rollout: 141 145 if requested_by: 142 return '%s rolled out %s in %s: %s' % (requested_by.group('author'), rollout.group('revisions'), 146 author = requested_by.group('author') 147 contributor = committer_list.contributor_by_irc_nickname(author) 148 if contributor: 149 author = "%s (%s)" % (contributor.full_name, contributor.irc_nicknames[0]) 150 return '%s rolled out %s in %s: %s' % (author, rollout.group('revisions'), 143 151 linkified_revision, requested_by.group('reason')) 144 152 lines[0] = '%s rolled out %s in %s' % (author, rollout.group('revisions'), linkified_revision) 145 153 146 return ' 154 return ' '.join(filter(lambda line: len(line), lines)[0:4]) 147 155 148 156 def handle_unexpected_error(self, failure_map, message): -
trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py
r143109 r143119 48 48 49 49 ------------------------------------------------------------------------"""), 50 "https://trac.webkit.org/r143106 by jochen__[chromium] initialize all variables of TestRunner classes"51 " https://webkit.org/b/110013 Reviewed by abarth.")50 "https://trac.webkit.org/r143106 by Jochen Eisinger (jochen__) [chromium] initialize all variables of TestRunner classes" 51 " https://webkit.org/b/110013 Reviewed by Adam Barth (abarth).") 52 52 53 53 self.assertEqual(NewCommitBot._summarize_commit_log("""------------------------------------------------------------------------ … … 65 65 (WebCore::RenderScrollbarPart::paintIntoRect): 66 66 ------------------------------------------------------------------------"""), 67 "https://trac.webkit.org/r140066 by smfr"68 " Allow PaintInfo to carry all PaintBehavior flags https://webkit.org/b/106980 Reviewed by dethbakin.")67 "https://trac.webkit.org/r140066 by Simon Fraser (smfr)" 68 " Allow PaintInfo to carry all PaintBehavior flags https://webkit.org/b/106980 Reviewed by Beth Dakin (dethbakin).") 69 69 70 70 def test_summarize_commit_log_rollout(self): … … 84 84 85 85 ------------------------------------------------------------------------"""), 86 " ggarenrolled out r142734 in https://trac.webkit.org/r143104: Triggered crashes on lots of websites")86 "Geoffrey Garen (ggaren) rolled out r142734 in https://trac.webkit.org/r143104: Triggered crashes on lots of websites") 87 87 88 88 self.assertEqual(NewCommitBot._summarize_commit_log("""------------------------------------------------------------------------ … … 101 101 102 102 ------------------------------------------------------------------------"""), 103 " kovrolled out 139877 in https://trac.webkit.org/r139884"104 " 105 " https://webkit.org/b/105552It made a couple of API tests fail.")103 "Gustavo Noronha Silva (kov) rolled out 139877 in https://trac.webkit.org/r139884" 104 " [GStreamer][Soup] Let GStreamer provide the buffer data is downloaded to, to avoid copying" 105 " https://webkit.org/b/105552 It made a couple of API tests fail.") 106 106 107 107 self.assertEqual(NewCommitBot._summarize_commit_log("""------------------------------------------------------------------------ … … 126 126 127 127 ------------------------------------------------------------------------"""), 128 "vsevik rolled out r134927 and r134944 in https://trac.webkit.org/r135487: Reverting the reverts after merging.") 128 "Vsevolod Vlasov (vsevik) rolled out r134927 and r134944 in https://trac.webkit.org/r135487:" 129 " Reverting the reverts after merging.")
Note: See TracChangeset
for help on using the changeset viewer.
