Changeset 52728 in webkit

Timestamp:

Jan 4, 2010 3:37:24 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-04 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Make bugzilla-tool rollout include a bug link in the ChangeLog entry
​https://bugs.webkit.org/show_bug.cgi?id=33146

One more step towards better rollouts.

• Scripts/webkitpy/changelogs.py:
• Scripts/webkitpy/changelogs_unittest.py:
• Scripts/webkitpy/steps/preparechangelogforrevert.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/changelogs.py (modified) (2 diffs)
• Scripts/webkitpy/changelogs_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/steps/preparechangelogforrevert.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-04  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make bugzilla-tool rollout include a bug link in the ChangeLog entry
+        https://bugs.webkit.org/show_bug.cgi?id=33146
+
+        One more step towards better rollouts.
+
+        * Scripts/webkitpy/changelogs.py:
+        * Scripts/webkitpy/changelogs_unittest.py:
+        * Scripts/webkitpy/steps/preparechangelogforrevert.py:
+
 2010-01-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/changelogs.py

@@ -70 +70 @@
             changelog_file.close()
 
-    def update_for_revert(self, revision):
+    def update_for_revert(self, revision, bug_url=None):
         reviewed_by_regexp = re.compile('Reviewed by NOBODY \(OOPS!\)\.')
         removing_boilerplate = False
@@ -77 +77 @@
             if reviewed_by_regexp.search(line):
                 print reviewed_by_regexp.sub("No review, rolling out r%s." % revision, line),
-                print "        %s\n" % view_source_url(revision)
+                print "        %s" % view_source_url(revision)
+                if bug_url:
+                    print "        %s" % bug_url
+                print # Add an extra new line after the rollout message.
                 # Remove all the ChangeLog boilerplate between the Reviewed by line and the first changed file.
                 removing_boilerplate = True

trunk/WebKitTools/Scripts/webkitpy/changelogs_unittest.py

@@ -125 +125 @@
         self.assertEquals(actual_contents, expected_contents)
 
-    _expected_revert_entry = '''2009-08-19  Eric Seidel  <eric@webkit.org>
+    _revert_entry_with_bug_url = '''2009-08-19  Eric Seidel  <eric@webkit.org>
+
+        No review, rolling out r12345.
+        http://trac.webkit.org/changeset/12345
+        http://example.com/123
+
+        * Scripts/bugzilla-tool:
+'''
+
+    _revert_entry_without_bug_url = '''2009-08-19  Eric Seidel  <eric@webkit.org>
 
         No review, rolling out r12345.
@@ -133 +142 @@
 '''
 
-    def test_update_for_revert(self):
+    def _assert_update_for_revert_output(self, args, expected_entry):
         changelog_contents = "%s\n%s" % (self._new_entry_boilerplate, self._example_changelog)
         changelog_path = self._write_tmp_file_with_contents(changelog_contents)
         changelog = ChangeLog(changelog_path)
-        changelog.update_for_revert(12345)
+        changelog.update_for_revert(*args)
         actual_entry = changelog.latest_entry()
         os.remove(changelog_path)
-        self.assertEquals(actual_entry, self._expected_revert_entry)
+        self.assertEquals(actual_entry, expected_entry)
+
+    def test_update_for_revert(self):
+        self._assert_update_for_revert_output([12345], self._revert_entry_without_bug_url)
+        self._assert_update_for_revert_output([12345, "http://example.com/123"], self._revert_entry_with_bug_url)
 
 if __name__ == '__main__':

trunk/WebKitTools/Scripts/webkitpy/steps/preparechangelogforrevert.py

@@ -43 +43 @@
         # This could move to prepare-ChangeLog by adding a --revert= option.
         self._run_script("prepare-ChangeLog")
+        bug_url = self._tool.bugs.bug_url_for_bug_id(state["bug_id"]) if state["bug_id"] else None
         for changelog_path in changelog_paths:
-            ChangeLog(changelog_path).update_for_revert(state["revision"])
+            ChangeLog(changelog_path).update_for_revert(state["revision"], bug_url)