Sync git-cl and git-try to the master branch.

git-try.py

 #!/usr/bin/python
 
 # Repo lives in ~evanm/projects/git-try -- feel free to send patches.
 
 import getpass
 import optparse
 import os
 import subprocess
 import tempfile
 import traceback
@@ skipping 27 matching lines @@
   """Return name of current git branch."""
   branch = Backquote(['git', 'symbolic-ref', 'HEAD'])
   if not branch.startswith('refs/heads/'):
     raise "Couldn't figure out branch name"
   branch = branch[len('refs/heads/'):]
   return branch
 
 
 def GetPatchName():
   """Construct a name for this patch."""
-  # TODO: perhaps include the hash of the current commit, to distinguish
-  # patches?
-  return GetBranchName()
+  short_sha = Backquote(['git', 'rev-parse', '--short=4', 'HEAD'])
+  return GetBranchName() + '-' + short_sha
 
 
 def GetRevision():
   """Get the latest Subversion revision number."""
   for line in Backquote(['git', 'svn', 'info']).split('\n'):
     if line.startswith('Revision:'):
       return line[len('Revision:'):].strip()
   raise "Couldn't figure out latest revision"
 
 
@@ skipping 108 matching lines @@
     user = email.partition('@')[0]
     args = [
         '--use_svn',
         '--svn_repo', 'svn://svn.chromium.org/chrome-try/try',
         '-u', user,
         '-e', email,
         '-n', patch_name,
         '-r', GetRevision(),
         '--diff', diff_file.name,
     ]
+    if options.bot:
+      args.extend(['--bot', options.bot])
+    if options.clobber:
+      args.append('--clobber')
     if GetRietveldPatchsetNumber():
       args.extend([
           '--issue', GetRietveldIssueNumber(),
           '--patchset', GetRietveldPatchsetNumber(),
       ])
     TryChange(args=args)