diff --git a/dvc/cli.py b/dvc/cli.py index 7836f4c84..127fc7a18 100644 --- a/dvc/cli.py +++ b/dvc/cli.py @@ -86,6 +86,11 @@ def parse_args(argv=None): action='store_true', default=False, help="Initiate dvc in directory that is not tracked by any scm tool(e.g. git)") + init_parser.add_argument('-f', + '--force', + action='store_true', + default=False, + help='Force initialization even if \'.dvc\' exists') init_parser.set_defaults(func=CmdInit) diff --git a/dvc/command/init.py b/dvc/command/init.py index c6623abb0..6b1968174 100644 --- a/dvc/command/init.py +++ b/dvc/command/init.py @@ -8,7 +8,7 @@ class CmdInit(object): def run_cmd(self): try: - Project.init('.', no_scm=self.args.no_scm) + Project.init('.', no_scm=self.args.no_scm, force=self.args.force) except InitError as e: Logger.error('Failed to initiate dvc', e) return 1 diff --git a/dvc/project.py b/dvc/project.py index 6c9d7346a..3c5e61ef5 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -65,7 +65,7 @@ class Project(object): self.updater.check() @staticmethod - def init(root_dir=os.curdir, no_scm=False): + def init(root_dir=os.curdir, no_scm=False, force=False): """ Initiate dvc project in directory. @@ -86,6 +86,12 @@ class Project(object): msg = "{} is not tracked by any supported scm tool(e.g. git).".format(root_dir) raise InitError(msg) + if os.path.isdir(dvc_dir): + if not force: + msg = "'{}' exists. Use '-f' to force." + raise InitError(msg.format(os.path.relpath(dvc_dir))) + shutil.rmtree(dvc_dir) + os.mkdir(dvc_dir) config = Config.init(dvc_dir) diff --git a/tests/test_init.py b/tests/test_init.py index f22571442..ff2f1a021 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -24,6 +24,21 @@ class TestInit(TestGit): self._test_init() +class TestDoubleInit(TestInit): + def test(self): + ret = main(['init']) + self.assertEqual(ret, 0) + self._test_init() + + ret = main(['init']) + self.assertNotEqual(ret, 0) + self._test_init() + + ret = main(['init', '--force']) + self.assertEqual(ret, 0) + self._test_init() + + class TestInitNoSCMFail(TestDir): def test_api(self): with self.assertRaises(InitError):