Merge branch 'main' into mixpanel

HISTORY.md

@@ -1,7 +1,7 @@
 
 # Release history
 
-### main branch
+### Aider v0.50.0
 
 - Infinite output for DeepSeek Coder, Mistral models in addition to Anthropic's models.
 - New `--deepseek` switch to use DeepSeek Coder.
@@ -14,7 +14,7 @@
 - Switched from `setup.py` to `pyproject.toml`, by @branchvincent.
 - Bug fix to persist files added during `/ask`.
 - Bug fix for chat history size in `/tokens`.
-
+- Aider wrote 66% of the code in this release.
 
 ### Aider v0.49.1
 

aider/__init__.py

@@ -1 +1 @@
-__version__ = "0.49.2-dev"
+__version__ = "0.50.1-dev"

aider/website/HISTORY.md

@@ -16,7 +16,7 @@ cog.out(text)
 
 # Release history
 
-### main branch
+### Aider v0.50.0
 
 - Infinite output for DeepSeek Coder, Mistral models in addition to Anthropic's models.
 - New `--deepseek` switch to use DeepSeek Coder.
@@ -29,7 +29,7 @@ cog.out(text)
 - Switched from `setup.py` to `pyproject.toml`, by @branchvincent.
 - Bug fix to persist files added during `/ask`.
 - Bug fix for chat history size in `/tokens`.
-
+- Aider wrote 66% of the code in this release.
 
 ### Aider v0.49.1
 

scripts/blame.py

@@ -2,6 +2,7 @@
 
 import argparse
 import subprocess
+import sys
 from collections import defaultdict
 from datetime import datetime
 from operator import itemgetter
@@ -17,10 +18,14 @@ def blame(start_tag, end_tag=None):
 
     authors = get_commit_authors(commits)
 
-    pats = "*.py *.scm *.sh **Dockerfile **Gemfile .github/workflows/*.yml".split()
+    revision = end_tag if end_tag else "HEAD"
-    files = []
+    files = run(["git", "ls-tree", "-r", "--name-only", revision]).strip().split("\n")
-    for pat in pats:
+    files = [
-        files += run(["git", "ls-files", pat]).strip().split("\n")
+        f
+        for f in files
+        if f.endswith((".py", ".scm", ".sh", "Dockerfile", "Gemfile"))
+        or (f.startswith(".github/workflows/") and f.endswith(".yml"))
+    ]
 
     all_file_counts = {}
     grand_total = defaultdict(int)
@@ -186,10 +191,14 @@ def get_counts_for_file(start_tag, end_tag, authors, fname):
             line_counts[author] += 1
 
         return dict(line_counts)
-    except subprocess.CalledProcessError:
+    except subprocess.CalledProcessError as e:
-        # print(f"Warning: Unable to blame file {fname}. It may have been added after {start_tag} "
+        if "no such path" in str(e).lower():
-        #       f"or removed before {end_tag or 'HEAD'}.", file=sys.stderr)
+            # File doesn't exist in this revision range, which is okay
-        return None
+            return None
+        else:
+            # Some other error occurred
+            print(f"Warning: Unable to blame file {fname}. Error: {e}", file=sys.stderr)
+            return None
 
 
 def get_all_tags_since(start_tag):