Diff
Modified: trunk/Tools/ChangeLog (98314 => 98315)
--- trunk/Tools/ChangeLog 2011-10-25 03:17:25 UTC (rev 98314)
+++ trunk/Tools/ChangeLog 2011-10-25 03:36:24 UTC (rev 98315)
@@ -1,3 +1,15 @@
+2011-10-24 Mikhail Naganov <mnaga...@chromium.org>
+
+ Fix bug summary when rolling Chromium DEPS to LKGR.
+ https://bugs.webkit.org/show_bug.cgi?id=69917
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ * Scripts/webkitpy/tool/bot/sheriff.py:
+ * Scripts/webkitpy/tool/commands/roll.py:
+ * Scripts/webkitpy/tool/commands/roll_unittest.py:
+
2011-10-24 Ivan Briano <i...@profusion.mobi>
[EFL] Build fix. Add include path to find npapi.h
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (98314 => 98315)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2011-10-25 03:17:25 UTC (rev 98314)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2011-10-25 03:36:24 UTC (rev 98315)
@@ -163,7 +163,7 @@
tool.irc().post("%s: Rolling Chromium DEPS to %s" % (nick, roll_target))
try:
- bug_id = sheriff.post_chromium_deps_roll(revision)
+ bug_id = sheriff.post_chromium_deps_roll(revision, roll_target)
bug_url = tool.bugs.bug_url_for_bug_id(bug_id)
tool.irc().post("%s: Created DEPS roll: %s" % (nick, bug_url))
except ScriptError, e:
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py (98314 => 98315)
--- trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py 2011-10-25 03:17:25 UTC (rev 98314)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py 2011-10-25 03:36:24 UTC (rev 98315)
@@ -90,15 +90,15 @@
])
return parse_bug_id(output)
- def post_chromium_deps_roll(self, revision):
+ def post_chromium_deps_roll(self, revision, revision_name):
args = [
"post-chromium-deps-roll",
"--force-clean",
"--non-interactive",
"--parent-command=sheriff-bot",
]
- if revision:
- args += [revision]
+ # revision can be None, but revision_name is always something meaningful.
+ args += [revision, revision_name]
output = self._sheriffbot.run_webkit_patch(args)
return parse_bug_id(output)
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/roll.py (98314 => 98315)
--- trunk/Tools/Scripts/webkitpy/tool/commands/roll.py 2011-10-25 03:17:25 UTC (rev 98314)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/roll.py 2011-10-25 03:36:24 UTC (rev 98315)
@@ -50,8 +50,8 @@
class PostChromiumDEPSRoll(AbstractSequencedCommand):
name = "post-chromium-deps-roll"
- help_text = "Posts a patch to update Chromium DEPS (defaults to the last-known good revision of Chromium)"
- argument_names = "[CHROMIUM_REVISION]"
+ help_text = "Posts a patch to update Chromium DEPS (revision defaults to the last-known good revision of Chromium)"
+ argument_names = "CHROMIUM_REVISION CHROMIUM_REVISION_NAME"
steps = [
steps.CleanWorkingDirectory,
steps.Update,
@@ -65,9 +65,10 @@
options.review = False
options.request_commit = True
- chromium_revision = (args and args[0])
+ chromium_revision = args[0]
+ chromium_revision_name = args[1]
return {
"chromium_revision": chromium_revision,
- "bug_title": "Roll Chromium DEPS to r%s" % chromium_revision,
+ "bug_title": "Roll Chromium DEPS to %s" % chromium_revision_name,
"bug_description": "A DEPS roll a day keeps the build break away.",
}
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py (98314 => 98315)
--- trunk/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py 2011-10-25 03:17:25 UTC (rev 98314)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py 2011-10-25 03:36:24 UTC (rev 98315)
@@ -48,3 +48,16 @@
ERROR: Unable to update Chromium DEPS
"""
self.assert_execute_outputs(RollChromiumDEPS(), [5764], options=options, expected_stderr=expected_stderr, expected_exception=SystemExit)
+
+
+class PostRollCommandsTest(CommandsTest):
+ def test_prepare_state(self):
+ postroll = PostChromiumDEPSRoll()
+ options = MockOptions()
+ tool = MockTool()
+ lkgr_state = postroll._prepare_state(options, [None, "last-known good revision"], tool)
+ self.assertEquals(None, lkgr_state["chromium_revision"])
+ self.assertEquals("Roll Chromium DEPS to last-known good revision", lkgr_state["bug_title"])
+ revision_state = postroll._prepare_state(options, ["1234", "r1234"], tool)
+ self.assertEquals("1234", revision_state["chromium_revision"])
+ self.assertEquals("Roll Chromium DEPS to r1234", revision_state["bug_title"])
