Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(history): fix logic error in prompt for history -c (ohmyzsh#12472) #12500

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

Sargates
Copy link
Contributor

Standards checklist:

  • The PR title is descriptive.
  • The PR doesn't replicate another PR which is already open.
  • I have read the contribution guide and followed all the instructions.
  • The code follows the code style guide detailed in the wiki.
  • The code is mine or it's from somewhere with an MIT-compatible license.
  • The code is efficient, to the best of my ability, and does not waste computer resources.
  • The code is stable and I have tested it myself, to the best of my abilities.
  • If the code introduces new aliases, I provide a valid use case for all plugin users down below.

Changes:

  • Fixes logic error from 35a6725 when using history -c
  • Prompting for confirmation causes history to be deleted when typing anything but explicitly n, N, or sending \n.
  • New logic no longer proceeds with deletion when pressing wrong key and only deletes history when sending y or Y.

Other comments:

Copying @mcornella as he was assigned to the original issue

Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.
@ohmyzsh ohmyzsh bot added the Area: core Issue or PR related to core parts of the project label Jun 12, 2024
@Sargates Sargates changed the title fix(history): fix logic error in prompt for history -c (ohmyzsh#12472) fix(history): fix logic error in prompt for history -c (ohmyzsh#12472) Jun 12, 2024
@mcornella mcornella merged commit 8908e6d into ohmyzsh:master Jun 13, 2024
1 check passed
@robots4life
Copy link

robots4life commented Jun 15, 2024

How can I send a y to history -c in this alias alias hit='history -c && exit' with this change please ?

With this change so far now I have to confirm every time I run the alias, however I would like to not have to do that manually, thank you.

None of these work.

alias hity='history -c && exit'

alias confirm='printf "y\n" |'

alias hit='confirm hity'

alias hit='history -c && echo -e '\''y'\'' && exit'

alias hit='history -c; printf "y\n" | read -r; exit'

yogeshraja pushed a commit to yogeshraja/ohmyzsh that referenced this pull request Jun 26, 2024
Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
ttelford pushed a commit to ttelford/oh-my-zsh that referenced this pull request Jun 26, 2024
Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
lesterchan added a commit to lesterchan/oh-my-zsh that referenced this pull request Jun 27, 2024
* upstream/master: (50 commits)
  fix(init): fix definition order for `$ZSH_CUSTOM`
  chore(deps): bump `urllib3` to 2.2.2 in `dependencies` workflow (ohmyzsh#12516)
  chore(history): show input in confirmation prompt
  fix(history): fix confirmation prompt to allow bypass
  fix(essembeh): use async prompt (ohmyzsh#12512)
  fix(encode64): use proper encode file flags
  feat(wd): update to 498695ff (ohmyzsh#12507)
  chore: better document top-level custom files for aliases (ohmyzsh#12504)
  docs(alias-finder): add some examples (ohmyzsh#12502)
  fix(history): fix logic error in prompt for `history -c` (ohmyzsh#12500)
  fix(timer): skip timer after running `clear` (ohmyzsh#12370)
  feat(shrink-path): allow for showing `N` last-full elements (ohmyzsh#12481)
  feat(init): add custom functions and completions to `$fpath` (ohmyzsh#5644)
  fix(screen): Prevent title being overwritten (ohmyzsh#4633)
  fix(history): add warning before deleting command history in `history -c` (ohmyzsh#12472)
  fix(lib/git): turn off async prompt for zsh < 5.0.6
  feat(symfony6): Add plugin for native autocompletion from Symfony 6
  Revert "Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)" (ohmyzsh#12493)
  Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)
  feat(poetry): add aliases (ohmyzsh#11858)
  ...
naveen-u pushed a commit to naveen-u/ohmyzsh that referenced this pull request Jul 1, 2024
Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
consumer47 pushed a commit to consumer47/.oh-my-zsh that referenced this pull request Jul 2, 2024
Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
yogeshraja pushed a commit to yogeshraja/ohmyzsh that referenced this pull request Jul 17, 2024
* feat(git): support `stable` in `git_main_branch` (ohmyzsh#12447)

* Add Support for Tabby Terminal in Macos Plugin (ohmyzsh#12451)

* Added Support for Tabby in Macos-Plugin

* Update README.md

Added Supported Terminal List

* chore(macos): Update README to link to terminals

Linking to the supported terminals, moving reference to the original author to the Acknowledgements section

---------

Co-authored-by: Robby Russell <robby@planetargon.com>

* feat(kitty): add plugin for the kitty terminal (ohmyzsh#10994)

* A plugin for the Kitty terminal

Provides a handful of useful aliases for anyone working in a Kitty
terminal. In particular, the kssh command is handy for ensuring that
terminfo is set correctly on remote hosts when  you ssh to them.

* Guard kitty configuration

We should only load these aliases into a terminal that's identifying
itself as an xterm-kitty terminal. They're not useful in any other
situation.

* fix(pass): completion for multiple repositories (ohmyzsh#12464)

* fix(kubectl): load completion properly in functions

Closes ohmyzsh#12427

* feat(yarn)!: add optional support for yarn berry (ohmyzsh#12374)

BREAKING CHANGE: some `yarn` aliases changed . Please see README for further information.

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* chore(yarn): remove unneeded line

* fix(tmux): add completion for alias functions (ohmyzsh#12468)

* docs(stripe): fix typo (ohmyzsh#12470)

* feat(eza): add icons option (ohmyzsh#12469)

Co-authored-by: Computer <computer@MAI.local>

* fix(bgnotify): use terminal-notifier args properly (ohmyzsh#12467)

* docs: reword alternative installer mirror (ohmyzsh#12474)

* feat(golang): add alias for `go mod tidy` (ohmyzsh#12473)

* fix(eza): icons tab completion (ohmyzsh#12483)

* feat(extract): add support for multi-part 7z (ohmyzsh#12484)

* fix(bundler): add completion for `bundler` bin as well

Closes ohmyzsh#12482

* feat(history-substring-search): update to 87ce96b1 (ohmyzsh#12486)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* feat(forklift): add support for ForkLift 4 (ohmyzsh#12490) (ohmyzsh#12491)

* feat(terraform): add workspace aliases (ohmyzsh#12171)

* feat(terraform): add workspace aliases

* chore: rm aliases in separate pending pr

* docs: show tfiu alias in readme

---------

Co-authored-by: Robby Russell <robby@planetargon.com>

* feat(docker): add aliases for `docker ps` and `docker ps -a` (ohmyzsh#12488)

* feat(swiftpm): update completion for Swift 5.9 (ohmyzsh#12044)

* feat(poetry): add aliases (ohmyzsh#11858)

* Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)

* Revert "Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)" (ohmyzsh#12493)

This reverts commit 166b9dc.

* feat(symfony6): Add plugin for native autocompletion from Symfony 6

This reverts commit 83014bd.

* fix(lib/git): turn off async prompt for zsh < 5.0.6

We removed this mitigation in 0c80a06 because of an assumption
that the issue had been fixed, but it looks like zsh < 5.0.6 has
other issues (see ohmyzsh#12360), so we need to disable it for real.

Fixes ohmyzsh#12360

* fix(history): add warning before deleting command history in `history -c` (ohmyzsh#12472)

* fix(screen): Prevent title being overwritten (ohmyzsh#4633)

lib/termsupport.zsh creates titles for screen which take precedence over
titles set by the screen plugin. Unsetting the title() function within
the screen plugin prevent this "race-condition".

* feat(init): add custom functions and completions to `$fpath` (ohmyzsh#5644)

Closes ohmyzsh#5644

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* feat(shrink-path): allow for showing `N` last-full elements (ohmyzsh#12481)

This commit allows specifying a number of last segments to be fully shown,
either via `-l N` or with `zstyle`.

* fix(timer): skip timer after running `clear` (ohmyzsh#12370)

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(history): fix logic error in prompt for `history -c` (ohmyzsh#12500)

Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>

* docs(alias-finder): add some examples (ohmyzsh#12502)

* chore: better document top-level custom files for aliases (#12504)

See discussion in https://github.com/ohmyzsh/ohmyzsh/discussions/12504

* feat(wd): update to 498695ff (ohmyzsh#12507)

Closes ohmyzsh#12489

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* fix(encode64): use proper encode file flags

Fixes ohmyzsh#12509

* fix(essembeh): use async prompt (ohmyzsh#12512)

* fix(history): fix confirmation prompt to allow bypass

See ohmyzsh#12472 (comment)

* chore(history): show input in confirmation prompt

Fixes ohmyzsh#12472 (comment)

* chore(deps): bump `urllib3` to 2.2.2 in `dependencies` workflow (ohmyzsh#12516)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(init): fix definition order for `$ZSH_CUSTOM`

Tipped about this in ohmyzsh@6754b7e67#commitcomment-143280115

* chore(deps): bump certifi from 2024.2.2 to 2024.6.2 in /.github/workflows/dependencies (ohmyzsh#12519)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump requests from 2.31.0 to 2.32.3 in /.github/workflows/dependencies (ohmyzsh#12518)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(git): add `gclf` alias (ohmyzsh#12508)

* fix(bun): set `SHELL` when generating completions (ohmyzsh#12533)

* docs: rename twitter to X, fix link (ohmyzsh#12532)

* docs(command-not-found): mention gentoo support (ohmyzsh#12530)

* feat(battery): support custom AC indicator (ohmyzsh#12528)

* chore: replace all instances of twitter with X

Closes ohmyzsh#12536

* chore(deps): bump certifi in `dependencies` workflow (ohmyzsh#12543)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.6.2 to 2024.7.4.
- [Commits](certifi/python-certifi@2024.06.02...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(eza): add hyperlink option (ohmyzsh#12545)

* refactor(pygmalion): simplify theme logic and prompt sequences (ohmyzsh#12550)

* Simplify Pygmalion Theme

The Pygmalion theme previously had some logic for counting line length and taking action based on line length. The action was removed in c52441b, but the counting still needlessly happens. 

This commit removes the code to count line length, and simplifies the Pygmalion theme by moving the "precmd" into the setup. 

As a bonus unintended side effect, this makes the Pygmalion theme compatible with the current async prompting logic (i.e. after this change, Pygmalion is no longer affected by ohmyzsh#12328)

* refactor(pygmalion): redo and simplify prompt sequences

With this commit we put the minimal needed color resets, i.e. only
when we don't control the previous text we need to do a full reset.
Otherwise we can just use %F{} to change only the foreground color.

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(init): add cached completions directory only once (ohmyzsh#12551)

Double quotes within the subscript test are interpreted literally, making the
test never match. On subsequent runs, the `$ZSH_CACHE_DIR/completions` directory
is always prepended to `$fpath`, even if it is already there. This commit fixes
that.

Fixes ohmyzsh#12551

Co-authored-by: Adem Simsek <adem@simsek.dev>

* fix(init): fix subscript flag in 11ca9e2

* feat(opentofu): add plugin for OpenTofu (ohmyzsh#12285)

- Adds aliases
- Sets up autocompletion
- Adds promp functions to show workspace and `tofu` version

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(docker-compose): fix test for `docker-compose` executable (ohmyzsh#12555)

* fix(tmux): do not conflict with `rcExpandParam`

Closes ohmyzsh#12506

* feat(conda-env): add plugin for conda prompt display (ohmyzsh#10619)

Co-authored-by: Jeonguk Choi <91456421+devj121@users.noreply.github.com>

* fix(python): avoid local packages load

Closes ohmyzsh#12535

* refactor(rtx): remove deprecated `rtx` plugin in favor of `mise`

* feat(bira): add `conda` env information (requires `conda-env` plugin) (ohmyzsh#12546)

Closes ohmyzsh#10274
Closes ohmyzsh#12546

Co-authored-by: elfisworking <zymustb@126.com>
Signed-off-by: elfisworking <zymustb@126.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: elfisworking <zymustb@126.com>
Co-authored-by: Jesús Miguel Benito Calzada <beni0888@hotmail.com>
Co-authored-by: theredcmdcraft <57496807+theredcmdcraft@users.noreply.github.com>
Co-authored-by: Robby Russell <robby@planetargon.com>
Co-authored-by: Ian Chesal <ian.chesal@gmail.com>
Co-authored-by: Lukas Grimm <ombre@ombre.ch>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
Co-authored-by: Jeroen Claassens <jeroen.claassens@live.nl>
Co-authored-by: MoetaYuko <loli@yuko.moe>
Co-authored-by: Albert <87888006+MustCodeAl@users.noreply.github.com>
Co-authored-by: EraPartner <152506497+EraPartner@users.noreply.github.com>
Co-authored-by: Computer <computer@MAI.local>
Co-authored-by: David LJ <mail@davidlj95.com>
Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
Co-authored-by: Martin Bjeldbak Madsen <me@martinbjeldbak.com>
Co-authored-by: vincent <captainvincenttw@gmail.com>
Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>
Co-authored-by: Michal Szymanski <55950820+misiektoja@users.noreply.github.com>
Co-authored-by: nitrocode <7775707+nitrocode@users.noreply.github.com>
Co-authored-by: Sergey Karpuk <sergeykarpuk@yandex.by>
Co-authored-by: Marco Eidinger <eidingermarco@gmail.com>
Co-authored-by: baltic-tea <97766478+baltic-tea@users.noreply.github.com>
Co-authored-by: Malte Schlüter <account@schlueter-malte.de>
Co-authored-by: Marc Cornellà <marc@mcornella.com>
Co-authored-by: Manuel Faux <manuel@conf.at>
Co-authored-by: Mayu Laierlence <minacle@live.com>
Co-authored-by: Gabriel Charland <76267249+gcharland1@users.noreply.github.com>
Co-authored-by: Nathaniel.Belles <36868971+Nbelles@users.noreply.github.com>
Co-authored-by: Nick Glenn <78454343+Sargates@users.noreply.github.com>
Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
Co-authored-by: Tim Abell <tim@timwise.co.uk>
Co-authored-by: Sébastien MB <essembeh@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Turiiya <34311583+ttytm@users.noreply.github.com>
Co-authored-by: Pedro Barbiero <pedro.barbiero@db1.com.br>
Co-authored-by: Ihor <kopach@users.noreply.github.com>
Co-authored-by: Luke <luke@blucobalt.dev>
Co-authored-by: 张新伟 <me@ryuujo.com>
Co-authored-by: Benedikt Volkmer <7070761+bvolkmer@users.noreply.github.com>
Co-authored-by: Marc Khouri <marc@khouri.ca>
Co-authored-by: Adem Simsek <adem@simsek.dev>
Co-authored-by: chenzj <tibazq@gmail.com>
Co-authored-by: Denis Iskandarov <den-is@users.noreply.github.com>
Co-authored-by: Jeonguk Choi <91456421+cjeonguk@users.noreply.github.com>
Co-authored-by: Jeonguk Choi <91456421+devj121@users.noreply.github.com>
Co-authored-by: Teddy Masters <teddy.masters@pm.me>
Co-authored-by: elfisworking <zymustb@126.com>
yogeshraja pushed a commit to yogeshraja/ohmyzsh that referenced this pull request Jul 22, 2024
Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
yogeshraja pushed a commit to yogeshraja/ohmyzsh that referenced this pull request Jul 22, 2024
* feat(git): support `stable` in `git_main_branch` (ohmyzsh#12447)

* Add Support for Tabby Terminal in Macos Plugin (ohmyzsh#12451)

* Added Support for Tabby in Macos-Plugin

* Update README.md

Added Supported Terminal List

* chore(macos): Update README to link to terminals

Linking to the supported terminals, moving reference to the original author to the Acknowledgements section

---------

Co-authored-by: Robby Russell <robby@planetargon.com>

* feat(kitty): add plugin for the kitty terminal (ohmyzsh#10994)

* A plugin for the Kitty terminal

Provides a handful of useful aliases for anyone working in a Kitty
terminal. In particular, the kssh command is handy for ensuring that
terminfo is set correctly on remote hosts when  you ssh to them.

* Guard kitty configuration

We should only load these aliases into a terminal that's identifying
itself as an xterm-kitty terminal. They're not useful in any other
situation.

* fix(pass): completion for multiple repositories (ohmyzsh#12464)

* fix(kubectl): load completion properly in functions

Closes ohmyzsh#12427

* feat(yarn)!: add optional support for yarn berry (ohmyzsh#12374)

BREAKING CHANGE: some `yarn` aliases changed . Please see README for further information.

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* chore(yarn): remove unneeded line

* fix(tmux): add completion for alias functions (ohmyzsh#12468)

* docs(stripe): fix typo (ohmyzsh#12470)

* feat(eza): add icons option (ohmyzsh#12469)

Co-authored-by: Computer <computer@MAI.local>

* fix(bgnotify): use terminal-notifier args properly (ohmyzsh#12467)

* docs: reword alternative installer mirror (ohmyzsh#12474)

* feat(golang): add alias for `go mod tidy` (ohmyzsh#12473)

* fix(eza): icons tab completion (ohmyzsh#12483)

* feat(extract): add support for multi-part 7z (ohmyzsh#12484)

* fix(bundler): add completion for `bundler` bin as well

Closes ohmyzsh#12482

* feat(history-substring-search): update to 87ce96b1 (ohmyzsh#12486)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* feat(forklift): add support for ForkLift 4 (ohmyzsh#12490) (ohmyzsh#12491)

* feat(terraform): add workspace aliases (ohmyzsh#12171)

* feat(terraform): add workspace aliases

* chore: rm aliases in separate pending pr

* docs: show tfiu alias in readme

---------

Co-authored-by: Robby Russell <robby@planetargon.com>

* feat(docker): add aliases for `docker ps` and `docker ps -a` (ohmyzsh#12488)

* feat(swiftpm): update completion for Swift 5.9 (ohmyzsh#12044)

* feat(poetry): add aliases (ohmyzsh#11858)

* Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)

* Revert "Add plugin for native autocompletion from Symfony 6 (ohmyzsh#11999)" (ohmyzsh#12493)

This reverts commit 166b9dc.

* feat(symfony6): Add plugin for native autocompletion from Symfony 6

This reverts commit 83014bd.

* fix(lib/git): turn off async prompt for zsh < 5.0.6

We removed this mitigation in 0c80a06 because of an assumption
that the issue had been fixed, but it looks like zsh < 5.0.6 has
other issues (see ohmyzsh#12360), so we need to disable it for real.

Fixes ohmyzsh#12360

* fix(history): add warning before deleting command history in `history -c` (ohmyzsh#12472)

* fix(screen): Prevent title being overwritten (ohmyzsh#4633)

lib/termsupport.zsh creates titles for screen which take precedence over
titles set by the screen plugin. Unsetting the title() function within
the screen plugin prevent this "race-condition".

* feat(init): add custom functions and completions to `$fpath` (ohmyzsh#5644)

Closes ohmyzsh#5644

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* feat(shrink-path): allow for showing `N` last-full elements (ohmyzsh#12481)

This commit allows specifying a number of last segments to be fully shown,
either via `-l N` or with `zstyle`.

* fix(timer): skip timer after running `clear` (ohmyzsh#12370)

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(history): fix logic error in prompt for `history -c` (ohmyzsh#12500)

Logic error in `history -c` when prompting for confirmation caused history
to be deleted when typing anything but explicitly `n`, `N`, or sending `\n`.
New logic prevents deletion by pressing wrong key and only deletes
history when sending `y` or `Y`.

Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>

* docs(alias-finder): add some examples (ohmyzsh#12502)

* chore: better document top-level custom files for aliases (ohmyzsh#12504)

See discussion in ohmyzsh#12504

* feat(wd): update to 498695ff (ohmyzsh#12507)

Closes ohmyzsh#12489

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* fix(encode64): use proper encode file flags

Fixes ohmyzsh#12509

* fix(essembeh): use async prompt (ohmyzsh#12512)

* fix(history): fix confirmation prompt to allow bypass

See ohmyzsh#12472 (comment)

* chore(history): show input in confirmation prompt

Fixes ohmyzsh#12472 (comment)

* chore(deps): bump `urllib3` to 2.2.2 in `dependencies` workflow (ohmyzsh#12516)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(init): fix definition order for `$ZSH_CUSTOM`

Tipped about this in ohmyzsh@6754b7e67#commitcomment-143280115

* chore(deps): bump certifi from 2024.2.2 to 2024.6.2 in /.github/workflows/dependencies (ohmyzsh#12519)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump requests from 2.31.0 to 2.32.3 in /.github/workflows/dependencies (ohmyzsh#12518)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(git): add `gclf` alias (ohmyzsh#12508)

* fix(bun): set `SHELL` when generating completions (ohmyzsh#12533)

* docs: rename twitter to X, fix link (ohmyzsh#12532)

* docs(command-not-found): mention gentoo support (ohmyzsh#12530)

* feat(battery): support custom AC indicator (ohmyzsh#12528)

* chore: replace all instances of twitter with X

Closes ohmyzsh#12536

* chore(deps): bump certifi in `dependencies` workflow (ohmyzsh#12543)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.6.2 to 2024.7.4.
- [Commits](certifi/python-certifi@2024.06.02...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(eza): add hyperlink option (ohmyzsh#12545)

* refactor(pygmalion): simplify theme logic and prompt sequences (ohmyzsh#12550)

* Simplify Pygmalion Theme

The Pygmalion theme previously had some logic for counting line length and taking action based on line length. The action was removed in c52441b, but the counting still needlessly happens.

This commit removes the code to count line length, and simplifies the Pygmalion theme by moving the "precmd" into the setup.

As a bonus unintended side effect, this makes the Pygmalion theme compatible with the current async prompting logic (i.e. after this change, Pygmalion is no longer affected by ohmyzsh#12328)

* refactor(pygmalion): redo and simplify prompt sequences

With this commit we put the minimal needed color resets, i.e. only
when we don't control the previous text we need to do a full reset.
Otherwise we can just use %F{} to change only the foreground color.

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(init): add cached completions directory only once (ohmyzsh#12551)

Double quotes within the subscript test are interpreted literally, making the
test never match. On subsequent runs, the `$ZSH_CACHE_DIR/completions` directory
is always prepended to `$fpath`, even if it is already there. This commit fixes
that.

Fixes ohmyzsh#12551

Co-authored-by: Adem Simsek <adem@simsek.dev>

* fix(init): fix subscript flag in 11ca9e2

* feat(opentofu): add plugin for OpenTofu (ohmyzsh#12285)

- Adds aliases
- Sets up autocompletion
- Adds promp functions to show workspace and `tofu` version

Co-authored-by: Marc Cornellà <marc@mcornella.com>

* fix(docker-compose): fix test for `docker-compose` executable (ohmyzsh#12555)

* fix(tmux): do not conflict with `rcExpandParam`

Closes ohmyzsh#12506

* feat(conda-env): add plugin for conda prompt display (ohmyzsh#10619)

Co-authored-by: Jeonguk Choi <91456421+devj121@users.noreply.github.com>

* fix(python): avoid local packages load

Closes ohmyzsh#12535

* refactor(rtx): remove deprecated `rtx` plugin in favor of `mise`

* feat(bira): add `conda` env information (requires `conda-env` plugin) (ohmyzsh#12546)

Closes ohmyzsh#10274
Closes ohmyzsh#12546

Co-authored-by: elfisworking <zymustb@126.com>
Signed-off-by: elfisworking <zymustb@126.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: elfisworking <zymustb@126.com>
Co-authored-by: Jesús Miguel Benito Calzada <beni0888@hotmail.com>
Co-authored-by: theredcmdcraft <57496807+theredcmdcraft@users.noreply.github.com>
Co-authored-by: Robby Russell <robby@planetargon.com>
Co-authored-by: Ian Chesal <ian.chesal@gmail.com>
Co-authored-by: Lukas Grimm <ombre@ombre.ch>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
Co-authored-by: Jeroen Claassens <jeroen.claassens@live.nl>
Co-authored-by: MoetaYuko <loli@yuko.moe>
Co-authored-by: Albert <87888006+MustCodeAl@users.noreply.github.com>
Co-authored-by: EraPartner <152506497+EraPartner@users.noreply.github.com>
Co-authored-by: Computer <computer@MAI.local>
Co-authored-by: David LJ <mail@davidlj95.com>
Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
Co-authored-by: Martin Bjeldbak Madsen <me@martinbjeldbak.com>
Co-authored-by: vincent <captainvincenttw@gmail.com>
Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>
Co-authored-by: Michal Szymanski <55950820+misiektoja@users.noreply.github.com>
Co-authored-by: nitrocode <7775707+nitrocode@users.noreply.github.com>
Co-authored-by: Sergey Karpuk <sergeykarpuk@yandex.by>
Co-authored-by: Marco Eidinger <eidingermarco@gmail.com>
Co-authored-by: baltic-tea <97766478+baltic-tea@users.noreply.github.com>
Co-authored-by: Malte Schlüter <account@schlueter-malte.de>
Co-authored-by: Marc Cornellà <marc@mcornella.com>
Co-authored-by: Manuel Faux <manuel@conf.at>
Co-authored-by: Mayu Laierlence <minacle@live.com>
Co-authored-by: Gabriel Charland <76267249+gcharland1@users.noreply.github.com>
Co-authored-by: Nathaniel.Belles <36868971+Nbelles@users.noreply.github.com>
Co-authored-by: Nick Glenn <78454343+Sargates@users.noreply.github.com>
Co-authored-by: Sargates <nicholas.g.glenn@gmail.com>
Co-authored-by: Tim Abell <tim@timwise.co.uk>
Co-authored-by: Sébastien MB <essembeh@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Turiiya <34311583+ttytm@users.noreply.github.com>
Co-authored-by: Pedro Barbiero <pedro.barbiero@db1.com.br>
Co-authored-by: Ihor <kopach@users.noreply.github.com>
Co-authored-by: Luke <luke@blucobalt.dev>
Co-authored-by: 张新伟 <me@ryuujo.com>
Co-authored-by: Benedikt Volkmer <7070761+bvolkmer@users.noreply.github.com>
Co-authored-by: Marc Khouri <marc@khouri.ca>
Co-authored-by: Adem Simsek <adem@simsek.dev>
Co-authored-by: chenzj <tibazq@gmail.com>
Co-authored-by: Denis Iskandarov <den-is@users.noreply.github.com>
Co-authored-by: Jeonguk Choi <91456421+cjeonguk@users.noreply.github.com>
Co-authored-by: Jeonguk Choi <91456421+devj121@users.noreply.github.com>
Co-authored-by: Teddy Masters <teddy.masters@pm.me>
Co-authored-by: elfisworking <zymustb@126.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: core Issue or PR related to core parts of the project
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants