Enforce --force when running gclient runhooks

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 21 matching lines @@
                   Python script defining 'entries', a list of the names
                   of all modules in the client
   <module>/DEPS : Python script defining var 'deps' as a map from each requisite
                   submodule name to a URL where it can be found (via one SCM)
 
 Hooks
   .gclient and DEPS files may optionally contain a list named "hooks" to
   allow custom actions to be performed based on files that have changed in the
   working copy as a result of a "sync"/"update" or "revert" operation.  This
   could be prevented by using --nohooks (hooks run by default). Hooks can also
-  be run based on what files have been modified in the working copy
-  with the "runhooks" operation.  If any of these operation are run with
+  be forced to run with the "runhooks" operation.  If "sync" is run with
   --force, all known hooks will run regardless of the state of the working
   copy.
 
   Each item in a "hooks" list is a dict, containing these two keys:
     "pattern"  The associated value is a string containing a regular
                expression.  When a file whose pathname matches the expression
                is checked out, updated, or reverted, the hook's "action" will
                run.
     "action"   A list describing a command to run along with its arguments, if
                any.  An action command will run at most one time per gclient
                invocation, regardless of how many files matched the pattern.
                The action is executed in the same directory as the .gclient
                file.  If the first item in the list is the string "python",
                the current Python interpreter (sys.executable) will be used
                to run the command. If the list contains string "$matching_files"
                it will be removed from the list and the list will be extended
                by the list of matching files.
 
   Example:
     hooks = [
       { "pattern": "\\.(gif|jpe?g|pr0n|png)$",
         "action":  ["python", "image_indexer.py", "--all"]},
     ]
 """
 
 __author__ = "darinf@gmail.com (Darin Fisher)"
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 import errno
 import optparse
 import os
 import re
 import stat
 import subprocess
 import sys
 import time
 import urlparse
@@ skipping 135 matching lines @@
     "update": GENERIC_UPDATE_USAGE_TEXT % {"cmd": "update", "alias": "sync"},
     "help": """Describe the usage of this program or its subcommands.
 
 usage: help [options] [subcommand]
 
 Valid options:
   --verbose           : output additional diagnostics
 """,
     "runhooks":
     """Runs hooks for files that have been modified in the local working copy,
-according to 'svn status'.
+according to 'svn status'. Implies --force.
 
 usage: runhooks [options]
 
 Valid options:
-  --force             : runs all known hooks, regardless of the working
-                        copy status
   --verbose           : output additional diagnostics
 """,
     "revinfo":
     """Outputs source path, server URL and revision information for every
 dependency in all solutions (no local checkout required).
 
 usage: revinfo [options]
 """,
 }
 
@@ skipping 1449 matching lines @@
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise Error("client not configured; see 'gclient config'")
   if options.verbose:
     # Print out the .gclient file.  This is longer than if we just printed the
     # client dict, but more legible, and it might contain helpful comments.
     print(client.ConfigContent())
+  options.force = True
   return client.RunOnDeps('runhooks', args)
 
 
 def DoRevInfo(options, args):
   """Handle the revinfo subcommand.
 
   Raises:
     Error: if client isn't configured properly.
   """
   client = GClient.LoadCurrentConfig(options)
@@ skipping 99 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: