mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-23 13:54:59 +00:00
Refactor the cmd_ funcs to Commands
This commit is contained in:
Paul Gauthier
parent
9bd635a7a4
commit
409cf8d93b
2 changed files with 122 additions and 100 deletions
|
|
@ -442,10 +442,11 @@ class Coder:
|
||||||
commit_message = commit_message.strip().strip('"').strip()
|
commit_message = commit_message.strip().strip('"').strip()
|
||||||
|
|
||||||
if interrupted:
|
if interrupted:
|
||||||
self.console.print("[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n")
|
self.console.print(
|
||||||
|
"[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n"
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
if prefix:
|
if prefix:
|
||||||
commit_message = prefix + commit_message
|
commit_message = prefix + commit_message
|
||||||
|
|
||||||
|
|
@ -486,96 +487,3 @@ class Coder:
|
||||||
files = self.fnames
|
files = self.fnames
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
def cmd_commit(self, args):
|
|
||||||
"Commit outstanding changes to the chat files. Aider will provide a commit message if yo u don't."
|
|
||||||
|
|
||||||
if not self.repo:
|
|
||||||
self.console.print("[red]No git repository found.")
|
|
||||||
return
|
|
||||||
|
|
||||||
if not self.repo.is_dirty():
|
|
||||||
self.console.print("[red]No changes to commit.")
|
|
||||||
return
|
|
||||||
|
|
||||||
commit_message = args.strip()
|
|
||||||
if commit_message:
|
|
||||||
self.repo.git.add(*[os.path.relpath(fname, self.repo.working_tree_dir) for fname in self.fnames])
|
|
||||||
self.repo.git.commit("-m", commit_message, "--no-verify")
|
|
||||||
commit_hash = self.repo.head.commit.hexsha[:7]
|
|
||||||
self.console.print(f"[red]{commit_hash} {commit_message}")
|
|
||||||
return
|
|
||||||
|
|
||||||
self.commit()
|
|
||||||
|
|
||||||
def cmd_undo(self, args):
|
|
||||||
"Undo the last git commit if it was done by aider"
|
|
||||||
if not self.repo:
|
|
||||||
self.console.print("[red]No git repository found.")
|
|
||||||
return
|
|
||||||
|
|
||||||
last_commit = self.repo.head.commit
|
|
||||||
if not last_commit.message.startswith("aider:") or last_commit.hexsha[:7] != self.last_aider_commit_hash:
|
|
||||||
self.console.print("[red]The last commit was not made by aider in this chat session.")
|
|
||||||
return
|
|
||||||
self.repo.git.reset("--hard", "HEAD~1")
|
|
||||||
self.console.print(f"[red]Undid the last commit: {last_commit.message.strip()}")
|
|
||||||
|
|
||||||
def cmd_diff(self, args):
|
|
||||||
"Display the diff of the last aider commit"
|
|
||||||
if not self.repo:
|
|
||||||
self.console.print("[red]No git repository found.")
|
|
||||||
return
|
|
||||||
|
|
||||||
if not self.last_aider_commit_hash:
|
|
||||||
self.console.print("[red]No previous aider commit found.")
|
|
||||||
return
|
|
||||||
|
|
||||||
commits = f"{self.last_aider_commit_hash}~1"
|
|
||||||
if self.pretty:
|
|
||||||
diff = self.repo.git.diff(commits, "--color", self.last_aider_commit_hash)
|
|
||||||
else:
|
|
||||||
diff = self.repo.git.diff(commits, self.last_aider_commit_hash)
|
|
||||||
|
|
||||||
self.console.print(Text(diff))
|
|
||||||
|
|
||||||
def cmd_add(self, args):
|
|
||||||
"Add matching files to the chat"
|
|
||||||
|
|
||||||
files = self.get_active_files()
|
|
||||||
for word in args.split():
|
|
||||||
matched_files = [file for file in files if word in file]
|
|
||||||
if not matched_files:
|
|
||||||
self.console.print(f"[red]No files matched '{word}'")
|
|
||||||
for matched_file in matched_files:
|
|
||||||
abs_file_path = os.path.abspath(os.path.join(self.root, matched_file))
|
|
||||||
if abs_file_path not in self.fnames:
|
|
||||||
self.fnames.add(abs_file_path)
|
|
||||||
self.console.print(f"[red]Added {matched_file} to the chat")
|
|
||||||
else:
|
|
||||||
self.console.print(f"[red]{matched_file} is already in the chat")
|
|
||||||
|
|
||||||
def cmd_drop(self, args):
|
|
||||||
"Remove matching files from the chat"
|
|
||||||
|
|
||||||
for word in args.split():
|
|
||||||
matched_files = [file for file in self.fnames if word in os.path.relpath(file, self.root)]
|
|
||||||
if not matched_files:
|
|
||||||
self.console.print(f"[red]No files matched '{word}'")
|
|
||||||
for matched_file in matched_files:
|
|
||||||
relative_fname = os.path.relpath(matched_file, self.root)
|
|
||||||
self.fnames.remove(matched_file)
|
|
||||||
self.console.print(f"[red]Removed {relative_fname} from the chat")
|
|
||||||
|
|
||||||
def cmd_ls(self, args):
|
|
||||||
"List files and show their chat status"
|
|
||||||
|
|
||||||
self.console.print(f"* denotes files included in the chat\n")
|
|
||||||
files = self.get_active_files()
|
|
||||||
|
|
||||||
for file in files:
|
|
||||||
abs_file_path = os.path.abspath(os.path.join(self.root, file))
|
|
||||||
if abs_file_path in self.fnames:
|
|
||||||
self.console.print(f"* {file}")
|
|
||||||
else:
|
|
||||||
self.console.print(f" {file}")
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,17 @@
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
class Commands:
|
class Commands:
|
||||||
def __init__(self, console, obj):
|
def __init__(self, console, coder):
|
||||||
self.console = console
|
self.console = console
|
||||||
self.obj = obj
|
self.coder = coder
|
||||||
|
|
||||||
def help(self):
|
def help(self):
|
||||||
"Show help about all commands"
|
"Show help about all commands"
|
||||||
commands = self.get_commands()
|
commands = self.get_commands()
|
||||||
for cmd in commands:
|
for cmd in commands:
|
||||||
cmd_method_name = f"cmd_{cmd[1:]}"
|
cmd_method_name = f"cmd_{cmd[1:]}"
|
||||||
cmd_method = getattr(self.obj, cmd_method_name, None)
|
cmd_method = getattr(self, cmd_method_name, None)
|
||||||
if cmd_method:
|
if cmd_method:
|
||||||
description = cmd_method.__doc__
|
description = cmd_method.__doc__
|
||||||
self.console.print(f"{cmd} {description}")
|
self.console.print(f"{cmd} {description}")
|
||||||
|
|
@ -17,7 +20,7 @@ class Commands:
|
||||||
|
|
||||||
def get_commands(self):
|
def get_commands(self):
|
||||||
commands = ["/help"]
|
commands = ["/help"]
|
||||||
for attr in dir(self.obj):
|
for attr in dir(self):
|
||||||
if attr.startswith("cmd_"):
|
if attr.startswith("cmd_"):
|
||||||
commands.append("/" + attr[4:])
|
commands.append("/" + attr[4:])
|
||||||
|
|
||||||
|
|
@ -25,7 +28,7 @@ class Commands:
|
||||||
|
|
||||||
def do_run(self, cmd_name, args):
|
def do_run(self, cmd_name, args):
|
||||||
cmd_method_name = f"cmd_{cmd_name}"
|
cmd_method_name = f"cmd_{cmd_name}"
|
||||||
cmd_method = getattr(self.obj, cmd_method_name, None)
|
cmd_method = getattr(self, cmd_method_name, None)
|
||||||
if cmd_method:
|
if cmd_method:
|
||||||
cmd_method(args)
|
cmd_method(args)
|
||||||
else:
|
else:
|
||||||
|
|
@ -51,3 +54,114 @@ class Commands:
|
||||||
self.console.print("[red]Ambiguous command:", ", ".join(matching_commands))
|
self.console.print("[red]Ambiguous command:", ", ".join(matching_commands))
|
||||||
else:
|
else:
|
||||||
self.console.print(f"[red]Error: {first_word} is not a valid command.")
|
self.console.print(f"[red]Error: {first_word} is not a valid command.")
|
||||||
|
|
||||||
|
def cmd_commit(self, args):
|
||||||
|
"Commit outstanding changes to the chat files. Aider will provide a commit message if yo u don't."
|
||||||
|
|
||||||
|
if not self.coder.repo:
|
||||||
|
self.console.print("[red]No git repository found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
if not self.coder.repo.is_dirty():
|
||||||
|
self.console.print("[red]No changes to commit.")
|
||||||
|
return
|
||||||
|
|
||||||
|
commit_message = args.strip()
|
||||||
|
if commit_message:
|
||||||
|
self.coder.repo.git.add(
|
||||||
|
*[
|
||||||
|
os.path.relpath(fname, self.coder.repo.working_tree_dir)
|
||||||
|
for fname in self.coder.fnames
|
||||||
|
]
|
||||||
|
)
|
||||||
|
self.coder.repo.git.commit("-m", commit_message, "--no-verify")
|
||||||
|
commit_hash = self.coder.repo.head.commit.hexsha[:7]
|
||||||
|
self.console.print(f"[red]{commit_hash} {commit_message}")
|
||||||
|
return
|
||||||
|
|
||||||
|
self.coder.commit()
|
||||||
|
|
||||||
|
def cmd_undo(self, args):
|
||||||
|
"Undo the last git commit if it was done by aider"
|
||||||
|
if not self.coder.repo:
|
||||||
|
self.console.print("[red]No git repository found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
last_commit = self.coder.repo.head.commit
|
||||||
|
if (
|
||||||
|
not last_commit.message.startswith("aider:")
|
||||||
|
or last_commit.hexsha[:7] != self.coder.last_aider_commit_hash
|
||||||
|
):
|
||||||
|
self.console.print(
|
||||||
|
"[red]The last commit was not made by aider in this chat session."
|
||||||
|
)
|
||||||
|
return
|
||||||
|
self.coder.repo.git.reset("--hard", "HEAD~1")
|
||||||
|
self.console.print(f"[red]Undid the last commit: {last_commit.message.strip()}")
|
||||||
|
|
||||||
|
def cmd_diff(self, args):
|
||||||
|
"Display the diff of the last aider commit"
|
||||||
|
if not self.coder.repo:
|
||||||
|
self.console.print("[red]No git repository found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
if not self.coder.last_aider_commit_hash:
|
||||||
|
self.console.print("[red]No previous aider commit found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
commits = f"{self.coder.last_aider_commit_hash}~1"
|
||||||
|
if self.coder.pretty:
|
||||||
|
diff = self.coder.repo.git.diff(
|
||||||
|
commits, "--color", self.coder.last_aider_commit_hash
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
diff = self.coder.repo.git.diff(commits, self.coder.last_aider_commit_hash)
|
||||||
|
|
||||||
|
self.console.print(Text(diff))
|
||||||
|
|
||||||
|
def cmd_add(self, args):
|
||||||
|
"Add matching files to the chat"
|
||||||
|
|
||||||
|
files = self.coder.get_active_files()
|
||||||
|
for word in args.split():
|
||||||
|
matched_files = [file for file in files if word in file]
|
||||||
|
if not matched_files:
|
||||||
|
self.console.print(f"[red]No files matched '{word}'")
|
||||||
|
for matched_file in matched_files:
|
||||||
|
abs_file_path = os.path.abspath(
|
||||||
|
os.path.join(self.coder.root, matched_file)
|
||||||
|
)
|
||||||
|
if abs_file_path not in self.coder.fnames:
|
||||||
|
self.coder.fnames.add(abs_file_path)
|
||||||
|
self.console.print(f"[red]Added {matched_file} to the chat")
|
||||||
|
else:
|
||||||
|
self.console.print(f"[red]{matched_file} is already in the chat")
|
||||||
|
|
||||||
|
def cmd_drop(self, args):
|
||||||
|
"Remove matching files from the chat"
|
||||||
|
|
||||||
|
for word in args.split():
|
||||||
|
matched_files = [
|
||||||
|
file
|
||||||
|
for file in self.coder.fnames
|
||||||
|
if word in os.path.relpath(file, self.coder.root)
|
||||||
|
]
|
||||||
|
if not matched_files:
|
||||||
|
self.console.print(f"[red]No files matched '{word}'")
|
||||||
|
for matched_file in matched_files:
|
||||||
|
relative_fname = os.path.relpath(matched_file, self.coder.root)
|
||||||
|
self.coder.fnames.remove(matched_file)
|
||||||
|
self.console.print(f"[red]Removed {relative_fname} from the chat")
|
||||||
|
|
||||||
|
def cmd_ls(self, args):
|
||||||
|
"List files and show their chat status"
|
||||||
|
|
||||||
|
self.console.print(f"* denotes files included in the chat\n")
|
||||||
|
files = self.coder.get_active_files()
|
||||||
|
|
||||||
|
for file in files:
|
||||||
|
abs_file_path = os.path.abspath(os.path.join(self.coder.root, file))
|
||||||
|
if abs_file_path in self.coder.fnames:
|
||||||
|
self.console.print(f"* {file}")
|
||||||
|
else:
|
||||||
|
self.console.print(f" {file}")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue