From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 3/3] completion: improve shell expansion of items
Date: Thu, 27 Sep 2012 02:37:51 +0200 [thread overview]
Message-ID: <20120927003751.GI10144@goldbirke> (raw)
In-Reply-To: <20120926215119.GC18653@sigill.intra.peff.net>
Hi,
On Wed, Sep 26, 2012 at 05:51:19PM -0400, Jeff King wrote:
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index be800e0..b0416ea 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -225,6 +225,18 @@ fi
> fi
> fi
>
> +# Quotes each element of an IFS-delimited list for shell reuse
> +__git_quote()
> +{
> + local i
> + local delim
> + for i in $1; do
> + local quoted=${i//\'/\'\\\'\'}
> + printf "${delim:+$IFS}'%s'" "$quoted"
> + delim=t
> + done
> +}
> +
> # Generates completion reply with compgen, appending a space to possible
> # completion words, if necessary.
> # It accepts 1 to 4 arguments:
> @@ -261,7 +273,7 @@ __gitcomp_nl ()
> __gitcomp_nl ()
> {
> local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> + COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
Iterating through all possible completion words undermines the main
reason for __gitcomp_nl()'s existence: to handle potentially large
number of possible completion words faster than the old __gitcomp().
If we really have to iterate in a subshell, then it would perhaps be
better to drop __gitcomp_nl(), go back to using __gitcomp(), and
modify that instead.
After all, anyone could drop a file called git-cmd-${meta} on his
$PATH, and then get cmd- offered, because completion of git commands
still goes through __gitcomp().
next prev parent reply other threads:[~2012-09-27 0:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 2:15 [PATCH] completion: fix shell expansion of items Felipe Contreras
2012-09-20 1:46 ` Jeff King
2012-09-20 16:52 ` Junio C Hamano
2012-09-20 18:11 ` SZEDER Gábor
2012-09-20 18:21 ` Jeff King
2012-09-20 19:38 ` Felipe Contreras
2012-09-25 4:31 ` [PATCH] Revert "completion: fix shell expansion of items" Jeff King
2012-09-25 16:03 ` Junio C Hamano
2012-09-25 22:37 ` SZEDER Gábor
2012-09-25 23:28 ` Junio C Hamano
2012-09-26 21:46 ` Jeff King
2012-09-26 21:47 ` [PATCH 1/3] t9902: add a few basic completion tests Jeff King
2012-09-26 21:51 ` [PATCH 2/3] t9902: add completion tests for "odd" filenames Jeff King
2012-09-26 21:51 ` [PATCH 3/3] completion: improve shell expansion of items Jeff King
2012-09-26 21:57 ` [PATCH 4/3] completion: quote completions we find Jeff King
2012-09-27 21:40 ` SZEDER Gábor
2012-09-27 22:31 ` Junio C Hamano
2012-09-27 22:58 ` SZEDER Gábor
2012-09-27 0:37 ` SZEDER Gábor [this message]
2012-09-27 6:28 ` [PATCH 3/3] completion: improve shell expansion of items Jeff King
2012-09-27 6:43 ` Jeff King
2012-09-27 19:48 ` Jeff King
2012-09-28 10:05 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 1/5] completion: fix non-critical bugs in __gitcomp() tests SZEDER Gábor
2012-09-28 10:09 ` [PATCH 2/5] completion: fix args of run_completion() test helper SZEDER Gábor
2012-09-28 18:04 ` Junio C Hamano
2012-09-28 18:38 ` SZEDER Gábor
2012-09-28 19:23 ` Junio C Hamano
2012-09-28 19:30 ` Jeff King
2012-09-28 19:49 ` Junio C Hamano
2012-09-28 19:55 ` Jeff King
2012-09-28 20:28 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 3/5] completion: add tests for the __gitcomp_nl() completion helper function SZEDER Gábor
2012-09-28 10:09 ` [PATCH 4/5] completion: test __gitcomp() and __gitcomp_nl() with expandable words SZEDER Gábor
2012-09-28 10:09 ` [POC PATCH 5/5] completion: avoid compgen to fix expansion issues in __gitcomp_nl() SZEDER Gábor
2012-09-28 15:08 ` SZEDER Gábor
2012-09-28 15:46 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120927003751.GI10144@goldbirke \
--to=szeder@ira.uka.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).