Add --allow-dirty option to "git cl upload"

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 json
@@ skipping 1220 matching lines @@
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
   parser.add_option('-m', dest='message', help='message for patchset')
   parser.add_option('-t', dest='title', help='title for patchset')
   parser.add_option('-r', '--reviewers',
                     help='reviewer email addresses')
   parser.add_option('--cc',
                     help='cc email addresses')
+  parser.add_option('--allow-dirty', action='store_true',
+                    help='Allow upload even when there are uncommited changes')

[Sam Clegg, 2013/01/10 19:48:29]

I would have preferred to use --force here for this purpose (to match the
behaviour of git cl presubmit) but it looks like -f/force already has a slightly
different meaning here.

The current -f/force should really be called -y/--yes or --no-internactive I
guess...

   parser.add_option('--send-mail', action='store_true',
                     help='send email to reviewer immediately')
   parser.add_option("--emulate_svn_auto_props", action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
   parser.add_option('--target_branch',
                     help='When uploading to gerrit, remote branch to '
                          'use for CL.  Default: master')
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
   if options.target_branch and not settings.GetIsGerrit():
     parser.error('Use --target_branch for non gerrit repository.')
 
   # Print warning if the user used the -m/--message argument.  This will soon
   # change to -t/--title.
   if options.message:
     print >> sys.stderr, (
         '\nWARNING: Use -t or --title to set the title of the patchset.\n'
         'In the near future, -m or --message will send a message instead.\n'
         'See http://goo.gl/JGg0Z for details.\n')
 
-  if is_dirty_git_tree('upload'):
+  if not options.allow_dirty and is_dirty_git_tree('upload'):
     return 1
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
   else:
     # Default to diffing against common ancestor of upstream branch
     base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
     args = [base_branch]
+    if options.allow_dirty:
+      args.append('HEAD')

[Sam Clegg, 2013/01/10 19:48:29]

We most likely should just add 'HEAD' in all cases (as we never want to include
local change in the upload)... but there are a bunch of unit tests that check
args that break.  
Happy to update them too if you agree that "HEAD" always makes sense here? 
(HEAD might be slight speed improvement too as it doesn't need to stat all the
files in the local tree to generate the diff).

 
   if not options.bypass_hooks:
     hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
                               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
@@ skipping 580 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:]))