Add scm.*.GetEmail() to retrieve the user email. Use this email for try job emails.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 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.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 
@@ skipping 157 matching lines @@
       # Generate the diff with svn and write it to the submit queue path.  The
       # files are relative to the repository root, but we need patches relative
       # to one level up from there (i.e., 'src'), so adjust both the file
       # paths and the root of the diff.
       source_root = GetSourceRoot()
       prefix = PathDifference(source_root, gcl.GetRepositoryRoot())
       adjusted_paths = [os.path.join(prefix, x) for x in self.options.files]
       self.options.diff = self.GenerateDiff(adjusted_paths, root=source_root)
       self.change_info = gcl.LoadChangelistInfoForMultiple(self.options.name,
           gcl.GetRepositoryRoot(), True, True)
+    if not self.options.email:
+      self.options.email = scm.SVN.GetEmail(gcl.GetRepositoryRoot())
 
 
 class GIT(SCM):
   """Gathers the options and diff for a git checkout."""
   def GenerateDiff(self):
     """Get the diff we'll send to the try server. We ignore the files list."""
     branch = upload.RunShell(['git', 'cl', 'upstream']).strip()
     diff = upload.RunShell(['git', 'diff-tree', '-p', '--no-prefix',
                             branch, 'HEAD']).splitlines(True)
     for i in range(len(diff)):
       # In the case of added files, replace /dev/null with the path to the
       # file being added.
       if diff[i].startswith('--- /dev/null'):
         diff[i] = '--- %s' % diff[i+1][4:]
     return ''.join(diff)
 
-  def GetEmail(self):
-    # TODO: check for errors here?
-    return upload.RunShell(['git', 'config', 'user.email']).strip()
-
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.options.files
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     # TODO: check for errors here?
     root = upload.RunShell(['git', 'rev-parse', '--show-cdup']).strip()
     return os.path.abspath(root)
 
   def GetPatchName(self):
     """Construct a name for this patch."""
     # TODO: perhaps include the hash of the current commit, to distinguish
     # patches?
     branch = upload.RunShell(['git', 'symbolic-ref', 'HEAD']).strip()
     if not branch.startswith('refs/heads/'):
       # TODO(maruel): Find a better type.
       raise NoTryServerAccess("Couldn't figure out branch name")
     branch = branch[len('refs/heads/'):]
     return branch
 
   def ProcessOptions(self):
     if not self.options.diff:
       self.options.diff = self.GenerateDiff()
     if not self.options.name:
       self.options.name = self.GetPatchName()
     if not self.options.email:
-      self.options.email = self.GetEmail()
+      self.options.email = scm.GIT.GetEmail('.')
 
 
 def _ParseSendChangeOptions(options):
   """Parse common options passed to _SendChangeHTTP and _SendChangeSVN."""
   values = {}
   if options.email:
     values['email'] = options.email
   values['user'] = options.user
   values['name'] = options.name
   if options.bot:
@@ skipping 328 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, None, False))