Fix git-cl --contributor flag support for presubmit checks.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 errno
@@ skipping 514 matching lines @@
     if issue:
       description = self.GetDescription()
     else:
       # If the change was never uploaded, use the log messages of all commits
       # up to the branch point, as git cl upload will prefill the description
       # with these log messages.
       description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
                                 '%s...' % (upstream_branch)]).strip()
 
     if not author:
-      author = RunGit(['config', 'user.email']).strip()
+      author = RunGit(['config', 'user.email']).strip() or None
     change = presubmit_support.GitChange(
         name,
         description,
         absroot,
         files,
         issue,
         patchset,
         author)
 
     # Apply watchlists on upload.
@@ skipping 511 matching lines @@
                     help="external contributor for patch (appended to " +
                          "description and used as author for git). Should be " +
                          "formatted as 'First Last <email@example.com>'")
   (options, args) = parser.parse_args(args)
   cl = Changelist()
 
   if not args or cmd == 'push':
     # Default to merging against our best guess of the upstream branch.
     args = [cl.GetUpstreamBranch()]
 
+  if options.contributor:
+    if not re.match('^.*\s<\S+@\S+>$', options.contributor):
+      print "Please provide contibutor as 'First Last <email@example.com>'"
+      return 1
+
   base_branch = args[0]
 
   # Make sure index is up-to-date before running diff-index.
   RunGit(['update-index', '--refresh', '-q'], error_ok=True)
   if RunGit(['diff-index', 'HEAD']):
     print 'Cannot %s with a dirty tree.  You must commit locally first.' % cmd
     return 1
 
   # This rev-list syntax means "show all commits not in my branch that
   # are in base_branch".
@@ skipping 11 matching lines @@
                        '--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:
+    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=options.contributor)
+               author=author)
 
     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.')
         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.')
 
   description = options.message
   if not description and cl.GetIssue():
     description = cl.GetDescription()
 
   if not description:
     print 'No description set.'
     print 'Visit %s/edit to set it.' % (cl.GetIssueURL())
     return 1
 
   if cl.GetIssue():
     description += "\n\nReview URL: %s" % cl.GetIssueURL()
 
   if options.contributor:
-    if not re.match('^.*\s<\S+@\S+>$', options.contributor):
-      print "Please provide contibutor as 'First Last <email@example.com>'"
-      return 1
     description += "\nPatch from %s." % options.contributor
   print 'Description:', repr(description)
 
   branches = [base_branch, cl.GetBranchRef()]
   if not options.force:
     subprocess.call(['git', 'diff', '--stat'] + branches)
     ask_for_data('About to commit; enter to confirm.')
 
   # We want to squash all this branch's commits into one commit with the
   # proper description.
@@ skipping 307 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:]))