Commit 7538b862 authored by maruel@chromium.org's avatar maruel@chromium.org

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

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/536002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35830 0039d316-1c4b-4281-b951-d872f2087c98
parent 8d4c15c3
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# found in the LICENSE file. # found in the LICENSE file.
"""Wrapper for trychange.py for git checkout.""" """Wrapper for trychange.py for git checkout."""
import logging
import sys import sys
try: try:
...@@ -35,4 +36,6 @@ if __name__ == '__main__': ...@@ -35,4 +36,6 @@ if __name__ == '__main__':
'--issue', GetRietveldIssueNumber(), '--issue', GetRietveldIssueNumber(),
'--patchset', patchset, '--patchset', patchset,
]) ])
# Hack around a limitation in logging.
logging.getLogger().handlers = []
sys.exit(trychange.TryChange(args, [], False, 'git-try')) sys.exit(trychange.TryChange(args, [], False, 'git-try'))
...@@ -263,7 +263,7 @@ def _SendChangeHTTP(options): ...@@ -263,7 +263,7 @@ def _SendChangeHTTP(options):
else: else:
proxies = {'http': options.proxy, 'https': options.proxy} proxies = {'http': options.proxy, 'https': options.proxy}
logging.warning('Sending by HTTP') logging.info('Sending by HTTP')
logging.info(description) logging.info(description)
logging.info(url) logging.info(url)
logging.info(options.diff) logging.info(options.diff)
...@@ -296,7 +296,7 @@ def _SendChangeSVN(options): ...@@ -296,7 +296,7 @@ def _SendChangeSVN(options):
values = _ParseSendChangeOptions(options) values = _ParseSendChangeOptions(options)
description = ''.join("%s=%s\n" % (k,v) for (k,v) in values.iteritems()) 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(description)
logging.info(options.svn_repo) logging.info(options.svn_repo)
logging.info(options.diff) logging.info(options.diff)
...@@ -474,6 +474,11 @@ def TryChange(argv, ...@@ -474,6 +474,11 @@ def TryChange(argv,
"useful for gclient-style checkouts. Use @rev or " "useful for gclient-style checkouts. Use @rev or "
"@branch or @branch1..branch2 to specify the " "@branch or @branch1..branch2 to specify the "
"revision/branch to diff against.") "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", group.add_option("--no_gclient", action="store_true",
help="Disable automatic search for gclient checkout.") help="Disable automatic search for gclient checkout.")
parser.add_option_group(group) parser.add_option_group(group)
...@@ -518,6 +523,8 @@ def TryChange(argv, ...@@ -518,6 +523,8 @@ def TryChange(argv,
elif options.verbose > 2: elif options.verbose > 2:
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
logging.debug(argv)
try: try:
# Always include os.getcwd() in the checkout settings. # Always include os.getcwd() in the checkout settings.
checkouts = [] checkouts = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment