Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: trychange.py

Issue 507072: Factor out PathDifference into gclient_utils for a later reuse. (Closed)
Patch Set: Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/gclient_utils_test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trychange.py
diff --git a/trychange.py b/trychange.py
index 6f57802ff1f29d61f68d15e7bd52ee3c48bacd4b..38d817ca8ed4960ca1dc562ceedbe223981890bb 100755
--- a/trychange.py
+++ b/trychange.py
@@ -427,6 +427,8 @@ def TryChange(argv,
parser.add_option_group(group)
options, args = parser.parse_args(argv)
+ if len(args) == 1 and args[0] == 'help':
+ parser.print_help()
# Switch the default accordingly if there was no default send_patch.
if not options.send_patch:
@@ -437,19 +439,15 @@ def TryChange(argv,
else:
parser.error('Please specify an access method.')
- 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.
- parser.error('Nothing to try, changelist is empty.')
-
try:
# Convert options.diff into the content of the diff.
if options.url:
+ if options.files:
+ parser.error('You cannot specify files and --url at the same time.')
options.diff = urllib.urlopen(options.url).read()
elif options.diff:
+ if options.files:
+ parser.error('You cannot specify files and --diff at the same time.')
options.diff = gclient_utils.FileRead(options.diff, 'rb')
# Process the VCS in any case at least to retrieve the email address.
try:
@@ -486,8 +484,8 @@ def TryChange(argv,
options.name = 'Unnamed'
print('Note: use --name NAME to change the try job name.')
if not options.email:
- print('Warning: TRYBOT_RESULTS_EMAIL_ADDRESS is not set. Try server '
- 'results might\ngo to: %s@google.com.\n' % options.user)
+ parser.error('Using an anonymous checkout. Please use --email or set '
+ 'the TRYBOT_RESULTS_EMAIL_ADDRESS environment variable.')
else:
print('Results will be emailed to: ' + options.email)
« no previous file with comments | « tests/gclient_utils_test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698