diff --git a/dvc/command/add.py b/dvc/command/add.py index f6f9ab279..43a1d2b51 100644 --- a/dvc/command/add.py +++ b/dvc/command/add.py @@ -54,14 +54,7 @@ def add_parser(subparsers, parent_parser): help="Don't put files/directories into cache.", ) add_parser.add_argument( - "-f", - "--file", - help="Specify name of the stage file. It should be " - "either 'Dvcfile' or have a '.dvc' suffix (e.g. " - "'prepare.dvc', 'clean.dvc', etc) in order for " - "dvc to be able to find it later. By default " - "the output basename + .dvc is used as a stage filename. " - "(NOTE: It can't be used when specifying multiple targets)", + "-f", "--file", help="Specify name of the DVC file it generates." ) add_parser.add_argument( "targets", nargs="+", help="Input files/directories." diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 3cd992bac..b549bac4e 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -65,13 +65,6 @@ def add_parser(subparsers, parent_parser): "out", nargs="?", help="Destination path to put files to." ) import_parser.add_argument( - "-f", - "--file", - help="Specify name of the stage file. It should be " - "either 'Dvcfile' or have a '.dvc' suffix (e.g. " - "'prepare.dvc', 'clean.dvc', etc) in order for " - "dvc to be able to find it later. By default " - "the first output basename + .dvc is used as " - "a stage filename.", + "-f", "--file", help="Specify name of the DVC file it generates." ) import_parser.set_defaults(func=CmdImport) diff --git a/dvc/command/run.py b/dvc/command/run.py index 3a69a8852..e711744ee 100644 --- a/dvc/command/run.py +++ b/dvc/command/run.py @@ -127,14 +127,7 @@ def add_parser(subparsers, parent_parser): "(do not put into DVC cache).", ) run_parser.add_argument( - "-f", - "--file", - help="Specify name of the stage file. It should be " - "either 'Dvcfile' or have a '.dvc' suffix (e.g. " - "'prepare.dvc', 'clean.dvc', etc) in order for " - "dvc to be able to find it later. By default " - "the first output basename + .dvc is used as " - "a stage filename.", + "-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." diff --git a/tests/func/test_import.py b/tests/func/test_import.py index 5d47bcdc2..4a7fd5dd0 100644 --- a/tests/func/test_import.py +++ b/tests/func/test_import.py @@ -176,3 +176,10 @@ class TestImportFilename(TestDvc): ret = main(["import", "--file", "bar.dvc", self.external_source]) self.assertEqual(0, ret) self.assertTrue(os.path.exists("bar.dvc")) + + os.remove("bar.dvc") + os.mkdir("sub") + + ret = main(["import", "--file", "sub/bar.dvc", self.external_source]) + self.assertEqual(0, ret) + self.assertTrue(os.path.exists("sub/bar.dvc"))