dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-05 04:05:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: Simplify check_gitignore function and remove AI comments

Browse source
This commit is contained in:
Paul Gauthier (aider) 2025-02-04 07:58:32 -08:00
parent 56ac57b4cf
commit 4a963adbcb
1 changed files with 36 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

89
aider/main.py
View file

@ -152,69 +152,52 @@ def setup_git(git_root, io):
return repo.working_tree_dir return repo.working_tree_dir
# change this function to check for repo.ignored(.aider) and add `.aider*` to .gitignore if it's not ignored
# check for repo.ignored(.env) and add `.env` to .gitignore if it's not ignored
# stop checking .gitignore for patterns
# ai!
def check_gitignore(git_root, io, ask=True): def check_gitignore(git_root, io, ask=True):
if not git_root: if not git_root:
return return
# ai: here we use git to check for ignore, which is good because it picks up
# local .gitignore and ~/.global_gitignore and .git/xxxx, etc
# however git is ignoring, we detect it
try: try:
repo = git.Repo(git_root) repo = git.Repo(git_root)
if repo.ignored(".aider") and repo.ignored(".env"): patterns_to_add = []
if not repo.ignored(".aider"):
patterns_to_add.append(".aider*")
if not repo.ignored(".env"):
patterns_to_add.append(".env")
if not patterns_to_add:
return return
except ANY_GIT_ERROR:
pass
gitignore_file = Path(git_root) / ".gitignore"
# ai: but here, we check for specific patterns only in .gitignore if gitignore_file.exists():
patterns = [".aider*", ".env"] try:
patterns_to_add = [] content = io.read_text(gitignore_file)
if content is None:
gitignore_file = Path(git_root) / ".gitignore" return
if gitignore_file.exists(): if not content.endswith("\n"):
try: content += "\n"
content = io.read_text(gitignore_file) except OSError as e:
if content is None: io.tool_error(f"Error when trying to read {gitignore_file}: {e}")
return return
existing_lines = content.splitlines() else:
for pat in patterns: content = ""
if pat not in existing_lines: if ask:
if "*" in pat or (Path(git_root) / pat).exists(): io.tool_output("You can skip this check with --no-gitignore")
patterns_to_add.append(pat) if not io.confirm_ask(f"Add {', '.join(patterns_to_add)} to .gitignore (recommended)?"):
return
content += "\n".join(patterns_to_add) + "\n"
try:
io.write_text(gitignore_file, content)
io.tool_output(f"Added {', '.join(patterns_to_add)} to .gitignore")
except OSError as e: except OSError as e:
io.tool_error(f"Error when trying to read {gitignore_file}: {e}") io.tool_error(f"Error when trying to write to {gitignore_file}: {e}")
return io.tool_output(
else: "Try running with appropriate permissions or manually add these patterns to .gitignore:"
content = "" )
patterns_to_add = patterns for pattern in patterns_to_add:
io.tool_output(f" {pattern}")
if not patterns_to_add:
return
if ask:
io.tool_output("You can skip this check with --no-gitignore")
if not io.confirm_ask(f"Add {', '.join(patterns_to_add)} to .gitignore (recommended)?"):
return
if content and not content.endswith("\n"):
content += "\n"
content += "\n".join(patterns_to_add) + "\n"
try:
io.write_text(gitignore_file, content)
io.tool_output(f"Added {', '.join(patterns_to_add)} to .gitignore")
except OSError as e:
io.tool_error(f"Error when trying to write to {gitignore_file}: {e}")
io.tool_output(
"Try running with appropriate permissions or manually add these patterns to .gitignore:"
)
for pattern in patterns_to_add:
io.tool_output(f" {pattern}")
def check_streamlit_install(io): def check_streamlit_install(io):