Add --force as a synonym for --no_presubmit as per Nicolas' request.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 227 matching lines @@
   return result
 
 
 def WriteFile(filename, contents):
   """Overwrites the file with the given contents."""
   file = open(filename, 'w')
   file.write(contents)
   file.close()
 
 
+def FilterFlag(args, flag):
+  """Returns True if the flag is present in args list.
+
+  The flag is removed from args if present.
+  """
+  if flag in args:
+    args.remove(flag)
+    return True
+  return False
+
+
 class ChangeInfo(object):
   """Holds information about a changelist.
 
     name: change name.
     issue: the Rietveld issue number or 0 if it hasn't been uploaded yet.
     patchset: the Rietveld latest patchset number or 0.
     description: the description.
     files: a list of 2 tuple containing (status, filename) of changed files,
            with paths being relative to the top repository directory.
   """
@@ skipping 448 matching lines @@
       #  svn diff on a mv/cp'd file outputs nothing.
       # We put in an empty Index entry so upload.py knows about them.
       diff.append("\nIndex: %s\n" % file)
     else:
       # The file is not modified anymore. It should be removed from the set.
       pass
   os.chdir(previous_cwd)
   return "".join(diff)
 
 
+
+def OptionallyDoPresubmitChecks(change_info, committing, args):
+  if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
+    return True
+  return DoPresubmitChecks(change_info, committing=committing)
+
+
 def UploadCL(change_info, args):
   if not change_info.FileList():
     print "Nothing to upload, changelist is empty."
     return
-
-  if not "--no_presubmit" in args:
-    if not DoPresubmitChecks(change_info, committing=False):
-      return
-  else:
-    args.remove("--no_presubmit")
-
-  no_try = "--no_try" in args
-  if no_try:
-    args.remove("--no_try")
-  else:
-    # Support --no-try as --no_try
-    no_try = "--no-try" in args
-    if no_try:
-      args.remove("--no-try")
+  if not OptionallyDoPresubmitChecks(change_info, False, args):
+    return
+  no_try = FilterFlag(args, "--no_try") or FilterFlag(args, "--no-try")
 
   # Map --send-mail to --send_mail
-  if "--send-mail" in args:
-    args.remove("--send-mail")
+  if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
   # Supports --clobber for the try server.
-  clobber = False
-  if "--clobber" in args:
-    args.remove("--clobber")
-    clobber = True
+  clobber = FilterFlag(args, "--clobber")
 
   # Disable try when the server is overridden.
   server_1 = re.compile(r"^-s\b.*")
   server_2 = re.compile(r"^--server\b.*")
   for arg in args:
     if server_1.match(arg) or server_2.match(arg):
       no_try = True
       break
 
   upload_arg = ["upload.py", "-y"]
@@ skipping 103 matching lines @@
     trychange.TryChange(args,
                         file_list=None,
                         swallow_exception=swallow_exception,
                         prog='gcl try')
 
 
 def Commit(change_info, args):
   if not change_info.FileList():
     print "Nothing to commit, changelist is empty."
     return
-
-  if not "--no_presubmit" in args:
-    if not DoPresubmitChecks(change_info, committing=True):
-      return
-  else:
-    args.remove("--no_presubmit")
+  if not OptionallyDoPresubmitChecks(change_info, True, args):
+    return
 
   # We face a problem with svn here: Let's say change 'bleh' modifies
   # svn:ignore on dir1\. but another unrelated change 'pouet' modifies
   # dir1\foo.cc. When the user `gcl commit bleh`, foo.cc is *also committed*.
   # The only fix is to use --non-recursive but that has its issues too:
   # Let's say if dir1 is deleted, --non-recursive must *not* be used otherwise
   # you'll get "svn: Cannot non-recursively commit a directory deletion of a
   # directory with child nodes". Yay...
   commit_cmd = ["svn", "commit"]
   filename = ''
@@ skipping 273 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())