* [PATCH] completion: handle notmuch address --deduplicate= option
@ 2015-09-26 11:12 Jani Nikula
2015-10-17 16:30 ` [PATCH 1/3] completion: complete notmuch count --lastmod Jani Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2015-09-26 11:12 UTC (permalink / raw)
To: notmuch
Complete notmuch address --deduplicate=(no|mailbox|address).
---
completion/notmuch-completion.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 960275d1f672..68b069013655 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -369,12 +369,16 @@ _notmuch_address()
COMPREPLY=( $( compgen -W "true false flag all" -- "${cur}" ) )
return
;;
+ --deduplicate)
+ COMPREPLY=( $( compgen -W "no mailbox address" -- "${cur}" ) )
+ return
+ ;;
esac
! $split &&
case "${cur}" in
-*)
- local options="--format= --output= --sort= --exclude="
+ local options="--format= --output= --sort= --exclude= --deduplicate="
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/3] completion: complete notmuch count --lastmod
2015-09-26 11:12 [PATCH] completion: handle notmuch address --deduplicate= option Jani Nikula
@ 2015-10-17 16:30 ` Jani Nikula
2015-10-17 16:30 ` [PATCH 2/3] completion: complete shared options for each command Jani Nikula
2015-10-17 16:30 ` [PATCH 3/3] completion: clean up top level completion Jani Nikula
0 siblings, 2 replies; 6+ messages in thread
From: Jani Nikula @ 2015-10-17 16:30 UTC (permalink / raw)
To: notmuch
---
completion/notmuch-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 68b069013655..1552c1e51db7 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -162,7 +162,7 @@ _notmuch_count()
! $split &&
case "${cur}" in
-*)
- local options="--output= --exclude= --batch --input="
+ local options="--output= --exclude= --batch --input= --lastmod"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] completion: complete shared options for each command
2015-10-17 16:30 ` [PATCH 1/3] completion: complete notmuch count --lastmod Jani Nikula
@ 2015-10-17 16:30 ` Jani Nikula
2015-10-17 16:30 ` [PATCH 3/3] completion: clean up top level completion Jani Nikula
1 sibling, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2015-10-17 16:30 UTC (permalink / raw)
To: notmuch
Add support for completing --help, --uuid=, and --version after the
subcommand. Do not support shared options at the top level yet due to
difficulties in handling options with arguments.
--uuid necessitates adding 'compopt -o nospace' also to notmuch new
completion, but that just brings it in line with the rest.
---
completion/notmuch-completion.bash | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 1552c1e51db7..1356c4a40515 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -27,6 +27,8 @@
# on completion.
#
+_notmuch_shared_options="--help --uuid= --version"
+
# $1: current input of the form prefix:partialinput, where prefix is
# to or from.
_notmuch_email()
@@ -109,7 +111,7 @@ _notmuch_compact()
! $split &&
case "${cur}" in
-*)
- local options="--backup= --quiet"
+ local options="--backup= --quiet ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -162,7 +164,7 @@ _notmuch_count()
! $split &&
case "${cur}" in
-*)
- local options="--output= --exclude= --batch --input= --lastmod"
+ local options="--output= --exclude= --batch --input= --lastmod ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -192,7 +194,7 @@ _notmuch_dump()
! $split &&
case "${cur}" in
-*)
- local options="--gzip --format= --output="
+ local options="--gzip --format= --output= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -222,7 +224,7 @@ _notmuch_insert()
! $split &&
case "${cur}" in
--*)
- local options="--create-folder --folder= --keep --no-hooks"
+ local options="--create-folder --folder= --keep --no-hooks ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
return
@@ -245,7 +247,8 @@ _notmuch_new()
case "${cur}" in
-*)
- local options="--no-hooks --quiet"
+ local options="--no-hooks --quiet ${_notmuch_shared_options}"
+ compopt -o nospace
COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )
;;
esac
@@ -271,7 +274,7 @@ _notmuch_reply()
! $split &&
case "${cur}" in
-*)
- local options="--format= --format-version= --reply-to= --decrypt"
+ local options="--format= --format-version= --reply-to= --decrypt ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -301,7 +304,7 @@ _notmuch_restore()
! $split &&
case "${cur}" in
-*)
- local options="--format= --accumulate --input="
+ local options="--format= --accumulate --input= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -336,7 +339,7 @@ _notmuch_search()
! $split &&
case "${cur}" in
-*)
- local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="
+ local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -378,7 +381,7 @@ _notmuch_address()
! $split &&
case "${cur}" in
-*)
- local options="--format= --output= --sort= --exclude= --deduplicate="
+ local options="--format= --output= --sort= --exclude= --deduplicate= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -412,7 +415,7 @@ _notmuch_show()
! $split &&
case "${cur}" in
-*)
- local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html"
+ local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -439,7 +442,7 @@ _notmuch_tag()
! $split &&
case "${cur}" in
--*)
- local options="--batch --input= --remove-all"
+ local options="--batch --input= --remove-all ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
return
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] completion: clean up top level completion
2015-10-17 16:30 ` [PATCH 1/3] completion: complete notmuch count --lastmod Jani Nikula
2015-10-17 16:30 ` [PATCH 2/3] completion: complete shared options for each command Jani Nikula
@ 2015-10-17 16:30 ` Jani Nikula
2015-10-17 21:03 ` [PATCH] completion: complete lastmod: search prefix Jani Nikula
1 sibling, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2015-10-17 16:30 UTC (permalink / raw)
To: notmuch
Add note about missing features.
---
completion/notmuch-completion.bash | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 1356c4a40515..f24d9ecd337f 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -484,10 +484,15 @@ _notmuch()
if [ -z "${arg}" ]; then
# top level completion
- local top_options="--help --version"
case "${cur}" in
- -*) COMPREPLY=( $(compgen -W "${top_options}" -- ${cur}) ) ;;
- *) COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) ) ;;
+ -*)
+ # XXX: handle ${_notmuch_shared_options} and --config=
+ local options="--help --version"
+ COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )
+ ;;
+ *)
+ COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) )
+ ;;
esac
elif [ "${arg}" = "help" ]; then
# handle help command specially due to _notmuch_commands usage
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] completion: complete lastmod: search prefix
2015-10-17 16:30 ` [PATCH 3/3] completion: clean up top level completion Jani Nikula
@ 2015-10-17 21:03 ` Jani Nikula
2015-10-22 12:56 ` David Bremner
0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2015-10-17 21:03 UTC (permalink / raw)
To: notmuch
---
completion/notmuch-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index f24d9ecd337f..cc5839247c6c 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -86,7 +86,7 @@ _notmuch_search_terms()
sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
;;
*)
- local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date:"
+ local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
compopt -o nospace
COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
;;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] completion: complete lastmod: search prefix
2015-10-17 21:03 ` [PATCH] completion: complete lastmod: search prefix Jani Nikula
@ 2015-10-22 12:56 ` David Bremner
0 siblings, 0 replies; 6+ messages in thread
From: David Bremner @ 2015-10-22 12:56 UTC (permalink / raw)
To: Jani Nikula, notmuch
Jani Nikula <jani@nikula.org> writes:
> ---
> completion/notmuch-completion.bash | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
pushed all 5 completion patches.
d
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-22 12:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-26 11:12 [PATCH] completion: handle notmuch address --deduplicate= option Jani Nikula
2015-10-17 16:30 ` [PATCH 1/3] completion: complete notmuch count --lastmod Jani Nikula
2015-10-17 16:30 ` [PATCH 2/3] completion: complete shared options for each command Jani Nikula
2015-10-17 16:30 ` [PATCH 3/3] completion: clean up top level completion Jani Nikula
2015-10-17 21:03 ` [PATCH] completion: complete lastmod: search prefix Jani Nikula
2015-10-22 12:56 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).