Skip to content

Commit

Permalink
feat: Rename --yes to --yes-always and update config file syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-gauthier committed Oct 2, 2024
1 parent d4fe0b1 commit 99c3a1e
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 18 deletions.
7 changes: 7 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

# Release history

### main branch

- Renamed `--yes` to `--yes-always`.
- Now uses `AIDER_YES_ALWAYS` env var and `yes-always:` yaml key.
- Can still abbreviate to `--yes` on the command line.
- Config file now uses standard YAML list syntax with ` - list entries`, one per line.

### Aider v0.58.1

- Fixed bug where cache warming pings caused subsequent user messages to trigger a tight loop of LLM requests.
Expand Down
5 changes: 4 additions & 1 deletion aider/args_formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@ def _format_action(self, action):
elif action.nargs in ("*", "+") or isinstance(action, argparse._AppendAction):
parts.append(f"#{switch}: xxx")
parts.append("## Specify multiple values like this:")
parts.append(f"#{switch}: [xxx,yyyy,zzz]\n")
parts.append(f"#{switch}:")
parts.append(f"# - xxx")
parts.append(f"# - yyy")
parts.append(f"# - zzz")
else:
parts.append(f"#{switch}: xxx\n")

Expand Down
7 changes: 7 additions & 0 deletions aider/website/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ cog.out(text)

# Release history

### main branch

- Renamed `--yes` to `--yes-always`.
- Now uses `AIDER_YES_ALWAYS` env var and `yes-always:` yaml key.
- Can still abbreviate to `--yes` on the command line.
- Config file now uses standard YAML list syntax with ` - list entries`, one per line.

### Aider v0.58.1

- Fixed bug where cache warming pings caused subsequent user messages to trigger a tight loop of LLM requests.
Expand Down
17 changes: 13 additions & 4 deletions aider/website/assets/sample.aider.conf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,10 @@
## Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)
#lint-cmd: xxx
## Specify multiple values like this:
#lint-cmd: [xxx,yyyy,zzz]
#lint-cmd:
# - xxx
# - yyy
# - zzz

## Enable/disable automatic linting after changes (default: True)
#auto-lint: true
Expand All @@ -268,12 +271,18 @@
## specify a file to edit (can be used multiple times)
#file: xxx
## Specify multiple values like this:
#file: [xxx,yyyy,zzz]
#file:
# - xxx
# - yyy
# - zzz

## specify a read-only file (can be used multiple times)
#read: xxx
## Specify multiple values like this:
#read: [xxx,yyyy,zzz]
#read:
# - xxx
# - yyy
# - zzz

## Use VI editing mode in the terminal (default: False)
#vim: false
Expand All @@ -300,7 +309,7 @@
#apply: xxx

## Always say yes to every confirmation
#yes: false
#yes-always: false

## Enable verbose output
#verbose: false
Expand Down
2 changes: 1 addition & 1 deletion aider/website/assets/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
#AIDER_APPLY=

## Always say yes to every confirmation
#AIDER_YES=
#AIDER_YES_ALWAYS=

## Enable verbose output
#AIDER_VERBOSE=false
Expand Down
29 changes: 23 additions & 6 deletions aider/website/docs/config/aider_conf.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ load whichever is found first.

## A note on lists

The syntax for specifying a list of values is not standard yaml.
Instead, use this format:
Lists of values can be specified either as a bulleted list:

```
read:
- CONVENTIONS.md
- anotherfile.txt
- thirdfile.py
```

Or lists can be specified using commas and square brackets:

```
read: [CONVENTIONS.md, anotherfile.txt, thirdfile.py]
Expand Down Expand Up @@ -296,7 +304,10 @@ cog.outl("```")
## Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)
#lint-cmd: xxx
## Specify multiple values like this:
#lint-cmd: [xxx,yyyy,zzz]
#lint-cmd:
# - xxx
# - yyy
# - zzz
## Enable/disable automatic linting after changes (default: True)
#auto-lint: true
Expand All @@ -316,12 +327,18 @@ cog.outl("```")
## specify a file to edit (can be used multiple times)
#file: xxx
## Specify multiple values like this:
#file: [xxx,yyyy,zzz]
#file:
# - xxx
# - yyy
# - zzz
## specify a read-only file (can be used multiple times)
#read: xxx
## Specify multiple values like this:
#read: [xxx,yyyy,zzz]
#read:
# - xxx
# - yyy
# - zzz
## Use VI editing mode in the terminal (default: False)
#vim: false
Expand All @@ -348,7 +365,7 @@ cog.outl("```")
#apply: xxx
## Always say yes to every confirmation
#yes: false
#yes-always: false
## Enable verbose output
#verbose: false
Expand Down
2 changes: 1 addition & 1 deletion aider/website/docs/config/dotenv.md
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ cog.outl("```")
#AIDER_APPLY=
## Always say yes to every confirmation
#AIDER_YES=
#AIDER_YES_ALWAYS=
## Enable verbose output
#AIDER_VERBOSE=false
Expand Down
11 changes: 6 additions & 5 deletions aider/website/docs/config/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
[--read] [--vim] [--chat-language] [--version]
[--just-check-update]
[--check-update | --no-check-update]
[--install-main-branch] [--upgrade] [--apply] [--yes]
[-v] [--show-repo-map] [--show-prompts] [--exit]
[--message] [--message-file] [--encoding] [-c] [--gui]
[--install-main-branch] [--upgrade] [--apply]
[--yes-always] [-v] [--show-repo-map] [--show-prompts]
[--exit] [--message] [--message-file] [--encoding] [-c]
[--gui]
[--suggest-shell-commands | --no-suggest-shell-commands]
[--voice-format] [--voice-language]
Expand Down Expand Up @@ -551,9 +552,9 @@ Aliases:
Apply the changes from the given file instead of running the chat (debug)
Environment variable: `AIDER_APPLY`

### `--yes`
### `--yes-always`
Always say yes to every confirmation
Environment variable: `AIDER_YES`
Environment variable: `AIDER_YES_ALWAYS`

### `--verbose`
Enable verbose output
Expand Down

0 comments on commit 99c3a1e

Please sign in to comment.