[pacman-dev] [PATCH 1/2] zsh_completion: Add --asdeps/--asexplicit to -U options

older
[pacman-dev] [PATCH] be_package:...

Mohammad Alsaleh

22 Oct 2015 22 Oct '15

10:38 p.m.

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 1cae1de..69485f5 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -41,6 +41,8 @@ _pacman_opts_pkgfile=( '--dbonly[Only remove database entry, do not remove files]' '--force[Overwrite conflicting files]' '--needed[Do not reinstall up to date packages]' + '--asdeps[mark packages as non-explicitly installed]' + '--asexplicit[mark packages as explicitly installed]' '*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"' ) -- 2.6.1

Show replies by date

Mohammad Alsaleh

22 Oct 22 Oct

10:38 p.m.

New subject: [pacman-dev] [PATCH 2/2] zsh_completion: Handle --ignore/--ignoregroup correctly

Completion now works as expected with a comma-separated sequence. Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 69485f5..0db26b2 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -252,23 +252,36 @@ _pacman_completions_all_groups() { _pacman_get_command groups=( $(_call_program groups $cmd[@] -Sg) ) typeset -U groups - compadd "$@" -a groups + + if [[ ${words[CURRENT-1]} == '--ignoregroup' ]]; then + _sequence compadd -S ',' "$@" -a groups + else + compadd "$@" -a groups + fi } # provides completions for packages available from repositories # these can be specified as either 'package' or 'repository/package' _pacman_completions_all_packages() { - local -a cmd packages repositories packages_long + local -a seq sep cmd packages repositories packages_long _pacman_get_command + if [[ ${words[CURRENT-1]} == '--ignore' ]]; then + seq='_sequence' + sep=(-S ',') + else + seq= + sep=() + fi + if compset -P1 '*/*'; then packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) ) typeset -U packages - _wanted repo_packages expl "repository/package" compadd ${(@)packages} + ${seq} _wanted repo_packages expl "repository/package" compadd ${sep[@]} ${(@)packages} else packages=( $(_call_program packages $cmd[@] -Sql) ) typeset -U packages - _wanted packages expl "packages" compadd - "${(@)packages}" + ${seq} _wanted packages expl "packages" compadd ${sep[@]} - "${(@)packages}" repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories -- 2.6.1

Allan McRae

27 Oct 27 Oct

4:06 a.m.

New subject: [pacman-dev] [PATCH 2/2] zsh_completion: Handle --ignore/--ignoregroup correctly

On 23/10/15 08:38, Mohammad Alsaleh wrote:

...

Completion now works as expected with a comma-separated sequence.

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

This looks fine to me, but I don't know anything about zsh completion. Is there anyone else that can review? Thanks, Allan

Daniel Wallace

4:07 a.m.

New subject: [pacman-dev] [PATCH 2/2] zsh_completion: Handle --ignore/--ignoregroup correctly

I can review it tomorrow. On Mon, Oct 26, 2015 at 11:06 PM Allan McRae wrote:

...

On 23/10/15 08:38, Mohammad Alsaleh wrote:

...
Completion now works as expected with a comma-separated sequence.

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

This looks fine to me, but I don't know anything about zsh completion.

Is there anyone else that can review?

Thanks, Allan

Allan McRae

3 Nov 3 Nov

4:46 a.m.

New subject: [pacman-dev] [PATCH 2/2] zsh_completion: Handle --ignore/--ignoregroup correctly

Ping! It now a week + tomorrow. On 27/10/15 14:07, Daniel Wallace wrote:

...

I can review it tomorrow.

On Mon, Oct 26, 2015 at 11:06 PM Allan McRae wrote:

...
On 23/10/15 08:38, Mohammad Alsaleh wrote:

...
Completion now works as expected with a comma-separated sequence.

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

This looks fine to me, but I don't know anything about zsh completion.

Is there anyone else that can review?

Thanks, Allan

Daniel Wallace

3:16 p.m.

New subject: [pacman-dev] [PATCH 2/2] zsh_completion: Handle --ignore/--ignoregroup correctly

Sorry, I got super busy that morning and forgot. I verified it last night +1. On Mon, Nov 2, 2015 at 10:46 PM, Allan McRae wrote:

...

Ping! It now a week + tomorrow.

On 27/10/15 14:07, Daniel Wallace wrote:

...
I can review it tomorrow.

On Mon, Oct 26, 2015 at 11:06 PM Allan McRae wrote:

...
On 23/10/15 08:38, Mohammad Alsaleh wrote:

...
Completion now works as expected with a comma-separated sequence.

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

This looks fine to me, but I don't know anything about zsh completion.

Is there anyone else that can review?

Thanks, Allan

Allan McRae

27 Oct 27 Oct

4:03 a.m.

New subject: [pacman-dev] [PATCH 1/2] zsh_completion: Add --asdeps/--asexplicit to -U options

On 23/10/15 08:38, Mohammad Alsaleh wrote:

...

Signed-off-by: Mohammad Alsaleh --- contrib/zsh_completion.in | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 1cae1de..69485f5 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -41,6 +41,8 @@ _pacman_opts_pkgfile=( '--dbonly[Only remove database entry, do not remove files]' '--force[Overwrite conflicting files]' '--needed[Do not reinstall up to date packages]' + '--asdeps[mark packages as non-explicitly installed]' + '--asexplicit[mark packages as explicitly installed]' '*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"' )

Ack. Allan

3105

Age (days ago)

3117

Last active (days ago)

List overview

Download

6 comments

3 participants

participants (3)

Allan McRae
Daniel Wallace
Mohammad Alsaleh