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

Unified Diff: recipes.py

Issue 2845873002: [recipes.py] move autoroll arg parsing to its module (Closed)
Patch Set: rebase Created 3 years, 8 months 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 | « recipe_engine/autoroll.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipes.py
diff --git a/recipes.py b/recipes.py
index 1fa7bfcc5b0101cf5c9088117e38c0cd24e0bf1e..090c7d02d48c0a71304eca3adfa07367ee4ec69d 100755
--- a/recipes.py
+++ b/recipes.py
@@ -226,16 +226,6 @@ def remote(args):
return remote.main(args)
-def autoroll(repo_root, config_file, args):
- from recipe_engine import autoroll
-
- if args.verbose_json and not args.output_json:
- print >> sys.stderr, '--verbose-json passed without --output-json'
- return 1
-
- return autoroll.main(args, repo_root, config_file)
-
-
class ProjectOverrideAction(argparse.Action):
def __call__(self, parser, namespace, values, option_string=None):
p = values.split('=', 2)
@@ -390,8 +380,8 @@ def main():
common_postprocess_func = add_common_args(parser)
- from recipe_engine import fetch, lint_test, bundle, depgraph
- to_add = [fetch, lint_test, bundle, depgraph]
+ from recipe_engine import fetch, lint_test, bundle, depgraph, autoroll
+ to_add = [fetch, lint_test, bundle, depgraph, autoroll]
subp = parser.add_subparsers()
for module in to_add:
@@ -500,19 +490,6 @@ def main():
'remote_args', nargs='*',
help='Arguments to pass to fetched repo\'s recipes.py')
- autoroll_p = subp.add_parser(
- 'autoroll',
- help='Roll dependencies of a recipe package forward (implies fetch)')
- autoroll_p.set_defaults(command='autoroll')
- autoroll_p.add_argument(
- '--output-json',
- type=os.path.abspath,
- help='A json file to output information about the roll to.')
- autoroll_p.add_argument(
- '--verbose-json',
- action='store_true',
- help=('Emit even more data in the output-json file. '
- 'Requires --output-json.'))
refs_p = subp.add_parser(
'refs',
@@ -658,8 +635,6 @@ def _real_main(args):
return test(config_file, package_deps, args)
elif args.command == 'run':
return run(config_file, package_deps, args)
- elif args.command == 'autoroll':
- return autoroll(repo_root, config_file, args)
elif args.command == 'refs':
return refs(config_file, package_deps, args)
elif args.command == 'doc':
« no previous file with comments | « recipe_engine/autoroll.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698