Merge pull request iterative#2205 from jorgeorpinel/master

import: add import and get to autocomplete scripts; et al

dvc/command/cache.py

@@ -57,7 +57,6 @@ def add_parser(subparsers, parent_parser):
     )
     cache_dir_parser.add_argument(
         "value",
-        default=None,
         help="Path to cache directory. Relative paths are resolved relative "
         "to the current directory and saved to config relative to the "
         "config file location.",

dvc/command/config.py

@@ -74,7 +74,5 @@ def add_parser(subparsers, parent_parser):
         help="Unset option.",
     )
     config_parser.add_argument("name", help="Option name.")
-    config_parser.add_argument(
-        "value", nargs="?", default=None, help="Option value."
-    )
+    config_parser.add_argument("value", nargs="?", help="Option value.")
     config_parser.set_defaults(func=CmdConfig)

dvc/command/data_sync.py

@@ -101,11 +101,7 @@ def shared_parent_parser():
         add_help=False, parents=[get_parent_parser()]
     )
     shared_parent_parser.add_argument(
-        "-j",
-        "--jobs",
-        type=int,
-        default=None,
-        help="Number of jobs to run simultaneously.",
+        "-j", "--jobs", type=int, help="Number of jobs to run simultaneously."
     )
     shared_parent_parser.add_argument(
         "--show-checksums",

dvc/command/diff.py

@@ -144,7 +144,6 @@ def add_parser(subparsers, parent_parser):
     diff_parser.add_argument(
         "-t",
         "--target",
-        default=None,
         help=(
             "Source path to a data file or directory. Default None. "
             "If not specified, compares all files and directories "
@@ -161,6 +160,5 @@ def add_parser(subparsers, parent_parser):
             "diff shows the difference between current HEAD and a_ref"
         ),
         nargs="?",
-        default=None,
     )
     diff_parser.set_defaults(func=CmdDiff)

dvc/command/gc.py

@@ -94,19 +94,14 @@ def add_parser(subparsers, parent_parser):
         help="Force garbage collection - automatically agree to all prompts.",
     )
     gc_parser.add_argument(
-        "-j",
-        "--jobs",
-        type=int,
-        default=None,
-        help="Number of jobs to run simultaneously.",
+        "-j", "--jobs", type=int, help="Number of jobs to run simultaneously."
     )
     gc_parser.add_argument(
         "-p",
         "--projects",
         dest="repos",
         type=str,
         nargs="*",
-        default=None,
         help="Keep data files required by these projects "
         "in addition to the current one. "
         "Useful if you share a single cache across repos.",

dvc/command/run.py

@@ -130,12 +130,11 @@ def add_parser(subparsers, parent_parser):
         "-f", "--file", help="Specify name of the DVC-file it generates."
     )
     run_parser.add_argument(
-        "-c", "--cwd", default=None, help="Deprecated, use -w and -f instead."
+        "-c", "--cwd", help="Deprecated, use -w and -f instead."
     )
     run_parser.add_argument(
         "-w",
         "--wdir",
-        default=None,
         help="Directory within your repo to run your command in.",
     )
     run_parser.add_argument(

scripts/completion/dvc.bash

@@ -8,20 +8,24 @@
 #   - https://opensource.com/article/18/3/creating-bash-completion-script
 #----------------------------------------------------------
 
-_dvc_commands='init destroy add import checkout run pull push fetch \
-              status repro remove move unprotect gc config remote metrics \
-              install root lock unlock pipeline commit'
+_dvc_commands='add checkout commit config destroy fetch get-url get gc \
+              import-url import init install lock metrics move pipeline pull push \
+              remote remove repro root run status unlock unprotect'
 
 _dvc_options="-h --help -v --version"
 _dvc_global_options="-h --help -q --quiet -V --verbose"
 
 _dvc_add="-R --recursive -f --file --no-commit"
 _dvc_checkout="$(compgen -G '*.dvc')"
+_dvc_commit=""
 _dvc_config="-u --unset --local --system --global"
 _dvc_destroy="-f --force"
 _dvc_fetch="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive"
+_dvc_get-url=""
+_dvc_get="-o --out --rev"
 _dvc_gc="-a --all-branches -T --all-tags -c --cloud -r --remote -f --force -p --project"
-_dvc_import="--resume"
+_dvc_import-url="--resume -f --file"
+_dvc_import="-o --out --rev"
 _dvc_init="--no-scm -f --force"
 _dvc_install=""
 _dvc_lock="$(compgen -G '*.dvc')"
@@ -37,6 +41,7 @@ _dvc_root=""
 _dvc_run="--no-exec -f --file -c --cwd -d --deps -o --outs -O --outs-no-cache -M --metrics-no-cache -y --yes --overwrite-dvc-file --ignore-build-cache --remove-outs --no-commit -w --wdir"
 _dvc_status="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -c --cloud -q --quiet"
 _dvc_unlock="$(compgen -G '*.dvc')"
+_dvc_unprotect=""
 
 # Notes:
 #

scripts/completion/dvc.zsh

@@ -20,8 +20,11 @@ _dvc_commands() {
     "destroy:Remove DVC-files, local DVC config and data cache."
     "diff:Show a diff of a DVC controlled data file or a directory."
     "fetch:Fetch data files from a DVC remote storage."
+    "get-url:Download or copy files from URL."
+    "get:Download data from DVC repository."
     "gc:Collect unused data from DVC cache or a remote storage."
-    "import:Download or copy files from URL and take under DVC control."
+    "import-url:Download or copy file from URL and take it under DVC control."
+    "import:Download data from DVC repository and take it under DVC control."
     "init:Initialize DVC in the current directory."
     "install:Install DVC git hooks into the repository."
     "lock:Lock DVC-file."
@@ -106,6 +109,18 @@ _dvc_fetch=(
   "*:Stages:_files -g '(*.dvc|Dvcfile)'"
 )
 
+_dvc_geturl=(
+  "1:URL:"
+  "2:Output:"
+)
+
+_dvc_get=(
+  {-o,--out}"[Destination path to put data to.]:OUT:_files -/"
+  "--rev[DVC repository git revision.]:Commit hash:"
+  "1:URL:"
+  "2:Path:"
+)
+
 _dvc_gc=(
   {-a,--all-branches}"[Keep data files for the tips of all git branches.]"
   {-T,--all-tags}"[Keep data files for all git tags.]"
@@ -116,13 +131,20 @@ _dvc_gc=(
   {-p,--projects}"[Keep data files required by these projects in addition to the current one.]:Repos:_files"
 )
 
-_dvc_import=(
+_dvc_importurl=(
   "--resume[Resume previously started download.]"
   {-f,--file}"[Specify name of the DVC-file it generates.]:File:_files"
   "1:URL:"
   "2:Output:"
 )
 
+_dvc_import=(
+  {-o,--out}"[Destination path to put data to.]:OUT:_files -/"
+  "--rev[DVC repository git revision.]:Commit hash:"
+  "1:URL:"
+  "2:Path:"
+)
+
 _dvc_init=(
   "--no-scm[Initiate dvc in directory that is not tracked by any scm tool.]"
   {-f,--force}"[Overwrite existing '.dvc' directory. This operation removes local cache.]"
@@ -248,30 +270,33 @@ _arguments \
   '*::args:->args'
 
 case $words[1] in
-  add)       _arguments $_dvc_global_options   $_dvc_add       ;;
-  cache)     _arguments $_dvc_global_options   $_dvc_cache     ;;
-  checkout)  _arguments $_dvc_global_options   $_dvc_checkout  ;;
-  commit)    _arguments $_dvc_global_options   $_dvc_commit    ;;
-  config)    _arguments $_dvc_global_options   $_dvc_config    ;;
-  destroy)   _arguments $_dvc_global_options   $_dvc_destroy   ;;
-  diff)      _arguments $_dvc_global_options   $_dvc_diff      ;;
-  fetch)     _arguments $_dvc_global_options   $_dvc_fetch     ;;
-  gc)        _arguments $_dvc_global_options   $_dvc_gc        ;;
-  import)    _arguments $_dvc_global_options   $_dvc_import    ;;
-  init)      _arguments $_dvc_global_options   $_dvc_init      ;;
-  install)   _arguments $_dvc_global_options   $_dvc_install   ;;
-  lock)      _arguments $_dvc_global_options   $_dvc_lock      ;;
-  metrics)   _arguments $_dvc_global_options   $_dvc_metrics   ;;
-  move)      _arguments $_dvc_global_options   $_dvc_move      ;;
-  pipeline)  _arguments $_dvc_global_options   $_dvc_pipeline  ;;
-  pull)      _arguments $_dvc_global_options   $_dvc_pull      ;;
-  push)      _arguments $_dvc_global_options   $_dvc_push      ;;
-  remote)    _arguments $_dvc_global_options   $_dvc_remote    ;;
-  remove)    _arguments $_dvc_global_options   $_dvc_remove    ;;
-  repro)     _arguments $_dvc_global_options   $_dvc_repro     ;;
-  root)      _arguments $_dvc_global_options   $_dvc_root      ;;
-  run)       _arguments $_dvc_global_options   $_dvc_run       ;;
-  status)    _arguments $_dvc_global_options   $_dvc_status    ;;
-  unlock)    _arguments $_dvc_global_options   $_dvc_unlock    ;;
-  unprotect) _arguments $_dvc_global_options   $_dvc_unprotect ;;
+  add)        _arguments $_dvc_global_options   $_dvc_add       ;;
+  cache)      _arguments $_dvc_global_options   $_dvc_cache     ;;
+  checkout)   _arguments $_dvc_global_options   $_dvc_checkout  ;;
+  commit)     _arguments $_dvc_global_options   $_dvc_commit    ;;
+  config)     _arguments $_dvc_global_options   $_dvc_config    ;;
+  destroy)    _arguments $_dvc_global_options   $_dvc_destroy   ;;
+  diff)       _arguments $_dvc_global_options   $_dvc_diff      ;;
+  fetch)      _arguments $_dvc_global_options   $_dvc_fetch     ;;
+  get-url)    _arguments $_dvc_global_options   $_dvc_geturl    ;;
+  get)        _arguments $_dvc_global_options   $_dvc_get       ;;
+  gc)         _arguments $_dvc_global_options   $_dvc_gc        ;;
+  import-url) _arguments $_dvc_global_options   $_dvc_importurl ;;
+  import)     _arguments $_dvc_global_options   $_dvc_import    ;;
+  init)       _arguments $_dvc_global_options   $_dvc_init      ;;
+  install)    _arguments $_dvc_global_options   $_dvc_install   ;;
+  lock)       _arguments $_dvc_global_options   $_dvc_lock      ;;
+  metrics)    _arguments $_dvc_global_options   $_dvc_metrics   ;;
+  move)       _arguments $_dvc_global_options   $_dvc_move      ;;
+  pipeline)   _arguments $_dvc_global_options   $_dvc_pipeline  ;;
+  pull)       _arguments $_dvc_global_options   $_dvc_pull      ;;
+  push)       _arguments $_dvc_global_options   $_dvc_push      ;;
+  remote)     _arguments $_dvc_global_options   $_dvc_remote    ;;
+  remove)     _arguments $_dvc_global_options   $_dvc_remove    ;;
+  repro)      _arguments $_dvc_global_options   $_dvc_repro     ;;
+  root)       _arguments $_dvc_global_options   $_dvc_root      ;;
+  run)        _arguments $_dvc_global_options   $_dvc_run       ;;
+  status)     _arguments $_dvc_global_options   $_dvc_status    ;;
+  unlock)     _arguments $_dvc_global_options   $_dvc_unlock    ;;
+  unprotect)  _arguments $_dvc_global_options   $_dvc_unprotect ;;
 esac