Attachment 288683 Details for Bug 161684 – Patch

[patch] Patch

bug-161684-20160913130313.patch (text/plain), 4.12 KB, created by Emanuele Aina on 2016-09-13 04:05:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuele Aina

Created: 2016-09-13 04:05:48 PDT

Size: 4.12 KB

patch

obsolete

>Subversion Revision: 205856
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cb599cb4da903c32251c948833c670081bcbc6d1..7f66111b8d1c792499ea54bbdd9ca5326eeb50fc 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2016-09-07  Emanuele Aina  <emanuele.aina@collabora.com>
>+
>+        Replace bug URL placeholders independently of the short desc one
>+        https://bugs.webkit.org/show_bug.cgi?id=161684
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Instead of adding the bug URL when replacing the short description
>+        placeholder and then ignoring the bug URL placeholder, use the former
>+        to set the short description and the latter for the bug URL.
>+        This means that developers can fully prepare the changelog with short
>+        and long description before submission leaving the bug placeholder in
>+        place, and the changelog machinery will make sure to replace the
>+        latter with the URL of the newly created bug while submitting.
>+
>+        Note that this also means that the short description placeholder alone
>+        no longer causes the bug URL to be added.
>+
>+        * Scripts/webkitpy/common/checkout/changelog.py:
>+        (ChangeLog.set_short_description_and_bug_url):
>+        * Scripts/webkitpy/common/checkout/changelog_unittest.py:
>+        (test_set_short_description_and_bug_url):
>+
> 2016-09-12  Chris Dumez  <cdumez@apple.com>
> 
>         Fix post-landing review comments after r205787
>diff --git a/Tools/Scripts/webkitpy/common/checkout/changelog.py b/Tools/Scripts/webkitpy/common/checkout/changelog.py
>index 2de79f5d850f1bbcc273869bd27ee81c05fca596..cda30c47a7d2c4bce1625dc5bf300a3f45314a43 100644
>--- a/Tools/Scripts/webkitpy/common/checkout/changelog.py
>+++ b/Tools/Scripts/webkitpy/common/checkout/changelog.py
>@@ -430,14 +430,17 @@ def set_reviewer(self, reviewer):
>             self._filesystem.write_text_file(self.path, newdata)
> 
>     def set_short_description_and_bug_url(self, short_description, bug_url):
>-        message = "%s\n%s%s" % (short_description, self._changelog_indent, bug_url)
>-        bug_boilerplate = "%sNeed the bug URL (OOPS!).\n" % self._changelog_indent
>         result = StringIO()
>         with self._filesystem.open_text_file_for_reading(self.path) as file:
>+            short_description_placeholder = "Need a short description (OOPS!)."
>+            bug_url_placeholder = "Need the bug URL (OOPS!)."
>             for line in file:
>-                line = line.replace("Need a short description (OOPS!).", message)
>-                if line != bug_boilerplate:
>-                    result.write(line)
>+                stripped = line.strip()
>+                if stripped == short_description_placeholder:
>+                    line = self._changelog_indent + short_description + "\n"
>+                if stripped == bug_url_placeholder:
>+                    line = self._changelog_indent + bug_url + "\n"
>+                result.write(line)
>         self._filesystem.write_text_file(self.path, result.getvalue())
> 
>     def delete_entries(self, num_entries):
>diff --git a/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py b/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py
>index 6f872b6f344ee18b5a9a3f4d96362a12c9b31975..812572da443bc6f053a495a64617144e6372b06e 100644
>--- a/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py
>+++ b/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py
>@@ -642,8 +642,7 @@ def test_set_short_description_and_bug_url(self):
>         bug_url = "http://example.com/b/2344"
>         ChangeLog(self._changelog_path, fs).set_short_description_and_bug_url(short_description, bug_url)
>         actual_contents = fs.read_text_file(self._changelog_path)
>-        expected_message = "%s\n        %s" % (short_description, bug_url)
>-        expected_contents = changelog_contents.replace("Need a short description (OOPS!).", expected_message)
>+        expected_contents = changelog_contents.replace("Need a short description (OOPS!).", short_description)
>         self.assertEqual(actual_contents.splitlines(), expected_contents.splitlines())
> 
>         changelog_contents = u"%s\n%s" % (self._new_entry_boilerplate, self._example_changelog)

Actions: View | Formatted Diff | Diff

Attachments on bug 161684: 288126 | 288682 | 288683