Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check root .gitignore in '_ignored' #3284

Merged
merged 6 commits into from
Feb 6, 2020
Merged

check root .gitignore in '_ignored' #3284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a76742
made '_ignored' check if the given file is already ignored by the roo…
AljoSt Feb 6, 2020
4d772fe
code formatting
AljoSt Feb 6, 2020
fd75bbd
Changed method input, adjusted tests, formatted code
AljoSt Feb 6, 2020
72919ee
typo
AljoSt Feb 6, 2020
ea61fa6
tests: use git logger fix in conftest
efiop Feb 6, 2020
468daec
scm: git: remove redundant comments
efiop Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions dvc/scm/git/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,18 @@ def _get_gitignore(self, path):

return entry, gitignore

@staticmethod
def _ignored(entry, gitignore_path):
def _ignored(self, entry, gitignore_path):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simply pass path to it now, since we no longer work with entries. 🙂 Your PR is helping tidy this a lot 🙂


# We want to check first if `entry` is already being ignored by the .gitignore file in the root dir.
entry_path = os.path.join(os.path.dirname(gitignore_path), entry)
from git.exc import GitCommandError
try:
self.repo.git.check_ignore(entry_path)
return True
except GitCommandError:
# If none of the paths passed to `check_ignore` are ignored, GitPython annoyingly raises an Exception
pass

if os.path.exists(gitignore_path):
Copy link
Contributor

@efiop efiop Feb 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, we no longer need to manually read gitignore as if the entry is present there, check_ignore will tell us that. So we can safely remove the lines below.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah interesting. Will change that

with open(gitignore_path, "r") as fobj:
ignore_list = fobj.readlines()
Expand Down
8 changes: 8 additions & 0 deletions tests/func/test_scm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ def test_ignore(tmp_dir, scm):
assert _count_gitignore_entries(target) == 0


def test_ignored(tmp_dir, scm):
tmp_dir.gen({"dir1": {"file1.jpg": "cont", "file2.txt": "cont"}})
tmp_dir.gen({".gitignore": "dir1/*.jpg"})

assert scm._ignored("file1.jpg", fspath(tmp_dir / "dir1" / ".gitignore"))
assert not scm._ignored("file2.txt", fspath(tmp_dir / "dir1" / ".gitignore"))


def test_get_gitignore(tmp_dir, scm):
tmp_dir.gen({"file1": "contents", "dir": {}})

Expand Down