From 4980e901a0c92f93899790b9b5a6d2363def3271 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Fri, 21 Mar 2025 11:38:46 -0700 Subject: [PATCH] feat: Add plain git log to update-history script context --- scripts/update-history.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/scripts/update-history.py b/scripts/update-history.py index 3db6e0a30..e8fa455b2 100755 --- a/scripts/update-history.py +++ b/scripts/update-history.py @@ -52,9 +52,26 @@ def run_git_diff(): return result.stdout +def run_plain_git_log(): + latest_ver = get_latest_version_from_history() + cmd = [ + "git", + "log", + f"v{latest_ver}..HEAD", + "--", + "aider/", + ":!aider/website/", + ":!scripts/", + ":!HISTORY.md", + ] + result = subprocess.run(cmd, capture_output=True, text=True) + return result.stdout + + def main(): # Get the git log and diff output log_content = run_git_log() + plain_log_content = run_plain_git_log() diff_content = run_git_diff() # Extract relevant portion of HISTORY.md @@ -91,6 +108,10 @@ def main(): tmp_diff.write(diff_content) diff_path = tmp_diff.name + with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".plain_log") as tmp_plain_log: + tmp_plain_log.write(plain_log_content) + plain_log_path = tmp_plain_log.name + with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".md") as tmp_hist: tmp_hist.write(relevant_history) hist_path = tmp_hist.name @@ -108,6 +129,8 @@ def main(): "--read", log_path, "--read", + plain_log_path, + "--read", diff_path, "--msg", message, @@ -141,6 +164,7 @@ def main(): # Cleanup os.unlink(log_path) + os.unlink(plain_log_path) os.unlink(diff_path) os.unlink(hist_path)