From b4e990df8c91f18164433698abef445ab31c3f3d Mon Sep 17 00:00:00 2001 From: Jorge Orpinel Date: Mon, 3 Feb 2020 12:44:49 -0600 Subject: [PATCH 1/3] get/import: update cmd and url arg descs with correct behavior --- dvc/command/get.py | 7 ++----- dvc/command/imp.py | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dvc/command/get.py b/dvc/command/get.py index a0bc5186fa..e675a02d58 100644 --- a/dvc/command/get.py +++ b/dvc/command/get.py @@ -51,9 +51,7 @@ def _get_file_from_repo(self): def add_parser(subparsers, parent_parser): - GET_HELP = ( - "Download file or directory from any DVC project or Git repository." - ) + GET_HELP = "Download file or directory from any DVC or Git repository." get_parser = subparsers.add_parser( "get", parents=[parent_parser], @@ -62,8 +60,7 @@ def add_parser(subparsers, parent_parser): formatter_class=argparse.RawDescriptionHelpFormatter, ) get_parser.add_argument( - "url", - help="Location of DVC project or Git repository to download from", + "url", help="Location of DVC or Git repository to download from" ) get_parser.add_argument( "path", diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 83ee0da7bb..1c36e62984 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -30,7 +30,7 @@ def run(self): def add_parser(subparsers, parent_parser): IMPORT_HELP = ( - "Download file or directory from any DVC project or Git repository " + "Download file or directory from any DVC or Git repository " "into the workspace, and track it." ) @@ -42,8 +42,7 @@ def add_parser(subparsers, parent_parser): formatter_class=argparse.RawTextHelpFormatter, ) import_parser.add_argument( - "url", - help="Location of DVC project or Git repository to download from", + "url", help="Location of DVC or Git repository to download from" ) import_parser.add_argument( "path", From 294633aa226619d1e01ab0c91383a506eaabbdab Mon Sep 17 00:00:00 2001 From: Jorge Orpinel Date: Mon, 3 Feb 2020 13:10:36 -0600 Subject: [PATCH 2/3] get/import: update path arg desc as well (See previous commit) --- dvc/command/get.py | 3 +-- dvc/command/imp.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dvc/command/get.py b/dvc/command/get.py index e675a02d58..e176e6343d 100644 --- a/dvc/command/get.py +++ b/dvc/command/get.py @@ -63,8 +63,7 @@ def add_parser(subparsers, parent_parser): "url", help="Location of DVC or Git repository to download from" ) get_parser.add_argument( - "path", - help="Path to a file or directory within the project or repository", + "path", help="Path to a file or directory within the repository" ) get_parser.add_argument( "-o", "--out", nargs="?", help="Destination path to download files to" diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 1c36e62984..0238326f0c 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -45,8 +45,7 @@ def add_parser(subparsers, parent_parser): "url", help="Location of DVC or Git repository to download from" ) import_parser.add_argument( - "path", - help="Path to a file or directory within the project or repository", + "path", help="Path to a file or directory within the repository" ) import_parser.add_argument( "-o", "--out", nargs="?", help="Destination path to download files to" From 50016346d8d61261c61233adfdbbd8e9a0b6b1a3 Mon Sep 17 00:00:00 2001 From: Jorge Orpinel Date: Thu, 6 Feb 2020 19:45:01 -0600 Subject: [PATCH 3/3] get/imp: udpate help output with simpler terms per https://github.com/iterative/dvc/pull/3277#pullrequestreview-352650016 --- dvc/command/get.py | 2 +- dvc/command/imp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dvc/command/get.py b/dvc/command/get.py index e176e6343d..3595276d31 100644 --- a/dvc/command/get.py +++ b/dvc/command/get.py @@ -51,7 +51,7 @@ def _get_file_from_repo(self): def add_parser(subparsers, parent_parser): - GET_HELP = "Download file or directory from any DVC or Git repository." + GET_HELP = "Download file or directory tracked by DVC or by Git." get_parser = subparsers.add_parser( "get", parents=[parent_parser], diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 0238326f0c..eaaaa7eca4 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -30,7 +30,7 @@ def run(self): def add_parser(subparsers, parent_parser): IMPORT_HELP = ( - "Download file or directory from any DVC or Git repository " + "Download file or directory tracked by DVC or by Git " "into the workspace, and track it." )