Changeset 148180 in webkit


Ignore:
Timestamp:
Apr 11, 2013 12:40:29 AM (11 years ago)
Author:
rniwa@webkit.org
Message:

Remove webkitpy code to roll Chromium DEPS
​https://bugs.webkit.org/show_bug.cgi?id=114415

Reviewed by Benjamin Poulain.

Removed the code to roll Chromium DEPS in WebKit.

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

(Checkout.bug_id_for_this_commit):

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

(MockCheckout.commit_message_for_this_commit):

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

(CheckoutTest.test_suggested_reviewers):

  • Scripts/webkitpy/common/checkout/deps.py: Removed.
  • Scripts/webkitpy/common/checkout/deps_mock.py: Removed.
  • Scripts/webkitpy/tool/bot/irc_command.py:

(RollChromiumDEPS): Teach webkitbot a sense of humor.
(RollChromiumDEPS.execute):

  • Scripts/webkitpy/tool/bot/irc_command_unittest.py:

(IRCCommandTest.test_create_bug):

  • Scripts/webkitpy/tool/bot/ircbot_unittest.py:

(IRCBotTest.test_revert):

  • Scripts/webkitpy/tool/bot/sheriff.py:

(Sheriff.post_rollout_patch):

  • Scripts/webkitpy/tool/commands/init.py:
  • Scripts/webkitpy/tool/commands/roll.py: Removed.
  • Scripts/webkitpy/tool/commands/roll_unittest.py: Removed.
  • Scripts/webkitpy/tool/steps/init.py:
  • Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py: Removed.
  • Scripts/webkitpy/tool/steps/updatechromiumdeps.py: Removed.
  • Scripts/webkitpy/tool/steps/updatechromiumdeps_unittest.py: Removed.
Location:
trunk/Tools
Files:
7 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r148177 r148180  
     12013-04-11  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Remove webkitpy code to roll Chromium DEPS
     4        https://bugs.webkit.org/show_bug.cgi?id=114415
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Removed the code to roll Chromium DEPS in WebKit.
     9
     10        * Scripts/webkitpy/common/checkout/checkout.py:
     11        (Checkout.bug_id_for_this_commit):
     12        * Scripts/webkitpy/common/checkout/checkout_mock.py:
     13        (MockCheckout.commit_message_for_this_commit):
     14        * Scripts/webkitpy/common/checkout/checkout_unittest.py:
     15        (CheckoutTest.test_suggested_reviewers):
     16        * Scripts/webkitpy/common/checkout/deps.py: Removed.
     17        * Scripts/webkitpy/common/checkout/deps_mock.py: Removed.
     18        * Scripts/webkitpy/tool/bot/irc_command.py:
     19        (RollChromiumDEPS): Teach webkitbot a sense of humor.
     20        (RollChromiumDEPS.execute):
     21        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
     22        (IRCCommandTest.test_create_bug):
     23        * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
     24        (IRCBotTest.test_revert):
     25        * Scripts/webkitpy/tool/bot/sheriff.py:
     26        (Sheriff.post_rollout_patch):
     27        * Scripts/webkitpy/tool/commands/__init__.py:
     28        * Scripts/webkitpy/tool/commands/roll.py: Removed.
     29        * Scripts/webkitpy/tool/commands/roll_unittest.py: Removed.
     30        * Scripts/webkitpy/tool/steps/__init__.py:
     31        * Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py: Removed.
     32        * Scripts/webkitpy/tool/steps/updatechromiumdeps.py: Removed.
     33        * Scripts/webkitpy/tool/steps/updatechromiumdeps_unittest.py: Removed.
     34
    1352013-04-11  Glenn Adams  <glenn@skynav.com>
    236

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

    r143033 r148180  
    3333from webkitpy.common.checkout.commitinfo import CommitInfo
    3434from webkitpy.common.checkout.scm import CommitMessage
    35 from webkitpy.common.checkout.deps import DEPS
    3635from webkitpy.common.memoized import memoized
    3736from webkitpy.common.system.executive import ScriptError
    … …  
    147146            pass # We might not have ChangeLogs.
    148147
    149     def chromium_deps(self):
    150         return DEPS(self._scm.absolute_path(self._filesystem.join("Source", "WebKit", "chromium", "DEPS")))
    151 
    152148    def apply_patch(self, patch):
    153149        # It's possible that the patch was not made from the root directory.

  • trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py

    r116572 r148180  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 from .deps_mock import MockDEPS
    3029from .commitinfo import CommitInfo
    3130
    … …  
    104103        return MockCommitMessage()
    105104
    106     def chromium_deps(self):
    107         return MockDEPS()
    108 
    109105    def apply_patch(self, patch):
    110106        pass

  • trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

    r140510 r148180  
    248248        self.assertEqual(reviewer_names, [u'Tor Arne Vestb\xf8'])
    249249
    250     def test_chromium_deps(self):
    251         checkout = self._make_checkout()
    252         checkout._scm.checkout_root = "/foo/bar"
    253         self.assertEqual(checkout.chromium_deps()._path, '/foo/bar/Source/WebKit/chromium/DEPS')
    254 
    255250    def test_apply_patch(self):
    256251        checkout = self._make_checkout()

  • trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py

    r148051 r148180  
    131131class RollChromiumDEPS(IRCCommand):
    132132    usage_string = "roll-chromium-deps REVISION"
    133     help_string = "Rolls WebKit's Chromium DEPS to the given revision. Give LKGR as the revision number to use the last known good revision. This lands an unreviewed patch and provides the bug URL."
    134 
    135     def _parse_args(self, args):
    136         if not args:
    137             return None
    138         revision = args[0].lstrip("r")
    139         if revision == "LKGR" or revision.isdigit():
    140             return revision
    141         return None
    142 
    143     def _expand_irc_nickname(self, nick):
    144         contributor = CommitterList().contributor_by_irc_nickname(nick)
    145         if contributor:
    146             return str(contributor)
    147         return nick
     133    help_string = "Rolls WebKit's Chromium DEPS to the given revision???"
    148134
    149135    def execute(self, nick, args, tool, sheriff):
    … …  
    152138            return self.usage(nick)
    153139
    154         roll_target = "r%s" % revision if revision.isdigit() else "last-known good revision"
    155         tool.irc().post("%s: Rolling Chromium DEPS to %s" % (nick, roll_target))
    156         changelog_message = "Unreviewed.  Rolled Chromium DEPS to %s.  Requested by %s via %s.\n\n" % (roll_target, self._expand_irc_nickname(nick), sheriff.name())
    157 
    158         try:
    159             bug_id = sheriff.post_chromium_deps_roll(revision, roll_target, changelog_message)
    160             bug_url = tool.bugs.bug_url_for_bug_id(bug_id)
    161             return "%s: Created DEPS roll: %s" % (nick, bug_url)
    162         except ScriptError, e:
    163             tool.irc().post("%s: Failed to create DEPS roll:" % nick)
    164             pre_bug_error_messages = [
    165                 r"Current Chromium DEPS revision \d+ is newer than \d+\.",
    166                 r"Unable to update Chromium DEPS\.",
    167                 r"Unable to parse LKGR from: .*",
    168                 r"Unable to reach LKGR source: .*",
    169                 r"Invalid revision number\.",
    170             ]
    171             for message in pre_bug_error_messages:
    172                 match = re.search(message, e.output)
    173                 if match:
    174                     return "%s: %s" % (nick, match.group(0))
    175             _post_error_and_check_for_bug_url(tool, nick, e)
     140        tool.irc().post("%s: Thank You." % nick)
    176141
    177142

  • trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py

    r146861 r148180  
    104104                          create_bug.execute("tom", example_args, tool, None))
    105105
    106     def test_roll_chromium_deps(self):
    107         roll = RollChromiumDEPS()
    108         self.assertIsNone(roll._parse_args([]))
    109         self.assertIsNone(roll._parse_args(["invalid"]))
    110         self.assertEqual("1234", roll._parse_args(["1234"]))
    111         self.assertEqual("1234", roll._parse_args(["r1234"]))
    112         self.assertEqual("LKGR", roll._parse_args(["LKGR"]))
    113         self.assertEqual('"Alan Cutter" <alancutter@chromium.org>', roll._expand_irc_nickname("alancutter"))
    114         self.assertEqual("unknown_irc_nickname", roll._expand_irc_nickname("unknown_irc_nickname"))
    115 
    116106    def test_rollout_updates_working_copy(self):
    117107        rollout = Rollout()

  • trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py

    r148051 r148180  
    107107        OutputCapture().assert_outputs(self, run, args=["revert 21654 This patch broke the world"], expected_logs=expected_logs)
    108108
    109     def test_roll_chromium_deps(self):
    110         expected_logs = "MOCK: irc.post: mock_nick: Rolling Chromium DEPS to r21654\nMOCK: irc.post: mock_nick: Created DEPS roll: http://example.com/36936\n"
    111         OutputCapture().assert_outputs(self, run, args=["roll-chromium-deps 21654"], expected_logs=expected_logs)
    112 
    113     def test_roll_chromium_deps_to_lkgr(self):
    114         expected_logs = "MOCK: irc.post: mock_nick: Rolling Chromium DEPS to last-known good revision\nMOCK: irc.post: mock_nick: Created DEPS roll: http://example.com/36936\n"
    115         OutputCapture().assert_outputs(self, run, args=["roll-chromium-deps LKGR"], expected_logs=expected_logs)
    116 
    117109    def test_multi_rollout(self):
    118110        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"

  • trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py

    r148051 r148180  
    9292        return urls.parse_bug_id(output)
    9393
    94     def post_chromium_deps_roll(self, revision, revision_name, changelog_message):
    95         args = [
    96             "post-chromium-deps-roll",
    97             "--force-clean",
    98             "--non-interactive",
    99             "--parent-command=sheriff-bot",
    100         ]
    101         # revision can be None, but revision_name is always something meaningful.
    102         args += [revision, revision_name, changelog_message]
    103         output = self._sheriffbot.run_webkit_patch(args)
    104         return urls.parse_bug_id(output)
    105 
    10694    def post_blame_comment_on_bug(self, commit_info, builders, tests):
    10795        if not commit_info.bug_id():

  • trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py

    r143109 r148180  
    1919from webkitpy.tool.commands.rebaseline import Rebaseline
    2020from webkitpy.tool.commands.rebaselineserver import RebaselineServer
    21 from webkitpy.tool.commands.roll import *
    2221from webkitpy.tool.commands.sheriffbot import *
    2322from webkitpy.tool.commands.upload import *

  • trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py

    r140674 r148180  
    5353from webkitpy.tool.steps.postdiffforrevert import PostDiffForRevert
    5454from webkitpy.tool.steps.preparechangelog import PrepareChangeLog
    55 from webkitpy.tool.steps.preparechangelogfordepsroll import PrepareChangeLogForDEPSRoll
    5655from webkitpy.tool.steps.preparechangelogforrevert import PrepareChangeLogForRevert
    5756from webkitpy.tool.steps.promptforbugortitle import PromptForBugOrTitle
    … …  
    6261from webkitpy.tool.steps.update import Update
    6362from webkitpy.tool.steps.updatechangelogswithreviewer import UpdateChangeLogsWithReviewer
    64 from webkitpy.tool.steps.updatechromiumdeps import UpdateChromiumDEPS
    6563from webkitpy.tool.steps.validatechangelogs import ValidateChangeLogs
    6664from webkitpy.tool.steps.validatereviewer import ValidateReviewer
Note: See TracChangeset for help on using the changeset viewer.