Fix commit author with git-svn.

checkout.py

 # coding=utf8
 # Copyright (c) 2010 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.
 """Manages a project checkout.
 
 Includes support for svn, git-svn and git.
 """
 
 import logging
@@ skipping 247 matching lines @@
     if self.working_branch in branches:
       self._call_git(['branch', '-D', self.working_branch])
 
   def apply_patch(self, patch_data):
     """Applies a patch on 'working_branch'."""
     try:
       self._check_call_git(
           ['checkout', '-b', self.working_branch,
           '%s/%s' % (self.remote, self.remote_branch)])
       self._check_call_git(['apply', '--index', '-p0'], stdin=patch_data)
-      self._check_call_git(['commit', '-m', 'Committed patch'])
+      cmd = ['commit', '-m', 'Committed patch', '--quiet']
+      self._check_call_git(cmd)
+      commit_user = getattr(self, 'commit_user', None)
+      if commit_user:
+        try:
+          # Try to patch the author with commit_user since it may differ.
+          self._check_call_git(cmd + ['--author=%s' % commit_user])
+        except subprocess.CalledProcessError, e:
+          if e.returncode != 128:
+            raise
       return self._check_capture_git(['diff', 'master',
         '--name-only']).splitlines(False)
     except subprocess.CalledProcessError, e:
       if e.returncode == 1:
         return False
       raise
 
   def commit(self, commit_message, user):
-    """Updates the commit message.
+    """Updates the commit message and user if possible.
 
-    Subclass needs to dcommit or push."""
-    self._check_call_git(['commit', '--amend', '-m', commit_message])
+    Subclass needs to dcommit or push.
+    """
+    # Do it in two calls to ease exception management.
+    cmd = ['commit', '--amend', '-m', commit_message, '--quiet']
+    self._check_call_git(cmd)
+    try:
+      # git-svn will allow faking the author only if the user already exists in
+      # the logs.
+      # Provide -m again otherwise git will start a text editor.
+      self._check_call_git(cmd + ['--author=%s' % user])
+    except subprocess.CalledProcessError, e:
+      if e.returncode != 128:
+        raise
 
   def _check_call_git(self, args, **kwargs):
     kwargs.setdefault('cwd', self.project_path)
     return subprocess2.check_call(['git'] + args, **kwargs)
 
   def _call_git(self, args, **kwargs):
     """Like check_call but doesn't throw on failure."""
     kwargs.setdefault('cwd', self.project_path)
     return subprocess2.call(['git'] + args, **kwargs)
 
@@ skipping 51 matching lines @@
     return int(self._git_svn_info('revision'))
 
   def _git_svn_info(self, key):
     """Calls git svn info. This doesn't support nor need --config-dir."""
     return self._parse_svn_info(
         self._check_capture_git(['svn', 'info']), key)
 
   def commit(self, commit_message, user):
     """Commits a patch."""
     logging.info('Committing patch for %s' % user)
-    # Fix the commit message.
+    # Fix the commit message and author.
     super(GitSvnCheckoutBase, self).commit(commit_message, user)
     # Commit with git svn dcommit, then use svn directly to update the
     # committer on the revision.
     self._check_call_git_svn(['dcommit', '--rmdir', '--find-copies-harder'])
     revision = int(self._git_svn_info('revision'))
     # Fix the committer.
     self._update_committer(revision, user)
     return revision
 
   def _cache_svn_auth(self):
@@ skipping 98 matching lines @@
         user, message))
     return 'FAKE'
 
   @property
   def project_name(self):
     return self.checkout.project_name
 
   @property
   def project_path(self):
     return self.checkout.project_path