import: improve some details about the '--file' option.

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."

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)

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."

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"))