Add --webkit option as a shorthand for -s third_party/WebKit.

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 245 matching lines @@
 
   url = 'http://%s:%s/send_try_patch' % (options.host, options.port)
   proxies = None
   if options.proxy:
     if options.proxy.lower() == 'none':
       # Effectively disable HTTP_PROXY or Internet settings proxy setup.
       proxies = {}
     else:
       proxies = {'http': options.proxy, 'https': options.proxy}
 
-  logging.warning('Sending by HTTP')
+  logging.info('Sending by HTTP')
   logging.info(description)
   logging.info(url)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   try:
     connection = urllib.urlopen(url, urllib.urlencode(values), proxies=proxies)
   except IOError, e:
     logging.warning(str(e))
@@ skipping 12 matching lines @@
 
 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)
   description = ''.join("%s=%s\n" % (k,v) for (k,v) in values.iteritems())
-  logging.warning('Sending by SVN')
+  logging.info('Sending by SVN')
   logging.info(description)
   logging.info(options.svn_repo)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   # Do an empty checkout.
   temp_dir = tempfile.mkdtemp()
   temp_file = tempfile.NamedTemporaryFile()
   try:
@@ skipping 157 matching lines @@
   group.add_option("--root",
                    help="Root to use for the patch; base subdirectory for "
                         "patch created in a subdirectory")
   group.add_option("-p", "--patchlevel", type='int', metavar="LEVEL",
                    help="Used as -pN parameter to patch")
   group.add_option("-s", "--sub_rep", action="append", default=[],
                    help="Subcheckout to use in addition. This is mainly "
                         "useful for gclient-style checkouts. Use @rev or "
                         "@branch or @branch1..branch2 to specify the "
                         "revision/branch to diff against.")
+  # Mostly chromium-specific
+  group.add_option("--webkit", action="append_const",
+                   const="third_party/WebKit",
+                   dest="sub_rep",
+                   help="Shorthand for -s third_party/WebKit")
   group.add_option("--no_gclient", action="store_true",
                    help="Disable automatic search for gclient checkout.")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
                    action="store_const",
                    const=_SendChangeHTTP,
                    dest="send_patch",
                    help="Use HTTP to talk to the try server [default]")
@@ skipping 24 matching lines @@
   if not swallow_exception:
     if options.verbose == 0:
       logging.basicConfig(level=logging.ERROR)
     elif options.verbose == 1:
       logging.basicConfig(level=logging.WARNING)
     elif options.verbose == 2:
       logging.basicConfig(level=logging.INFO)
     elif options.verbose > 2:
       logging.basicConfig(level=logging.DEBUG)
 
+  logging.debug(argv)
+
   try:
     # Always include os.getcwd() in the checkout settings.
     checkouts = []
     checkouts.append(GuessVCS(options, os.getcwd()))
     checkouts[0].AutomagicalSettings()
     for item in options.sub_rep:
       checkout = GuessVCS(options, os.path.join(checkouts[0].checkout_root,
                                                 item))
       if checkout.checkout_root in [c.checkout_root for c in checkouts]:
         parser.error('Specified the root %s two times.' %
@@ skipping 80 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))