Re: [PATCH/RFC 2/2] completion: allow use without compiling
- From
Stephen Boyd <bebarino@gmail.com>
- Date
- Oct 28, 2009, 01:43 UTC
- Message-ID
- <4AE7A1B9.5010001@gmail.com>
- In-Reply-To
- <20091027185223.GH10505@spearce.org>
Shawn O. Pearce wrote:
> NAK on code duplication, especially this much. As Junio already > pointed out in this thread we need an approach that doesn't cause > this sort of redundant code.
Ok. Following Junio's suggestion I think we would have to do the following:
(1) Revert the rename (git-completion.bash.in -> git-completion.bash)
(2) Add a "generation" mode to git-completion.bash.generate to generate the lists and output them to a file
(3) Add logic in git-completion.bash.generate to source the generated file if it exists
(4) Source git-completion.bash.generate in git-completion.bash to get the functions moved there
In the end we would have git-completion.bash sourcing git-completion.bash.generate which then sources the generated file. I assume this is slower than compiling to just one file.
Or we could just not load the caches until they're needed. This just delays the performance hit to completion time, but at least it speeds up loading the script without the need to compile and still has the benefit of some caching. It also allows users to keep the completion of their custom merge strategies and git programs in their PATH.
----8<----
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d3fec32..8a7cde3 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -326,10 +326,15 @@ __git_remotes () __git_merge_strategies () { - if [ -n "${__git_merge_strategylist-}" ]; then + if [ -n "${__git_merge_strategylist-}" ] || { + __git_merge_strategylist=$(__git_merge_strategies_gen 2>/dev/null) + }; then echo "$__git_merge_strategylist" - return fi +} + +__git_merge_strategies_gen () +{ git merge -s help 2>&1 | sed -n -e '/[Aa]vailable strategies are: /,/^$/{ s/\.$// @@ -340,7 +345,6 @@ __git_merge_strategies () }' } __git_merge_strategylist= -__git_merge_strategylist=$(__git_merge_strategies 2>/dev/null) __git_complete_file () { @@ -491,10 +495,15 @@ __git_complete_strategy () __git_all_commands () { - if [ -n "${__git_all_commandlist-}" ]; then + if [ -n "${__git_all_commandlist-}" ] || { + __git_all_commandlist="$(__git_all_commands_gen 2>/dev/null)" + }; then echo "$__git_all_commandlist" - return fi +} + +__git_all_commands_gen () +{ local i IFS=" "$'\n' for i in $(git help -a|egrep '^ [a-zA-Z0-9]') do @@ -505,14 +514,18 @@ __git_all_commands () done } __git_all_commandlist= -__git_all_commandlist="$(__git_all_commands 2>/dev/null)" __git_porcelain_commands () { - if [ -n "${__git_porcelain_commandlist-}" ]; then + if [ -n "${__git_porcelain_commandlist-}" ] || { + __git_porcelain_commandlist="$(__git_porcelain_commands_gen 2>/dev/null)" + }; then echo "$__git_porcelain_commandlist" - return fi +} + +__git_porcelain_commands_gen () +{ local i IFS=" "$'\n' for i in "help" $(__git_all_commands) do @@ -596,7 +609,6 @@ __git_porcelain_commands () done } __git_porcelain_commandlist= -__git_porcelain_commandlist="$(__git_porcelain_commands 2>/dev/null)" __git_aliases () {