From 85c3bb8f12ce402f9bd017c8245acca8af99ae21 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Wed, 5 Jul 2023 21:21:37 -0700 Subject: [PATCH] rely on io.dry_run --- aider/coders/base_coder.py | 4 ++-- aider/coders/editblock_coder.py | 3 +-- aider/coders/editblock_func_coder.py | 3 +-- aider/coders/wholefile_coder.py | 10 ++++------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index e29731b16..7bf4a0437 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -923,7 +923,7 @@ class Coder: full_path = os.path.abspath(os.path.join(self.root, path)) if full_path in self.abs_fnames: - if not self.dry_run and write_content: + if write_content: self.io.write_text(full_path, write_content) return full_path @@ -949,7 +949,7 @@ class Coder: if not self.dry_run: self.repo.git.add(full_path) - if not self.dry_run and write_content: + if write_content: self.io.write_text(full_path, write_content) return full_path diff --git a/aider/coders/editblock_coder.py b/aider/coders/editblock_coder.py index 8384671e3..49ae63674 100644 --- a/aider/coders/editblock_coder.py +++ b/aider/coders/editblock_coder.py @@ -29,8 +29,7 @@ class EditBlockCoder(Coder): content = self.io.read_text(full_path) content = do_replace(full_path, content, original, updated) if content: - if not self.dry_run: - self.io.write_text(full_path, content) + self.io.write_text(full_path, content) edited.add(path) continue self.io.tool_error(f"Failed to apply edit to {path}") diff --git a/aider/coders/editblock_func_coder.py b/aider/coders/editblock_func_coder.py index 62ac34050..2c834255e 100644 --- a/aider/coders/editblock_func_coder.py +++ b/aider/coders/editblock_func_coder.py @@ -138,8 +138,7 @@ class EditBlockFunctionCoder(Coder): content = self.io.read_text(full_path) content = do_replace(full_path, content, original, updated) if content: - if not self.dry_run: - self.io.write_text(full_path, content) + self.io.write_text(full_path, content) edited.add(path) continue self.io.tool_error(f"Failed to apply edit to {path}") diff --git a/aider/coders/wholefile_coder.py b/aider/coders/wholefile_coder.py index 7cca9cb5e..8c8536f04 100644 --- a/aider/coders/wholefile_coder.py +++ b/aider/coders/wholefile_coder.py @@ -64,9 +64,8 @@ class WholeFileCoder(Coder): else: if self.allowed_to_edit(fname): edited.add(fname) - if not self.dry_run: - new_lines = "".join(new_lines) - self.io.write_text(full_path, new_lines) + new_lines = "".join(new_lines) + self.io.write_text(full_path, new_lines) fname = None new_lines = [] @@ -123,8 +122,7 @@ class WholeFileCoder(Coder): full_path = self.allowed_to_edit(fname) if full_path: edited.add(fname) - if not self.dry_run: - new_lines = "".join(new_lines) - self.io.write_text(full_path, new_lines) + new_lines = "".join(new_lines) + self.io.write_text(full_path, new_lines) return edited