Small fixes.

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 313 matching lines @@
     if (values.get('bot') and len(e.args) > 2 and
         e.args[2] == 'got a bad status line'):
       raise NoTryServerAccess('%s is unaccessible. Bad --bot argument?' % url)
     else:
       raise NoTryServerAccess('%s is unaccessible. Reason: %s' % (url,
                                                                   str(e.args)))
   if not connection:
     raise NoTryServerAccess('%s is unaccessible.' % url)
   if connection.read() != 'OK':
     raise NoTryServerAccess('%s is unaccessible.' % url)
-  return options.name
 
 
 def _SendChangeSVN(options):
   """Send a change to the try server by committing a diff file on a subversion
   server."""
   if not options.svn_repo:
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
                             ' try server svn repository to connect to.')
 
   values = _ParseSendChangeOptions(options)
@@ skipping 42 matching lines @@
       file.write(options.diff)
       file.close()
       RunCommand(["svn", "add", full_path])
     temp_file.write(description)
     temp_file.flush()
     RunCommand(["svn", "commit", full_path, '--file',
                 temp_file_name])
   finally:
     temp_file.close()
     shutil.rmtree(temp_dir, True)
-  return options.name
 
 
 def GuessVCS(options):
   """Helper to guess the version control system.
 
   NOTE: Very similar to upload.GuessVCS. Doesn't look for hg since we don't
   support it yet.
 
   This examines the current directory, guesses which SCM we're using, and
   returns an instance of the appropriate class.  Exit with an error if we can't
@@ skipping 43 matching lines @@
                                  version=__version__,
                                  prog=prog)
 
   group = optparse.OptionGroup(parser, "Result and status")
   group.add_option("-u", "--user", default=getpass.getuser(),
                    help="Owner user name [default: %default]")
   group.add_option("-e", "--email", default=os.environ.get('EMAIL_ADDRESS'),
                    help="Email address where to send the results. Use the "
                         "EMAIL_ADDRESS environment variable to set the default "
                         "email address [default: %default]")
-  group.add_option("-n", "--name", default='Unnamed',
+  group.add_option("-n", "--name",
                    help="Descriptive name of the try job")
   group.add_option("--issue", type='int',
                    help="Update rietveld issue try job status")
   group.add_option("--patchset", type='int',
                    help="Update rietveld issue try job status")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Try job options")
   group.add_option("-b", "--bot", action="append",
                     help="Only use specifics build slaves, ex: '--bot win' to "
@@ skipping 77 matching lines @@
     elif options.svn_repo:
       options.send_patch = _SendChangeSVN
 
   if len(args) == 1 and args[0] == 'help':
     parser.print_help()
   if (not options.files and (not options.issue and options.patchset) and
       not options.diff and not options.url):
     # TODO(maruel): It should just try the modified files showing up in a
     # svn status.
     print "Nothing to try, changelist is empty."
-    return
+    return 1
 
   try:
     # Convert options.diff into the content of the diff.
     if options.url:
       options.diff = urllib.urlopen(options.url).read()
     elif options.diff:
       options.diff = gcl.ReadFile(options.diff)
     # Process the VCS in any case at least to retrieve the email address.
     try:
       options.scm = GuessVCS(options)
       options.scm.ProcessOptions()
     except NoTryServerAccess, e:
       # If we got the diff, we don't care.
       if not options.diff:
         raise
 
     # Get try slaves from PRESUBMIT.py files if not specified.
     if not options.bot:
+      if options.url:

[Nicolas Sylvain, 2009/11/03 18:49:00]

why? It makes total sense to me to specify url byt not bot. Are you sure you are
not working around a bug? GoGetTrySlaves should not fail when url is set but not
bot.

+        print('You need to specify which bots to use.')
+        return 1
       root_presubmit = gcl.GetCachedFile('PRESUBMIT.py', use_root=True)
       options.bot = presubmit_support.DoGetTrySlaves(options.scm.GetFileNames(),
                                                      options.scm.GetLocalRoot(),
                                                      root_presubmit,
                                                      False,
                                                      sys.stdout)
 
+    if options.name is None:
+      if options.issue:
+        patch_name = 'Issue %s' % options.issue
+      else:
+        options.name = 'Unnamed'
+        print('Note: use --name NAME to change the try job name.')
+    if not options.email:
+      print('Warning: try job email will be sent to %s@google.com or '
+            'something like that. Who knows? Set EMAIL_ADDRESS to override.'
+            % option.user)
+
     # Send the patch.
-    patch_name = options.send_patch(options)
-    print 'Patch \'%s\' sent to try server: %s' % (patch_name,
+    options.send_patch(options)
+    print 'Patch \'%s\' sent to try server: %s' % (options.name,
                                                    ', '.join(options.bot))
-    if patch_name == 'Unnamed':
-      print "Note: use --name NAME to change the try's name."
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
-      return
+      return 1
     print e
+    return 1
+  return 0
 
 
 if __name__ == "__main__":
-  TryChange(None, None, False)
+  sys.exit(TryChange(None, None, False))