Fix --force implementation to not prompt but still run hooks

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import logging
@@ skipping 532 matching lines @@
     """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
     change = self.GetChange(upstream_branch, author)
 
     # Apply watchlists on upload.
     if not committing:
       watchlist = watchlists.Watchlists(change.RepositoryRoot())
       files = [f.LocalPath() for f in change.AffectedFiles()]
       self.SetWatchers(watchlist.GetWatchersForPaths(files))
 
     try:
-      output = presubmit_support.DoPresubmitChecks(change, committing,
+      return presubmit_support.DoPresubmitChecks(change, committing,
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self.RpcServer())
     except presubmit_support.PresubmitFailure, e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
 
-    # TODO(dpranke): We should propagate the error out instead of calling
-    # exit().
-    if not output.should_continue():
-      sys.exit(1)
-
-    return output
-
   def CloseIssue(self):
     """Updates the description and closes the issue."""
     issue = int(self.GetIssue())
     self.RpcServer().update_description(issue, self.description)
     return self.RpcServer().close_issue(issue)
 
   def SetFlag(self, flag, value):
     """Patchset must match."""
     if not self.GetPatchset():
       DieWithError('The patchset needs to match. Send another patchset.')
@@ skipping 323 matching lines @@
     return 1
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
     args = [base_branch + "..."]
 
-  if not options.bypass_hooks and not options.force:
+  if not options.bypass_hooks:
     hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
-                              may_prompt=True,
+                              may_prompt=not options.force,
                               verbose=options.verbose,
                               author=None)
+    if not hook_results.should_continue():
+      return 1
     if not options.reviewers and hook_results.reviewers:
       options.reviewers = hook_results.reviewers
 
-
   # --no-ext-diff is broken in some versions of Git, so try to work around
   # this by overriding the environment (but there is still a problem if the
   # git config key "diff.external" is used).
   env = os.environ.copy()
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
   subprocess2.call(
       ['git', 'diff', '--no-ext-diff', '--stat', '-M'] + args, env=env)
 
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
@@ skipping 130 matching lines @@
     svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
                        '--pretty=format:%H'])
     extra_commits = RunGit(['rev-list', '^' + svn_head, base_branch])
     if extra_commits:
       print ('This branch has %d additional commits not upstreamed yet.'
              % len(extra_commits.splitlines()))
       print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
              'before attempting to %s.' % (base_branch, cmd))
       return 1
 
-  if not options.bypass_hooks and not options.force:
+  if not options.bypass_hooks:
     author = None
     if options.contributor:
       author = re.search(r'\<(.*)\>', options.contributor).group(1)
-    cl.RunHook(committing=True, upstream_branch=base_branch,
-               may_prompt=True, verbose=options.verbose,
-               author=author)
+    hook_results = cl.RunHook(
+        committing=True,
+        upstream_branch=base_branch,
+        may_prompt=not options.force,
+        verbose=options.verbose,
+        author=author)
+    if not hook_results.should_continue():
+      return 1
 
     if cmd == 'dcommit':
       # Check the tree status if the tree status URL is set.
       status = GetTreeStatus()
       if 'closed' == status:
-        print ('The tree is closed.  Please wait for it to reopen. Use '
-               '"git cl dcommit -f" to commit on a closed tree.')
+        print('The tree is closed.  Please wait for it to reopen. Use '
+              '"git cl dcommit --bypass-hooks" to commit on a closed tree.')
         return 1
       elif 'unknown' == status:
-        print ('Unable to determine tree status.  Please verify manually and '
-               'use "git cl dcommit -f" to commit on a closed tree.')
+        print('Unable to determine tree status.  Please verify manually and '
+              'use "git cl dcommit --bypass-hooks" to commit on a closed tree.')
   else:
     breakpad.SendStack(
         'GitClHooksBypassedCommit',
         'Issue %s/%s bypassed hook when committing' %
         (cl.GetRietveldServer(), cl.GetIssue()),
         verbose=False)
 
   description = options.message
   if not description and cl.GetIssue():
     description = cl.GetDescription()
@@ skipping 330 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))