Add 'remote' command to replace 'remote_run'

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 133 matching lines @@
       ret = recipe_run.run_steps(
           properties, stream_engine,
           step_runner.SubprocessStepRunner(stream_engine),
           universe=universe)
     finally:
       os.chdir(old_cwd)
 
     return handle_recipe_return(ret, args.output_result_json, stream_engine)
 
 
+def remote(args):
+  from recipe_engine import remote
+
+  return remote.main(args)
+
+
 def remote_run(args):
   from recipe_engine import remote_run
 
   return remote_run.main(args)
 
 
 def autoroll(args):
   from recipe_engine import autoroll
 
   repo_root, config_file = get_package_config(args)
@@ skipping 145 matching lines @@
       action='store_true',
       help='If true, emit CURRENT_TIMESTAMP annotations. '
            'Default: false. '
            'CURRENT_TIMESTAMP annotation has one parameter, current time in '
            'Unix timestamp format. '
            'CURRENT_TIMESTAMP annotation will be printed at the beginning and '
            'end of the annotation stream and also immediately before each '
            'STEP_STARTED and STEP_CLOSED annotations.',
   )
 
+  remote_p = subp.add_parser(
+      'remote',
+      description='Invoke a recipe command from specified repo and revision')
+  remote_p.set_defaults(command='remote')
+  remote_p.add_argument(
+      '--repository', required=True,
+      help='URL of a git repository to fetch')
+  remote_p.add_argument(
+      '--revision',
+      help='Git commit hash to check out; defaults to latest revision (HEAD)')
+  remote_p.add_argument(
+      '--workdir',
+      help='The working directory of repo checkout')
+  remote_p.add_argument(
+      '--use-gitiles', action='store_true',
+      help='Use Gitiles-specific way to fetch repo (potentially cheaper for '
+           'large repos)')
+  remote_p.add_argument(
+      'remote_args', nargs='*',
+      help='Arguments to pass to fetched repo\'s recipes.py')
+
   remote_run_p = subp.add_parser(
       'remote_run',
       description='Run a recipe from specified repo and revision')
   remote_run_p.set_defaults(command='remote_run')
   remote_run_p.add_argument(
       '--repository', required=True,
       help='URL of a git repository to fetch')
   remote_run_p.add_argument(
       '--revision',
       help='Git commit hash to check out; defaults to latest revision (HEAD)')
@@ skipping 63 matching lines @@
     args = sys.argv
     return subprocess.call(
         ['ENV/bin/python'] + original_sys_argv,
         cwd=os.path.dirname(os.path.realpath(__file__)))
 
   if args.verbose:
     logging.getLogger().setLevel(logging.INFO)
 
   # Commands which do not require config_file, package_deps, and other objects
   # initialized later.
-  if args.command == 'remote_run':
+  if args.command == 'remote':
+    return remote(args)
+  elif args.command == 'remote_run':
     return remote_run(args)
 
   repo_root, config_file = get_package_config(args)
 
   try:
     # TODO(phajdan.jr): gracefully handle inconsistent deps when rolling.
     # This fails if the starting point does not have consistent dependency
     # graph. When performing an automated roll, it'd make sense to attempt
     # to automatically find a consistent state, rather than bailing out.
     # Especially that only some subcommands refer to package_deps.
@@ skipping 48 matching lines @@
   ret = main()
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)