From 10121411e0ffac7d79c07f13a4cb9775228894cb Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jul 2019 21:35:23 +0300 Subject: [PATCH] import: don't forget to add outs to gitignore (#2266) Fixes #2263 Signed-off-by: Ruslan Kuprieiev --- dvc/output/base.py | 26 ++++++++++++++++---------- tests/func/test_import.py | 9 ++++++--- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dvc/output/base.py b/dvc/output/base.py index 65439e83b..fbbac18b9 100644 --- a/dvc/output/base.py +++ b/dvc/output/base.py @@ -123,6 +123,13 @@ class OutputBase(object): def is_in_repo(self): return False + @property + def use_scm_ignore(self): + if not self.is_in_repo: + return False + + return self.use_cache or self.stage.is_repo_import + @property def cache(self): return getattr(self.repo.cache, self.scheme) @@ -210,6 +217,12 @@ class OutputBase(object): if self.is_empty: logger.warning("'{}' is empty.".format(self)) + if self.use_scm_ignore: + if self.repo.scm.is_tracked(self.fspath): + raise OutputAlreadyTrackedError(self) + + self.repo.scm.ignore(self.fspath) + if not self.use_cache: self.info = self.remote.save_info(self.path_info) if self.metric: @@ -230,13 +243,6 @@ class OutputBase(object): ) return - if self.is_in_repo: - if self.repo.scm.is_tracked(self.fspath): - raise OutputAlreadyTrackedError(self) - - if self.use_cache: - self.repo.scm.ignore(self.fspath) - self.info = self.remote.save_info(self.path_info) def commit(self): @@ -296,11 +302,11 @@ class OutputBase(object): if self.scheme != "local": return - if ignore_remove and self.use_cache and self.is_in_repo: + if ignore_remove and self.use_scm_ignore: self.repo.scm.ignore_remove(self.fspath) def move(self, out): - if self.scheme == "local" and self.use_cache and self.is_in_repo: + if self.scheme == "local" and self.use_scm_ignore: self.repo.scm.ignore_remove(self.fspath) self.remote.move(self.path_info, out.path_info) @@ -309,7 +315,7 @@ class OutputBase(object): self.save() self.commit() - if self.scheme == "local" and self.use_cache and self.is_in_repo: + if self.scheme == "local" and self.use_scm_ignore: self.repo.scm.ignore(self.fspath) def get_files_number(self): diff --git a/tests/func/test_import.py b/tests/func/test_import.py index b91dccfc4..b097f9845 100644 --- a/tests/func/test_import.py +++ b/tests/func/test_import.py @@ -4,7 +4,7 @@ import filecmp from tests.utils import trees_equal -def test_import(repo_dir, dvc_repo, erepo): +def test_import(repo_dir, git, dvc_repo, erepo): src = erepo.FOO dst = erepo.FOO + "_imported" @@ -13,9 +13,10 @@ def test_import(repo_dir, dvc_repo, erepo): assert os.path.exists(dst) assert os.path.isfile(dst) assert filecmp.cmp(repo_dir.FOO, dst, shallow=False) + assert git.git.check_ignore(dst) -def test_import_dir(repo_dir, dvc_repo, erepo): +def test_import_dir(repo_dir, git, dvc_repo, erepo): src = erepo.DATA_DIR dst = erepo.DATA_DIR + "_imported" @@ -24,9 +25,10 @@ def test_import_dir(repo_dir, dvc_repo, erepo): assert os.path.exists(dst) assert os.path.isdir(dst) trees_equal(src, dst) + assert git.git.check_ignore(dst) -def test_import_rev(repo_dir, dvc_repo, erepo): +def test_import_rev(repo_dir, git, dvc_repo, erepo): src = "version" dst = src @@ -36,3 +38,4 @@ def test_import_rev(repo_dir, dvc_repo, erepo): assert os.path.isfile(dst) with open(dst, "r+") as fobj: assert fobj.read() == "branch" + assert git.git.check_ignore(dst)