| OLD | NEW |
| 1 # Copyright (c) 2010 Google Inc. All rights reserved. | 1 # Copyright (c) 2010 Google Inc. All rights reserved. |
| 2 # Copyright (c) 2009 Apple Inc. All rights reserved. | 2 # Copyright (c) 2009 Apple Inc. All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 # | 29 # |
| 30 # A tool for automating dealing with bugzilla, posting patches, committing patch
es, etc. | 30 # A tool for automating dealing with bugzilla, posting patches, committing patch
es, etc. |
| 31 | 31 |
| 32 from optparse import make_option | 32 from optparse import make_option |
| 33 import os | |
| 34 import threading | |
| 35 | 33 |
| 36 from webkitpy.common.host import Host | 34 from webkitpy.common.host import Host |
| 37 from webkitpy.tool.multicommandtool import MultiCommandTool | 35 from webkitpy.tool.multicommandtool import MultiCommandTool |
| 38 from webkitpy.tool import commands | 36 from webkitpy.tool import commands |
| 39 | 37 |
| 40 | 38 |
| 41 class WebKitPatch(MultiCommandTool, Host): | 39 class WebKitPatch(MultiCommandTool, Host): |
| 42 global_options = [ | 40 global_options = [ |
| 43 make_option("-v", "--verbose", action="store_true", dest="verbose", defa
ult=False, help="enable all logging"), | 41 make_option("-v", "--verbose", action="store_true", dest="verbose", defa
ult=False, help="enable all logging"), |
| 44 make_option("-d", "--directory", action="append", dest="patch_directorie
s", default=[], help="Directory to look at for changed files"), | 42 make_option("-d", "--directory", action="append", dest="patch_directorie
s", default=[], help="Directory to look at for changed files"), |
| 45 ] | 43 ] |
| 46 | 44 |
| 47 def __init__(self, path): | 45 def __init__(self, path): |
| 48 MultiCommandTool.__init__(self) | 46 MultiCommandTool.__init__(self) |
| 49 Host.__init__(self) | 47 Host.__init__(self) |
| 50 self._path = path | 48 self._path = path |
| 51 self.wakeup_event = threading.Event() | |
| 52 | 49 |
| 53 def path(self): | 50 def path(self): |
| 54 return self._path | 51 return self._path |
| 55 | 52 |
| 56 def should_show_in_main_help(self, command): | 53 def should_show_in_main_help(self, command): |
| 57 if not command.show_in_main_help: | 54 if not command.show_in_main_help: |
| 58 return False | 55 return False |
| 59 if command.requires_local_commits: | 56 if command.requires_local_commits: |
| 60 return self.scm().supports_local_commits() | 57 return self.scm().supports_local_commits() |
| 61 return True | 58 return True |
| 62 | 59 |
| 63 # FIXME: This may be unnecessary since we pass global options to all command
s during execute() as well. | 60 # FIXME: This may be unnecessary since we pass global options to all command
s during execute() as well. |
| 64 def handle_global_options(self, options): | 61 def handle_global_options(self, options): |
| 65 self.initialize_scm(options.patch_directories) | 62 self.initialize_scm(options.patch_directories) |
| 66 | 63 |
| 67 def should_execute_command(self, command): | 64 def should_execute_command(self, command): |
| 68 if command.requires_local_commits and not self.scm().supports_local_comm
its(): | 65 if command.requires_local_commits and not self.scm().supports_local_comm
its(): |
| 69 failure_reason = "%s requires local commits using %s in %s." % (comm
and.name, self.scm().display_name(), self.scm().checkout_root) | 66 failure_reason = "%s requires local commits using %s in %s." % (comm
and.name, self.scm().display_name(), self.scm().checkout_root) |
| 70 return (False, failure_reason) | 67 return (False, failure_reason) |
| 71 return (True, None) | 68 return (True, None) |
| OLD | NEW |