[PATCH 1/2] completion: complete notmuch insert --keep and --no-hooks options

[PATCH 1/2] completion: complete notmuch insert --keep and --no-hooks options

[Jani Nikula]

---
 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 db152f358bc3..386437333742 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -196,7 +196,7 @@ _notmuch_insert()
     ! $split &&
     case "${cur}" in
 	--*)
-	    local options="--create-folder --folder="
+	    local options="--create-folder --folder= --keep --no-hooks"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    return
-- 
2.1.1

[PATCH 2/2] completion: complete notmuch insert --folder to maildir folders only

[Jani Nikula]

The --folder option expects a folder relative from maildir root, so
complete like the folder: search term.
---
 completion/notmuch-completion.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 386437333742..a756b22339cb 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -188,7 +188,10 @@ _notmuch_insert()
     $split &&
     case "${prev}" in
 	--folder)
-	    _filedir
+	    local path=`notmuch config get database.path`
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
+		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
 	    return
 	    ;;
     esac
-- 
2.1.1

Re: [PATCH 2/2] completion: complete notmuch insert --folder to maildir folders only

[David Bremner]

Jani Nikula <jani@nikula.org> writes:
> +	    local path=`notmuch config get database.path`
> +	    compopt -o nospace
> +	    COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
> +		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$"

I'm a bit confused here. Why is 'folder:' being stripped? Too much
copy-pasta?

d

Re: [PATCH 2/2] completion: complete notmuch insert --folder to maildir folders only

[Tomi Ollila]

On Wed, Dec 31 2014, David Bremner <david@tethera.net> wrote:

> Jani Nikula <jani@nikula.org> writes:
>> +	    local path=`notmuch config get database.path`
>> +	    compopt -o nospace
>> +	    COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
>> +		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$"
>
> I'm a bit confused here. Why is 'folder:' being stripped? Too much
> copy-pasta?

compgen -d wants a directory ?

there seems to be similar strippings done in completion of
notmuch_search_terms.

>
> d

Tomi

PS: if it weren't inconsistent change, just on '#' would suffice ;)

Re: [PATCH 2/2] completion: complete notmuch insert --folder to maildir folders only

[Jani Nikula]

On Thu, 01 Jan 2015, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> On Wed, Dec 31 2014, David Bremner <david@tethera.net> wrote:
>
>> Jani Nikula <jani@nikula.org> writes:
>>> +	    local path=`notmuch config get database.path`
>>> +	    compopt -o nospace
>>> +	    COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
>>> +		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$"
>>
>> I'm a bit confused here. Why is 'folder:' being stripped? Too much
>> copy-pasta?
>
> compgen -d wants a directory ?
>
> there seems to be similar strippings done in completion of
> notmuch_search_terms.


True, but $cur won't have folder: here. Copy-paste fail.

Jani.


>
>>
>> d
>
> Tomi
>
> PS: if it weren't inconsistent change, just on '#' would suffice ;)

[PATCH v2] completion: complete notmuch insert --folder to maildir folders only

[Jani Nikula]

The --folder option expects a folder relative from maildir root, so
complete like the folder: search term.
---
 completion/notmuch-completion.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 386437333742..d58dc8bed60f 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -188,7 +188,10 @@ _notmuch_insert()
     $split &&
     case "${prev}" in
 	--folder)
-	    _filedir
+	    local path=`notmuch config get database.path`
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -d "$path/${cur}" | \
+		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
 	    return
 	    ;;
     esac
-- 
2.1.4

Re: [PATCH 1/2] completion: complete notmuch insert --keep and --no-hooks options

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> ---
>  completion/notmuch-completion.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied this, and v2 of the next patch.

I guess this means the zsh completion is falling behind?

d

Re: [PATCH 1/2] completion: complete notmuch insert --keep and --no-hooks options

[Jani Nikula]

On Fri, 02 Jan 2015, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>
>> ---
>>  completion/notmuch-completion.bash | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Applied this, and v2 of the next patch.
>
> I guess this means the zsh completion is falling behind?

Since a long time ago already, apart from a few updates from Michal
Sojka to match his cli changes. Can't really help with this.

The (minimal) tcsh completion does not work at all, and would be better
off removed.

BR,
Jani.

[PATCH] completion: remove the broken notmuch-completion.tcsh

[Jani Nikula]

The tcsh completion is minimal yet doesn't work at all. We're better
off without it, it's more embarrassing than useful.
---
 completion/README                  | 4 ----
 completion/notmuch-completion.tcsh | 2 --
 2 files changed, 6 deletions(-)
 delete mode 100644 completion/notmuch-completion.tcsh

diff --git a/completion/README b/completion/README
index 93f0f8bf942c..e200c189058c 100644
--- a/completion/README
+++ b/completion/README
@@ -11,10 +11,6 @@ notmuch-completion.bash
 
   [1] http://bash-completion.alioth.debian.org/
 
-notmuch-completion.tcsh
-
-  Command-line completion for the tcsh shell.
-
 notmuch-completion.zsh
 
   Command-line completion for the zsh shell.
diff --git a/completion/notmuch-completion.tcsh b/completion/notmuch-completion.tcsh
deleted file mode 100644
index c0d3a4463555..000000000000
--- a/completion/notmuch-completion.tcsh
+++ /dev/null
@@ -1,2 +0,0 @@
-set NOTMUCH_CMD=`notmuch help | awk '/\t/' | cut -f2 |grep -v '^$'`
-complete notmuch 'p/1/$NOTMUCH_CMD/'
-- 
2.1.4

Re: [PATCH] completion: remove the broken notmuch-completion.tcsh

[Tomi Ollila]

On Fri, Jan 02 2015, Jani Nikula <jani@nikula.org> wrote:

> The tcsh completion is minimal yet doesn't work at all. We're better
> off without it, it's more embarrassing than useful.
> ---

Agreed.

Tomi


>  completion/README                  | 4 ----
>  completion/notmuch-completion.tcsh | 2 --
>  2 files changed, 6 deletions(-)
>  delete mode 100644 completion/notmuch-completion.tcsh
>
> diff --git a/completion/README b/completion/README
> index 93f0f8bf942c..e200c189058c 100644
> --- a/completion/README
> +++ b/completion/README
> @@ -11,10 +11,6 @@ notmuch-completion.bash
>  
>    [1] http://bash-completion.alioth.debian.org/
>  
> -notmuch-completion.tcsh
> -
> -  Command-line completion for the tcsh shell.
> -
>  notmuch-completion.zsh
>  
>    Command-line completion for the zsh shell.
> diff --git a/completion/notmuch-completion.tcsh b/completion/notmuch-completion.tcsh
> deleted file mode 100644
> index c0d3a4463555..000000000000
> --- a/completion/notmuch-completion.tcsh
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -set NOTMUCH_CMD=`notmuch help | awk '/\t/' | cut -f2 |grep -v '^$'`
> -complete notmuch 'p/1/$NOTMUCH_CMD/'
> -- 
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] completion: remove the broken notmuch-completion.tcsh

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> The tcsh completion is minimal yet doesn't work at all. We're better
> off without it, it's more embarrassing than useful.

pushed

d