Changeset 141829 in webkit

Timestamp:

Feb 4, 2013 4:30:22 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Don't update author info in PrepareChangeLog and allow users to skip the PrepareChangeLog step entirely.
​https://bugs.webkit.org/show_bug.cgi?id=108788

Patch by Timothy Loh <​timloh@chromium.com> on 2013-02-04
Reviewed by Ryosuke Niwa.

As per discussion in Bug 74358, it's probably preferable to remove the
behaviour of updating the author details in a ChangeLog entry. We also
want to be able to skip preparing change logs (e.g. rebaselining many
tests), so a --no-prepare-changelogs option is added to webkit-patch.

• Scripts/webkitpy/common/checkout/changelog.py:

(ChangeLogEntry._parse_entry):
(ChangeLogEntry.date): Added

• Scripts/webkitpy/common/checkout/changelog_unittest.py:

(test_parse_log_entries_from_changelog):

• Scripts/webkitpy/tool/commands/commandtest.py:

(CommandsTest.assert_execute_outputs):

• Scripts/webkitpy/tool/steps/options.py:

(Options): Added --no-prepare-changelogs

• Scripts/webkitpy/tool/steps/preparechangelog.py:

(PrepareChangeLog.options):
(PrepareChangeLog._merge_entries): date_line() gets the entire line, including
the author's name and email, but we only want to replace the date.
(PrepareChangeLog.run):

• Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:

(PrepareChangeLogTest.test_resolve_existing_entry): Added tests for changed
authors. Removed unneeded variable.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/changelog.py (modified) (2 diffs)
• Scripts/webkitpy/common/checkout/changelog_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/commandtest.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/options.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/preparechangelog.py (modified) (3 diffs)
• Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-04  Timothy Loh  <timloh@chromium.com>
+
+        Don't update author info in PrepareChangeLog and allow users to skip the PrepareChangeLog step entirely.
+        https://bugs.webkit.org/show_bug.cgi?id=108788
+
+        Reviewed by Ryosuke Niwa.
+
+        As per discussion in Bug 74358, it's probably preferable to remove the
+        behaviour of updating the author details in a ChangeLog entry. We also
+        want to be able to skip preparing change logs (e.g. rebaselining many
+        tests), so a --no-prepare-changelogs option is added to webkit-patch.
+
+        * Scripts/webkitpy/common/checkout/changelog.py:
+        (ChangeLogEntry._parse_entry):
+        (ChangeLogEntry.date): Added
+        * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+        (test_parse_log_entries_from_changelog):
+        * Scripts/webkitpy/tool/commands/commandtest.py:
+        (CommandsTest.assert_execute_outputs):
+        * Scripts/webkitpy/tool/steps/options.py:
+        (Options): Added --no-prepare-changelogs
+        * Scripts/webkitpy/tool/steps/preparechangelog.py:
+        (PrepareChangeLog.options):
+        (PrepareChangeLog._merge_entries): date_line() gets the entire line, including
+        the author's name and email, but we only want to replace the date.
+        (PrepareChangeLog.run):
+        * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
+        (PrepareChangeLogTest.test_resolve_existing_entry): Added tests for changed
+        authors. Removed unneeded variable.
+
 2013-02-04  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py

@@ -196 +196 @@
 
         self._date_line = match.group()
+        self._date = match.group("date")
         self._bug_description = self._parse_bug_description(self._contents)
 
@@ -211 +212 @@
     def date_line(self):
         return self._date_line
+
+    def date(self):
+        return self._date
 
     def author_text(self):

trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py

@@ -238 +238 @@
         self.assertEqual(len(parsed_entries), 9)
         self.assertEqual(parsed_entries[0].date_line(), u"2009-08-17  Tor Arne Vestb\xf8  <vestbo@webkit.org>")
+        self.assertEqual(parsed_entries[0].date(), "2009-08-17")
         self.assertEqual(parsed_entries[0].reviewer_text(), "David Levin")
         self.assertEqual(parsed_entries[0].is_touched_files_text_clean(), False)
+        self.assertEqual(parsed_entries[1].date_line(), "2009-08-16  David Kilzer  <ddkilzer@apple.com>")
+        self.assertEqual(parsed_entries[1].date(), "2009-08-16")
         self.assertEqual(parsed_entries[1].author_email(), "ddkilzer@apple.com")
         self.assertEqual(parsed_entries[1].touched_files_text(), "        * Scripts/bugzilla-tool:\n        * Scripts/modules/scm.py:\n")

trunk/Tools/Scripts/webkitpy/tool/commands/commandtest.py

@@ -43 +43 @@
         options.open_bug = True
         options.port = 'MOCK port'
+        options.prepare_changelogs = True
         options.quiet = True
         options.reviewer = 'MOCK reviewer'

trunk/Tools/Scripts/webkitpy/tool/steps/options.py

@@ -50 +50 @@
     open_bug = make_option("--open-bug", action="store_true", dest="open_bug", default=False, help="Opens the associated bug in a browser.")
     parent_command = make_option("--parent-command", action="store", dest="parent_command", default=None, help="(Internal) The command that spawned this instance.")
+    prepare_changelogs = make_option("--no-prepare-changelogs", action="store_false", dest="prepare_changelogs", default=True, help="Don't prepare (create and/or update) ChangeLogs.")
     quiet = make_option("--quiet", action="store_true", dest="quiet", default=False, help="Produce less console output.")
     request_commit = make_option("--request-commit", action="store_true", dest="request_commit", default=False, help="Mark the patch as needing auto-commit after review.")

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py

@@ -46 +46 @@
             Options.email,
             Options.git_commit,
+            Options.prepare_changelogs,
         ]
 
@@ -84 +85 @@
         final_entry = old_entry.contents()
 
-        new_date_line = new_entry.date_line()
-        old_date_line = old_entry.date_line()
-        if new_date_line != old_date_line:
-            final_entry = final_entry.replace(old_date_line, new_date_line)
+        final_entry = final_entry.replace(old_entry.date(), new_entry.date(), 1)
 
         new_bug_desc = new_entry.bug_description()
@@ -105 +103 @@
 
     def run(self, state):
+        if not self._options.prepare_changelogs:
+            return
+
         if self.cached_lookup(state, "changelogs"):
             self._ensure_bug_url(state)

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py

@@ -41 +41 @@
         step = PrepareChangeLog(MockTool(), MockOptions())
 
-        roll_over = "== Rolled over to ChangeLog-2012-10-02 =="
-
         headers = ["2013-01-18  Timothy Loh  <timloh@chromium.com>\n\n",
                    "2013-01-20  Timothy Loh  <timloh@chromium.com>\n\n",
                   u"2009-08-17  Tor Arne Vestb\xf8  <vestbo@webkit.org>\n\n",
                   u"2009-08-18  Tor Arne Vestb\xf8  <vestbo@webkit.org>\n\n",
+                   "2013-01-18  Eric Seidel  <eric@webkit.org>\n\n",
+                   "2013-01-20  Eric Seidel  <eric@webkit.org>\n\n",
                   ]
 
@@ -94 +94 @@
                       ((1, 1, 0, 1), (0, 0, 0, 2), (1, 1, 0, 3)),
                       ((3, 0, 0, 0), (2, 0, 1, 0), (3, 0, 1, 0)),
+                      ((4, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0)),
+                      ((5, 0, 0, 0), (0, 0, 0, 0), (1, 0, 0, 0)),
+                      ((0, 0, 0, 0), (4, 0, 0, 0), (4, 0, 0, 0)),
+                      ((1, 0, 0, 0), (4, 0, 0, 0), (5, 0, 0, 0)),
         ]
 
@@ -99 +103 @@
             new_entry = make_entry(new)
             old_entry = make_entry(old)
-            start_file = new_entry + old_entry + roll_over
+            start_file = new_entry + old_entry + self._rolled_over_footer
 
             final_entry = make_entry(final)
-            end_file = final_entry + roll_over
+            end_file = final_entry + self._rolled_over_footer
 
             path = "ChangeLog"