Skip to content

scm: write unique entry to .gitignore #4624

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

Merged
merged 3 commits into from
Sep 30, 2020
Merged

scm: write unique entry to .gitignore #4624

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bacd1c
scm: Git: _add_entry_to_gitignore: writes unique entry to .gitignore
gsvolt Sep 27, 2020
01e2a7f
Restyled by black
restyled-commits Sep 27, 2020
77d18fa
Merge branch 'master' into application_process_issue_4327
gsvolt Sep 28, 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
5 changes: 4 additions & 1 deletion dvc/scm/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ def _add_entry_to_gitignore(self, entry, gitignore):
entry = GitWildMatchPattern.escape(entry)

with open(gitignore, "a+", encoding="utf-8") as fobj:
unique_lines = set(fobj.readlines())
fobj.seek(0, os.SEEK_END)
if fobj.tell() == 0:
# Empty file
Expand All @@ -218,7 +219,9 @@ def _add_entry_to_gitignore(self, entry, gitignore):
fobj.seek(fobj.tell() - 1, os.SEEK_SET)
last = fobj.read(1)
prefix = "" if last == "\n" else "\n"
fobj.write(f"{prefix}{entry}\n")
new_entry = f"{prefix}{entry}\n"
if new_entry not in unique_lines:
fobj.write(new_entry)

def ignore_remove(self, path):
entry, gitignore = self._get_gitignore(path)
Expand Down