From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 14:36:32 +0100 Subject: Merge WebKit at r74534: Initial merge by git. Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb --- .../webkitpy/tool/steps/cleanworkingdirectory.py | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py (limited to 'WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py') diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py b/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py deleted file mode 100644 index e13fbc2..0000000 --- a/WebKitTools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2010 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import os - -from webkitpy.tool.steps.abstractstep import AbstractStep -from webkitpy.tool.steps.options import Options - - -class CleanWorkingDirectory(AbstractStep): - def __init__(self, tool, options, allow_local_commits=False): - AbstractStep.__init__(self, tool, options) - self._allow_local_commits = allow_local_commits - - @classmethod - def options(cls): - return AbstractStep.options() + [ - Options.force_clean, - Options.clean, - ] - - def run(self, state): - os.chdir(self._tool.scm().checkout_root) - if not self._allow_local_commits: - self._tool.scm().ensure_no_local_commits(self._options.force_clean) - if self._options.clean: - self._tool.scm().ensure_clean_working_directory(force_clean=self._options.force_clean) -- cgit v1.1