Add a --nohooks to gclient to update/sync/revert without calling the hooks

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 19 matching lines @@
                   file below.
   .gclient_entries : A cache constructed by 'update' command.  Format is a
                   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.  Hooks
-  can also be run based on what files have been modified in the working copy
+  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
   --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
@@ skipping 60 matching lines @@
 
 GENERIC_UPDATE_USAGE_TEXT = (
     """Perform a checkout/update of the modules specified by the gclient
 configuration; see 'help config'.  Unless --revision is specified,
 then the latest revision of the root solutions is checked out, with
 dependent submodule versions updated according to DEPS files.
 If --revision is specified, then the given revision is used in place
 of the latest, either for a single solution or for all solutions.
 Unless the --force option is provided, solutions and modules whose
 local revision matches the one to update (i.e., they have not changed
-in the repository) are *not* modified.
+in the repository) are *not* modified. Unless --nohooks is provided,
+the hooks are run.
 This a synonym for 'gclient %(alias)s'
 
 usage: gclient %(cmd)s [options] [--] [svn update options/args]
 
 Valid options:
   --force             : force update even for unchanged modules
+  --nohooks           : don't run the hooks after the update is complete
   --revision REV      : update/checkout all solutions with specified revision
   --revision SOLUTION@REV : update given solution to specified revision
   --deps PLATFORM(S)  : sync deps for the given platform(s), or 'all'
   --verbose           : output additional diagnostics
   --head              : update to latest revision, instead of last good revision
 
 Examples:
   gclient %(cmd)s
       update files from SVN according to current configuration,
       *for modules which have changed since last update or sync*
@@ skipping 59 matching lines @@
 usage: revert
 """,
     "status":
     """Show the status of client and dependent modules, using 'svn diff'
 for each module.  Additional options and args may be passed to 'svn diff'.
 
 usage: status [options] [--] [svn diff args/options]
 
 Valid options:
   --verbose           : output additional diagnostics
+  --nohooks           : don't run the hooks after the update is complete
 """,
     "sync": GENERIC_UPDATE_USAGE_TEXT % {"cmd": "sync", "alias": "update"},
     "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
 """,
@@ skipping 1013 matching lines @@
     # differently from VC failures.
     SubprocessCall(command, self._root_dir, fail_status=2)
 
   def _RunHooks(self, command, file_list, is_using_git):
     """Evaluates all hooks, running actions as needed.
     """
     # Hooks only run for these command types.
     if not command in ('update', 'revert', 'runhooks'):
       return
 
+    # Hooks only run when --nohooks is not specified
+    if self._options.nohooks:
+      return
+
     # Get any hooks from the .gclient file.
     hooks = self.GetVar("hooks", [])
     # Add any hooks found in DEPS files.
     hooks.extend(self._deps_hooks)
 
     # If "--force" was specified, run all hooks regardless of what files have
     # changed.  If the user is using git, then we don't know what files have
     # changed so we always run all hooks.
     if self._options.force or is_using_git:
       for hook_dict in hooks:
@@ skipping 462 matching lines @@
 
 def Main(argv):
   """Parse command line arguments and dispatch command."""
 
   option_parser = optparse.OptionParser(usage=DEFAULT_USAGE_TEXT,
                                         version=__version__)
   option_parser.disable_interspersed_args()
   option_parser.add_option("", "--force", action="store_true", default=False,
                            help=("(update/sync only) force update even "
                                  "for modules which haven't changed"))
+  option_parser.add_option("", "--nohooks", action="store_true", default=False,
+                           help=("(update/sync/revert only) prevent the hooks from "

[Nicolas Sylvain, 2009/07/20 23:03:19]

80chars

+                                 "running"))
   option_parser.add_option("", "--revision", action="append", dest="revisions",
                            metavar="REV", default=[],
                            help=("(update/sync only) sync to a specific "
                                  "revision, can be used multiple times for "
                                  "each solution, e.g. --revision=src@123, "
                                  "--revision=internal@32"))
   option_parser.add_option("", "--deps", default=None, dest="deps_os",
                            metavar="OS_LIST",
                            help=("(update/sync only) sync deps for the "
                                  "specified (comma-separated) platform(s); "
@@ skipping 46 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: