Title: [90239] trunk/Tools
- Revision
- 90239
- Author
- [email protected]
- Date
- 2011-07-01 09:54:26 -0700 (Fri, 01 Jul 2011)
Log Message
Teach webkitpy about the new format of our ChangeLog template
r90229 moved the "Need a short description and bug URL" line to the top of the ChangeLog
template. But webkitpy didn't know this, so the various rollout-related commands were
leaving that line in the ChangeLog.
Fixes <http://webkit.org/b/63815> REGRESSION (r90229): webkit-patch rollout and sheriffbot
rollout are broken
Reviewed by Dan Bates.
* Scripts/webkitpy/common/checkout/changelog.py:
(ChangeLog.update_with_unreviewed_message): Changed to look for the "Need a short
description and bug URL" line instead of the "Reviewed by" line as the first line of the
ChangeLog template.
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
(ChangeLogTest): Updated _new_entry_boilerplate to match what prepare-ChangeLog now
generates.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90238 => 90239)
--- trunk/Tools/ChangeLog 2011-07-01 16:51:24 UTC (rev 90238)
+++ trunk/Tools/ChangeLog 2011-07-01 16:54:26 UTC (rev 90239)
@@ -1,5 +1,27 @@
2011-07-01 Adam Roben <[email protected]>
+ Teach webkitpy about the new format of our ChangeLog template
+
+ r90229 moved the "Need a short description and bug URL" line to the top of the ChangeLog
+ template. But webkitpy didn't know this, so the various rollout-related commands were
+ leaving that line in the ChangeLog.
+
+ Fixes <http://webkit.org/b/63815> REGRESSION (r90229): webkit-patch rollout and sheriffbot
+ rollout are broken
+
+ Reviewed by Dan Bates.
+
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ (ChangeLog.update_with_unreviewed_message): Changed to look for the "Need a short
+ description and bug URL" line instead of the "Reviewed by" line as the first line of the
+ ChangeLog template.
+
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ (ChangeLogTest): Updated _new_entry_boilerplate to match what prepare-ChangeLog now
+ generates.
+
+2011-07-01 Adam Roben <[email protected]>
+
Make TestFailures stop loading old builds once we've explained all current failures
We used to do this, but some refactoring in r90165 broke this logic.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (90238 => 90239)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2011-07-01 16:51:24 UTC (rev 90238)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2011-07-01 16:54:26 UTC (rev 90239)
@@ -179,16 +179,16 @@
return "\n".join(lines)
def update_with_unreviewed_message(self, message):
- reviewed_by_regexp = re.compile(
- "%sReviewed by NOBODY \(OOPS!\)\." % self._changelog_indent)
+ first_boilerplate_line_regexp = re.compile(
+ "%sNeed a short description and bug URL \(OOPS!\)" % self._changelog_indent)
removing_boilerplate = False
# inplace=1 creates a backup file and re-directs stdout to the file
for line in fileinput.FileInput(self.path, inplace=1):
- if reviewed_by_regexp.search(line):
+ if first_boilerplate_line_regexp.search(line):
message_lines = self._wrap_lines(message)
- print reviewed_by_regexp.sub(message_lines, line),
- # Remove all the ChangeLog boilerplate between the Reviewed by
- # line and the first changed file.
+ print first_boilerplate_line_regexp.sub(message_lines, line),
+ # Remove all the ChangeLog boilerplate before the first changed
+ # file.
removing_boilerplate = True
elif removing_boilerplate:
if line.find('*') >= 0: # each changed file is preceded by a *
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (90238 => 90239)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2011-07-01 16:51:24 UTC (rev 90238)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2011-07-01 16:54:26 UTC (rev 90239)
@@ -183,12 +183,13 @@
with codecs.open(file_path, "r", encoding) as file:
return file.read()
+ # FIXME: We really should be getting this from prepare-ChangeLog itself.
_new_entry_boilerplate = '''2009-08-19 Eric Seidel <[email protected]>
+ Need a short description and bug URL (OOPS!)
+
Reviewed by NOBODY (OOPS!).
- Need a short description and bug URL (OOPS!)
-
* Scripts/bugzilla-tool:
'''
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
