--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 19C2B431FBD\r
+ for <notmuch@notmuchmail.org>; Thu, 7 Nov 2013 05:30:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id mxKTJLGo4FJi for <notmuch@notmuchmail.org>;\r
+ Thu, 7 Nov 2013 05:30:15 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 44171431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 7 Nov 2013 05:30:15 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id C095D100051;\r
+ Thu, 7 Nov 2013 15:30:10 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] completion: update bash completion\r
+In-Reply-To: <1383765937-20921-1-git-send-email-jani@nikula.org>\r
+References: <1383765937-20921-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 07 Nov 2013 15:30:10 +0200\r
+Message-ID: <m24n7o9w65.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 07 Nov 2013 13:30:23 -0000\r
+\r
+On Wed, Nov 06 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Update bash completion to cover new commands and options:\r
+>\r
+> notmuch compact --quiet --backup=DIR\r
+> notmuch count --output=files --batch --input=FILE\r
+> notmuch insert --folder=DIR --create-folder\r
+> notmuch search --exclude=all --duplicate=N\r
+> notmuch show --include-html\r
+> notmuch tag --batch --input=FILE --remove-all\r
+\r
+These changes looks sensible and consistent to me. +1\r
+\r
+Tomi\r
+\r
+\r
+>\r
+> ---\r
+>\r
+> This logically depends on id:cover.1383481295.git.jani@nikula.org\r
+> which adds --quiet and --backup=DIR parameters to compact.\r
+> ---\r
+> completion/notmuch-completion.bash | 89 +++++++++++++++++++++++++++++++++++---\r
+> 1 file changed, 82 insertions(+), 7 deletions(-)\r
+>\r
+> diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+> index 7bd7745..04324bb 100644\r
+> --- a/completion/notmuch-completion.bash\r
+> +++ b/completion/notmuch-completion.bash\r
+> @@ -59,6 +59,29 @@ _notmuch_search_terms()\r
+> __ltrim_colon_completions "${cur}"\r
+> }\r
+> \r
+> +_notmuch_compact()\r
+> +{\r
+> + local cur prev words cword split\r
+> + _init_completion -s || return\r
+> +\r
+> + $split &&\r
+> + case "${prev}" in\r
+> + --backup)\r
+> + _filedir\r
+> + return\r
+> + ;;\r
+> + esac\r
+> +\r
+> + ! $split &&\r
+> + case "${cur}" in\r
+> + -*)\r
+> + local options="--backup= --quiet"\r
+> + compopt -o nospace\r
+> + COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> + ;;\r
+> + esac\r
+> +}\r
+> +\r
+> _notmuch_config()\r
+> {\r
+> local cur prev words cword split\r
+> @@ -89,19 +112,23 @@ _notmuch_count()\r
+> $split &&\r
+> case "${prev}" in\r
+> --output)\r
+> - COMPREPLY=( $( compgen -W "messages threads" -- "${cur}" ) )\r
+> + COMPREPLY=( $( compgen -W "messages threads files" -- "${cur}" ) )\r
+> return\r
+> ;;\r
+> --exclude)\r
+> COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )\r
+> return\r
+> ;;\r
+> + --input)\r
+> + _filedir\r
+> + return\r
+> + ;;\r
+> esac\r
+> \r
+> ! $split &&\r
+> case "${cur}" in\r
+> -*)\r
+> - local options="--output= --exclude="\r
+> + local options="--output= --exclude= --batch --input="\r
+> compopt -o nospace\r
+> COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> ;;\r
+> @@ -141,6 +168,39 @@ _notmuch_dump()\r
+> esac\r
+> }\r
+> \r
+> +_notmuch_insert()\r
+> +{\r
+> + local cur prev words cword split\r
+> + # handle tags with colons and equal signs\r
+> + _init_completion -s -n := || return\r
+> +\r
+> + $split &&\r
+> + case "${prev}" in\r
+> + --folder)\r
+> + _filedir\r
+> + return\r
+> + ;;\r
+> + esac\r
+> +\r
+> + ! $split &&\r
+> + case "${cur}" in\r
+> + --*)\r
+> + local options="--create-folder --folder="\r
+> + compopt -o nospace\r
+> + COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> + return\r
+> + ;;\r
+> + +*)\r
+> + COMPREPLY=( $(compgen -P "+" -W "`notmuch search --output=tags \*`" -- ${cur##+}) )\r
+> + ;;\r
+> + -*)\r
+> + COMPREPLY=( $(compgen -P "-" -W "`notmuch search --output=tags \*`" -- ${cur##-}) )\r
+> + ;;\r
+> + esac\r
+> + # handle tags with colons\r
+> + __ltrim_colon_completions "${cur}"\r
+> +}\r
+> +\r
+> _notmuch_new()\r
+> {\r
+> local cur prev words cword split\r
+> @@ -231,7 +291,7 @@ _notmuch_search()\r
+> return\r
+> ;;\r
+> --exclude)\r
+> - COMPREPLY=( $( compgen -W "true false flag" -- "${cur}" ) )\r
+> + COMPREPLY=( $( compgen -W "true false flag all" -- "${cur}" ) )\r
+> return\r
+> ;;\r
+> esac\r
+> @@ -239,7 +299,7 @@ _notmuch_search()\r
+> ! $split &&\r
+> case "${cur}" in\r
+> -*)\r
+> - local options="--format= --output= --sort= --offset= --limit= --exclude="\r
+> + local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="\r
+> compopt -o nospace\r
+> COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> ;;\r
+> @@ -273,7 +333,7 @@ _notmuch_show()\r
+> ! $split &&\r
+> case "${cur}" in\r
+> -*)\r
+> - local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt"\r
+> + local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html"\r
+> compopt -o nospace\r
+> COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> ;;\r
+> @@ -287,9 +347,24 @@ _notmuch_tag()\r
+> {\r
+> local cur prev words cword split\r
+> # handle tags with colons and equal signs\r
+> - _init_completion -n := || return\r
+> + _init_completion -s -n := || return\r
+> +\r
+> + $split &&\r
+> + case "${prev}" in\r
+> + --input)\r
+> + _filedir\r
+> + return\r
+> + ;;\r
+> + esac\r
+> \r
+> + ! $split &&\r
+> case "${cur}" in\r
+> + --*)\r
+> + local options="--batch --input= --remove-all"\r
+> + compopt -o nospace\r
+> + COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+> + return\r
+> + ;;\r
+> +*)\r
+> COMPREPLY=( $(compgen -P "+" -W "`notmuch search --output=tags \*`" -- ${cur##+}) )\r
+> ;;\r
+> @@ -307,7 +382,7 @@ _notmuch_tag()\r
+> \r
+> _notmuch()\r
+> {\r
+> - local _notmuch_commands="config count dump help new reply restore search setup show tag"\r
+> + local _notmuch_commands="compact config count dump help insert new reply restore search setup show tag"\r
+> local arg cur prev words cword split\r
+> _init_completion || return\r
+> \r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff