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

respect --dry-run

Browse source
This commit is contained in:
Paul Gauthier 2023-06-22 11:38:39 -07:00
parent 08764215c3
commit 5043397848
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
aider/coders/base_coder.py
View file

@ -717,7 +717,9 @@ class Coder:
def get_addable_relative_files(self): def get_addable_relative_files(self):
return set(self.get_all_relative_files()) - set(self.get_inchat_relative_files()) return set(self.get_all_relative_files()) - set(self.get_inchat_relative_files())
def allowed_to_edit(self, path): def allowed_to_edit(self, path, write_content=None):
# TODO: respect --dry-run
full_path = os.path.abspath(os.path.join(self.root, path)) full_path = os.path.abspath(os.path.join(self.root, path))
if full_path in self.abs_fnames: if full_path in self.abs_fnames:
@ -731,7 +733,7 @@ class Coder:
self.io.tool_error(f"Skipping edit to {path}") self.io.tool_error(f"Skipping edit to {path}")
return return
if not Path(full_path).exists(): if not Path(full_path).exists() and not self.dry_run:
Path(full_path).parent.mkdir(parents=True, exist_ok=True) Path(full_path).parent.mkdir(parents=True, exist_ok=True)
Path(full_path).touch() Path(full_path).touch()
@ -742,7 +744,11 @@ class Coder:
tracked_files = set(self.repo.git.ls_files().splitlines()) tracked_files = set(self.repo.git.ls_files().splitlines())
relative_fname = self.get_rel_fname(full_path) relative_fname = self.get_rel_fname(full_path)
if relative_fname not in tracked_files and self.io.confirm_ask(f"Add {path} to git?"): if relative_fname not in tracked_files and self.io.confirm_ask(f"Add {path} to git?"):
self.repo.git.add(full_path) if not self.dry_run:
self.repo.git.add(full_path)
if not self.dry_run and write_content:
Path(full_path).write_text(write_content)
return full_path return full_path
@ -763,7 +769,11 @@ class Coder:
if edited: if edited:
for path in sorted(edited): for path in sorted(edited):
self.io.tool_output(f"Applied edit to {path}") if self.dry_run:
self.io.tool_output(f"Did not apply edit to {path} (--dry-run)")
else:
self.io.tool_output(f"Applied edit to {path}")
return edited, None return edited, None
def parse_partial_args(self): def parse_partial_args(self):

16
aider/coders/wholefile_func_coder.py
View file

@ -1,5 +1,4 @@
import os import os
from pathlib import Path
from aider import diffs from aider import diffs
@ -111,24 +110,17 @@ class WholeFileFunctionCoder(Coder):
files = args.get("files", []) files = args.get("files", [])
chat_files = self.get_inchat_relative_files()
edited = set() edited = set()
for file_upd in files: for file_upd in files:
path = file_upd.get("path") path = file_upd.get("path")
if not path: if not path:
raise ValueError(f"Missing path: {file_upd}") raise ValueError(f"Missing path parameter: {file_upd}")
if path not in chat_files:
raise ValueError(f"File {path} not in chat session.")
content = file_upd.get("content") content = file_upd.get("content")
if not content: if not content:
raise ValueError(f"Missing content: {file_upd}") raise ValueError(f"Missing content parameter: {file_upd}")
edited.add(path) if self.allowed_to_edit(path, content):
if not self.dry_run: edited.add(path)
full_path = os.path.abspath(os.path.join(self.root, path))
Path(full_path).write_text(content)
return edited return edited