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

finished adding --yes

Browse source
This commit is contained in:
Paul Gauthier 2023-05-11 17:51:50 -07:00
parent 4c97d4e654
commit 8a60462167
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
aider/coder.py
View file

@ -18,7 +18,7 @@ from pathlib import Path
import git import git
import openai import openai
#from aider.dump import dump # from aider.dump import dump
from aider.getinput import get_input from aider.getinput import get_input
from aider import utils from aider import utils
from aider import prompts from aider import prompts
@ -33,6 +33,7 @@ class Coder:
last_aider_commit_hash = None last_aider_commit_hash = None
def __init__(self, main_model, fnames, pretty, history_file, show_diffs, auto_commits, yes): def __init__(self, main_model, fnames, pretty, history_file, show_diffs, auto_commits, yes):
self.yes = yes
self.history_file = history_file self.history_file = history_file
self.auto_commits = auto_commits self.auto_commits = auto_commits
@ -56,7 +57,6 @@ class Coder:
self.pretty = pretty self.pretty = pretty
self.show_diffs = show_diffs self.show_diffs = show_diffs
self.yes = yes
def find_common_root(self): def find_common_root(self):
if self.abs_fnames: if self.abs_fnames:
@ -197,7 +197,7 @@ class Coder:
self.num_control_c = 0 self.num_control_c = 0
is_commit_command = (inp and inp.startswith('/commit')) is_commit_command = inp and inp.startswith("/commit")
if self.repo and self.repo.is_dirty() and not is_commit_command: if self.repo and self.repo.is_dirty() and not is_commit_command:
self.commit(ask=True, which="repo_files") self.commit(ask=True, which="repo_files")
@ -304,8 +304,8 @@ class Coder:
for rel_fname in mentioned_rel_fnames: for rel_fname in mentioned_rel_fnames:
self.console.print(f"[bright_black]{rel_fname}") self.console.print(f"[bright_black]{rel_fname}")
if self.confirm_ask("[bright_black]Add {path} to git?", default="y"):
if not ok: if not self.confirm_ask("[bright_black]Add {path} to git?", default="y"):
return return
for rel_fname in mentioned_rel_fnames: for rel_fname in mentioned_rel_fnames:
@ -488,9 +488,9 @@ class Coder:
if which == "repo_files": if which == "repo_files":
all_files = [os.path.join(self.root, f) for f in self.get_all_relative_files()] all_files = [os.path.join(self.root, f) for f in self.get_all_relative_files()]
relative_dirty_fnames,diffs = get_dirty_files_and_diffs(all_files) relative_dirty_fnames, diffs = get_dirty_files_and_diffs(all_files)
elif which == "chat_files": elif which == "chat_files":
relative_dirty_fnames,diffs = get_dirty_files_and_diffs(self.abs_fnames) relative_dirty_fnames, diffs = get_dirty_files_and_diffs(self.abs_fnames)
else: else:
raise ValueError(f"Invalid value for 'which': {which}") raise ValueError(f"Invalid value for 'which': {which}")

12
tests/test_main.py
View file

@ -10,7 +10,7 @@ class TestMain(TestCase):
def test_main_with_empty_dir_no_files_on_command(self): def test_main_with_empty_dir_no_files_on_command(self):
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
os.chdir(temp_dir) os.chdir(temp_dir)
with open(os.devnull, 'r') as dev_null: with open(os.devnull, "r") as dev_null:
save_stdin = sys.stdin save_stdin = sys.stdin
sys.stdin = dev_null sys.stdin = dev_null
main() main()
@ -19,19 +19,19 @@ class TestMain(TestCase):
def test_main_with_empty_dir_new_file(self): def test_main_with_empty_dir_new_file(self):
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
os.chdir(temp_dir) os.chdir(temp_dir)
with open(os.devnull, 'r') as dev_null: with open(os.devnull, "r") as dev_null:
save_stdin = sys.stdin save_stdin = sys.stdin
sys.stdin = dev_null sys.stdin = dev_null
main(['foo.txt']) main(["foo.txt"])
sys.stdin = save_stdin sys.stdin = save_stdin
self.assertTrue(os.path.exists('foo.txt')) self.assertTrue(os.path.exists("foo.txt"))
def test_main_with_empty_git_dir_new_file(self): def test_main_with_empty_git_dir_new_file(self):
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
os.chdir(temp_dir) os.chdir(temp_dir)
subprocess.run(["git", "init"]) subprocess.run(["git", "init"])
with open(os.devnull, 'r') as dev_null: with open(os.devnull, "r") as dev_null:
save_stdin = sys.stdin save_stdin = sys.stdin
sys.stdin = dev_null sys.stdin = dev_null
main(['foo.txt']) main(["--yes", "foo.txt"])
sys.stdin = save_stdin sys.stdin = save_stdin