From 686898240ca4393f03c95981ce0e41e5f5df08d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Rowlands=20=28=EB=B3=80=EA=B8=B0=ED=98=B8=29?= Date: Fri, 12 Mar 2021 11:50:13 +0900 Subject: [PATCH] Revert "repro/exp run: use git status when reminding to git-track files (#5544)" (#5596) This reverts commit ce2d7c65dbb9e9300525dcd4f1b27b850d3585cc. --- dvc/scm/git/__init__.py | 13 ++----------- tests/unit/scm/test_git.py | 16 +++------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dvc/scm/git/__init__.py b/dvc/scm/git/__init__.py index 85cb5f1a5..c922d083c 100644 --- a/dvc/scm/git/__init__.py +++ b/dvc/scm/git/__init__.py @@ -272,19 +272,10 @@ class Git(Base): self.files_to_track = set() def remind_to_track(self): - def _filter(files): - if not files: - return set() - staged, unstaged, untracked = self.status() - return files.intersection( - staged.get("modify", []) + unstaged + untracked - ) - - files_to_track = _filter(self.files_to_track) - if self.quiet or not files_to_track: + if self.quiet or not self.files_to_track: return - files = " ".join(shlex.quote(path) for path in sorted(files_to_track)) + files = " ".join(shlex.quote(path) for path in self.files_to_track) logger.info( "\n" diff --git a/tests/unit/scm/test_git.py b/tests/unit/scm/test_git.py index a7f0a4c98..6ba80d436 100644 --- a/tests/unit/scm/test_git.py +++ b/tests/unit/scm/test_git.py @@ -528,20 +528,10 @@ def test_reset(tmp_dir, scm, git): assert len(unstaged) == 2 -def test_remind_to_track(tmp_dir, scm, caplog): - files = ["fname with spaces.txt", "тест", "foo"] - tmp_dir.gen({name: "foo" for name in files}) - scm.files_to_track.update(files) - +def test_remind_to_track(scm, caplog): + scm.files_to_track = ["fname with spaces.txt", "тест", "foo"] scm.remind_to_track() - assert "git add 'fname with spaces.txt' foo 'тест'" in caplog.text - - scm.add(["foo"]) - caplog.clear() - - scm.remind_to_track() - assert "git add 'fname with spaces.txt' 'тест'" in caplog.text - assert "foo" not in caplog.text + assert "git add 'fname with spaces.txt' 'тест' foo" in caplog.text def test_add(tmp_dir, scm, git):