Small cleanups in trychange.py

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.
 """
 
 import datetime
@@ skipping 98 matching lines @@
       ]
       os.chdir(previous_cwd)
     return scm.SVN.GenerateDiff(self.options.files, full_move=True)
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.checkout_root
 
   def GetBots(self):
     try:
+      # Try to search on the subversion repository for the file.
       import gcl
       return gcl.GetCachedFile('PRESUBMIT.py', use_root=True)
     except ImportError:
       try:
         return gclient_utils.FileRead(os.path.join(self.checkout_root,
                                                    'PRESUBMIT.py'))
       except (IOError, OSError):
         return None
 
 
 class GIT(SCM):
   """Gathers the options and diff for a git checkout."""
   def __init__(self, *args, **kwargs):
     SCM.__init__(self, *args, **kwargs)
     self.checkout_root = os.path.abspath(
-        gclient_utils.CheckCall(['git', 'rev-parse', '--show-cdup']).strip())
+        scm.GIT.Capture(['rev-parse', '--show-cdup']).strip())
     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 = scm.GIT.GetEmail('.')
 
   def _GenerateDiff(self):
     """Get the diff we'll send to the try server. We ignore the files list."""
     return scm.GIT.GenerateDiff(self.checkout_root)
 
   def _GetPatchName(self):
     """Construct a name for this patch."""
-    # TODO: perhaps include the hash of the current commit, to distinguish
-    # patches?
-    branch = gclient_utils.CheckCall(['git', 'symbolic-ref', 'HEAD']).strip()
-    if not branch.startswith('refs/heads/'):
-      # TODO(maruel): Find a better type.
+    branch_ref = scm.GIT.GetBranchRef(self.checkout_root)
+    branch = scm.GIT.ShortBranchName(branch_ref)
+    if branch == branch_ref:
       raise NoTryServerAccess("Couldn't figure out branch name")
-    branch = branch[len('refs/heads/'):]
     return branch
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.checkout_root
 
   def GetBots(self):
     try:
+      # A git checkout is always a full checkout.
       return gclient_utils.FileRead(os.path.join(self.checkout_root,
                                                  'PRESUBMIT.py'))
     except (IOError, OSError):
       return None
 
 
 def _ParseSendChangeOptions(options):
   """Parse common options passed to _SendChangeHTTP and _SendChangeSVN."""
   values = {}
   if options.email:
@@ skipping 320 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))