diff --git a/git-try b/git-try index bd78ebf957..713372bf67 100755 --- a/git-try +++ b/git-try @@ -4,6 +4,7 @@ # found in the LICENSE file. """Wrapper for trychange.py for git checkout.""" +import logging import sys try: @@ -35,4 +36,6 @@ if __name__ == '__main__': '--issue', GetRietveldIssueNumber(), '--patchset', patchset, ]) + # Hack around a limitation in logging. + logging.getLogger().handlers = [] sys.exit(trychange.TryChange(args, [], False, 'git-try')) diff --git a/trychange.py b/trychange.py index aa4cdad32d..29310b5c25 100755 --- a/trychange.py +++ b/trychange.py @@ -263,7 +263,7 @@ def _SendChangeHTTP(options): 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) @@ -296,7 +296,7 @@ def _SendChangeSVN(options): 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) @@ -474,6 +474,11 @@ def TryChange(argv, "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) @@ -518,6 +523,8 @@ def TryChange(argv, elif options.verbose > 2: logging.basicConfig(level=logging.DEBUG) + logging.debug(argv) + try: # Always include os.getcwd() in the checkout settings. checkouts = []