zsh-completion: Update cave resolve completion

1 files changed, 17 insertions, 7 deletions

diff --git a/zsh-completion/_cave b/zsh-completion/_cave
index 34957fe3d..6607af389 100644
--- a/zsh-completion/_cave
+++ b/zsh-completion/_cave
@@ -248,28 +248,38 @@ _cave_cmd_resolve()
     '(--lazy -z --complete -c --everything -e --no-lazy --no-complete --no-everything)'{--lazy,-z,--no-lazy}'[Do as little work as possible]' \
     '(--lazy -z --complete -c --everything -e --no-lazy --no-complete --no-everything)'{--complete,-c,--no-complete}'[Do all optional work]' \
     '(--lazy -z --complete -c --everything -e --no-lazy --no-complete --no-everything)'{--everything,-e,--no-everything}'[Do all optional work, and also reinstall]' \
-    '--explain[Explain why decisions are made]:package depspec: ' \
+    '(--explain -X)'{--explain,-X}'[Explain why decisions are made]:Spec: ' \
+    '(--permit-uninstall -U)'{--permit-uninstall,-U}'[Permit uninstallation of packages matching a package spec]:Spec: ' \
+    '(--permit-downgrade -d)'{--permit-downgrade,-d}'[Permit downgrades of packages matching a package spec]:Spec: ' \
+    '(--permit-any-version -e)'{--permit-any-version,-e}'[Permit installs of versions worse than the best visible version in the slot for packages matching a package spec]:Spec: ' \
     '(--keep-targets -K)'{--keep-targets,-K}'[Select whether to keep target packages]:When:((auto never if-transient if-same if-same-version if-possible))' \
     '(--keep -k)'{--keep,-k}'[Select whether to keep packages that are not targets]:When:((never if-transient if-same if-same-version if-possible))' \
     '(--reinstall-scm -R)'{--reinstall-scm,-R}'[Select whether to reinstall SCM packages that would otherwise be kept]:When:((always daily weekly never))' \
+    '(--with -w)'{--with,-w}'[Never keep installed packages with the supplied package name]:Spec: ' \
+    '(--without -W)'{--without,-W}'[Keep installed packages with the supplied package name if possible]:Spec: ' \
     '(--target-slots -S)'{--target-slots,-S}'[Which slots to consider for targets]:Which:((best-or-installed installed-or-best all best))' \
     '(--slots -s)'{--slots,-s}'[Which slots to consider for packages that are not targets]:Which:((best-or-installed installed-or-best all best))' \
     '(--follow-installed-build-dependencies --no-follow-installed-build-dependencies -D)'{--follow-installed-build-dependencies,--no-follow-installed-build-dependencies,-D}'[Follow build dependencies for installed packages]' \
-    '(--ignore-installed-dependencies --no-ignore-installed-dependencies -d)'{--ignore-installed-dependencies,--no-ignore-installed-dependencies,-d}'[Ignore dependencies for installed packages]' \
+    '(--no-follow-installed-dependencies --no-no-follow-installed-dependencies -n)'{--no-follow-installed-dependencies,--no-no-follow-installed-dependencies,-n}'[Ignore dependencies for installed packages]' \
+    '(--no-dependencies-from -0)'{--no-dependencies-from,-0}'[Ignore dependencies (not blockers) from packages matching a package spec]:Spec: ' \
+    '(--no-blockers-from -!)'{--no-blockers-from,-!}'[Ignore blockers from packages matching a package spec]:Spec: ' \
     '(--dump --no-dump)'{--dump,--no-dump}'[Dump debug output]' \
     '(--dump-dependencies --no-dump-dependencies)'{--dump-dependencies,--no-dump-dependencies}'[Dump the sanitised dependencies selected for every package]' \
     '(--dump-restarts --no-dump-restarts)'{--dump-restarts,--no-dump-restarts}'[Dump restarts]' \
     '--suggestions[Control whether suggestions are taken]:When:((ignore display take))' \
     '--recommendations[Control whether recommendations are taken]:When:((ignore display take))' \
-    '--take[Take suggestions matching a package spec]:Spec: ' \
-    '--take-from[Take suggestions made by any package matching a package spec]:Spec: ' \
-    '--discard[Discard any suggestion matching a package spec]:Spec: ' \
-    '--discard-from[Discard all suggestions made by any package matching a package spec]:Spec: ' \
+    '(--take -t)'{--take,-t}'[Take suggestions matching a package spec]:Spec: ' \
+    '(--take-from -T)'{--take-from,-T}'[Take suggestions made by any package matching a package spec]:Spec: ' \
+    '(--ignore -i)'{--ignore,-i}'[Discard any suggestion matching a package spec]:Spec: ' \
+    '(--ignore-from -I)'{--ignore-from,-I}'[Discard all suggestions made by any package matching a package spec]:Spec: ' \
+    '(--favour -F)'{--favour,-F}'[If there is a choice, favour the specified package name]:Spec: ' \
+    '(--avoid -A)'{--avoid,-A}'[If there is a choice, avoid the specified package name]:Spec: ' \
+    '(--preset -p)'{--preset,-p}'[Preset a given constraint]:Spec: ' \
     '(--create-binaries -b)'{--create-binaries,-b}'[Create binary packages in the specified repository]:Repository:_cave_repositories' \
     '(--no-binaries-for -B)'{--no-binaries-for,-B}'[Do not create binary packages from any origin ID matching a spec]:Spec: ' \
     '(--install-to-root -/ --no-install-to-root)'{--install-to-root,-/,--no-install-to-root}'[Install packages to /]' \
     '(--preserve-world -1 --no-preserve-world)'{--preserve-world,-1,--no-preserve-world}'[Do not modify the world set]' \
-    '--continue-on-failure[Whether to continue after an error occurs]:When:((if-fetching never if-satisfied if-independent always))' \
+    '(--continue-on-failure -C)'{--continue-on-failure,-C}'[Whether to continue after an error occurs]:When:((if-fetching never if-satisfied if-independent always))' \
     '--skip-phase[Skip the named phases]:Phase:((fetch_extra killold init setup unpack prepare configure compile test test_expensive install strip preinst merge prerm postrm postinst tidyup))' \
     '--abort-at-phase[Abort when a named phase is encountered]:Phase:((fetch_extra killold init setup unpack prepare configure compile test test_expensive install strip preinst merge prerm postrm postinst tidyup))' \
     '--skip-until-phase[Skip every phase until a named phase is encountered]:Phase:((fetch_extra killold init setup unpack prepare configure compile test test_expensive install strip preinst merge prerm postrm postinst tidyup))' \