From 8c886d7dd341f455edfbb14e098fccb57013b28a Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 22 Aug 2024 13:55:01 -0700 Subject: [PATCH] refactor to use auto_commit --- aider/coders/base_coder.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index f30baa241..dc93b547d 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1112,7 +1112,7 @@ class Coder: if edited and self.auto_lint: lint_errors = self.lint_edited(edited) - self.auto_commit(edited) + self.auto_commit(edited, context="Ran the linter") self.lint_outcome = not lint_errors if lint_errors: ok = self.io.confirm_ask("Attempt to fix lint errors?") @@ -1205,14 +1205,6 @@ class Coder: res += errors res += "\n" - # Commit any formatting changes that happened - if self.repo and self.auto_commits and not self.dry_run: - commit_res = self.repo.commit( - fnames=fnames, context="The linter made edits to these files", aider_edits=True - ) - if commit_res: - self.show_auto_commit_outcome(commit_res) - if res: self.io.tool_error(res) @@ -1780,11 +1772,13 @@ class Coder: return context - def auto_commit(self, edited): + def auto_commit(self, edited, context=None): if not self.repo or not self.auto_commits or self.dry_run: return - context = self.get_context_from_history(self.cur_messages) + if not context: + context = self.get_context_from_history(self.cur_messages) + res = self.repo.commit(fnames=edited, context=context, aider_edits=True) if res: self.show_auto_commit_outcome(res)