[PATCH/RFC 2/2] completion: allow use without compiling
- From
Stephen Boyd <bebarino@gmail.com>
- Date
- Oct 26, 2009, 20:31 UTC
- Message-ID
- <1256589116-6998-3-git-send-email-bebarino@gmail.com>
- In-Reply-To
- <1256589116-6998-1-git-send-email-bebarino@gmail.com>
Some users don't want to compile their completion, even when the build generated completion is 10x faster to load. For example, in my bashrc I source the completion script directly so I can stay up to date with the latest completion by merely pulling changes.
Do this by generating the lists dynamically when the merge strategy and command lists still have their initial values (__GIT_MERGE_STRATEGYLIST, __GIT_ALL_COMMANDLIST).
Signed-off-by: Stephen Boyd <bebarino@gmail.com> ---
This duplicates code, but I don't know of a way to re-use the dynamic code without sourcing a bash script and possibly breaking someone's build.
contrib/completion/git-completion.bash.in | 132 +++++++++++++++++++++++++++-- 1 files changed, 123 insertions(+), 9 deletions(-)
diff --git a/contrib/completion/git-completion.bash.in b/contrib/completion/git-completion.bash.in index d873b98..37d204c 100644 --- a/contrib/completion/git-completion.bash.in +++ b/contrib/completion/git-completion.bash.in @@ -60,15 +60,6 @@ __git_merge_strategylist=__GIT_MERGE_STRATEGYLIST __git_all_commandlist=__GIT_ALL_COMMANDLIST __git_porcelain_commandlist=__GIT_PORCELAIN_COMMANDLIST -# remind folks that git-completion.bash.in can't be sourced -case "$__git_merge_strategylist" in -__GIT*) - echo "E: git-completion.bash.in can't be sourced" - return 1 ;; -esac - - - case "$COMP_WORDBREAKS" in *:*) : great ;; *) COMP_WORDBREAKS="$COMP_WORDBREAKS:" @@ -333,6 +324,22 @@ __git_remotes () done } +__git_merge_strategies () +{ + if ["$__git_merge_strategylist" != "__GIT_MERGE_STRATEGYLIST"]; then + echo "$__git_merge_strategylist" + return + fi + git merge -s help 2>&1 | + sed -n -e '/[Aa]vailable strategies are: /,/^$/{ + s/\.$// + s/.*:// + s/^[ ]*// + s/[ ]*$// + p + }' +} +__git_merge_strategylist="$(__git_merge_strategies 2>/dev/null)" __git_complete_file () { @@ -481,6 +488,113 @@ __git_complete_strategy () return 1 } +__git_all_commands () +{ + if ["$__git_all_commandlist" != "__GIT_ALL_COMMANDLIST"]; then + echo "$__git_all_commandlist" + return + fi + local i + for i in $(git help -a|egrep '^ [a-zA-Z0-9]') + do + case $i in + *--*) : helper pattern;; + *) echo $i;; + esac + done +} +__git_all_commandlist="$(__git_all_commands 2>/dev/null)" + +__git_porcelain_commands () +{ + if ["$__git_porcelain_commandlist" != "__GIT_PORCELAIN_COMMANDLIST"]; then + echo "$__git_porcelain_commandlist" + return + fi + local i + for i in "help" $(__git_all_commands) + do + case $i in + *--*) : helper pattern;; + applymbox) : ask gittus;; + applypatch) : ask gittus;; + archimport) : import;; + cat-file) : plumbing;; + check-attr) : plumbing;; + check-ref-format) : plumbing;; + checkout-index) : plumbing;; + commit-tree) : plumbing;; + count-objects) : infrequent;; + cvsexportcommit) : export;; + cvsimport) : import;; + cvsserver) : daemon;; + daemon) : daemon;; + diff-files) : plumbing;; + diff-index) : plumbing;; + diff-tree) : plumbing;; + fast-import) : import;; + fast-export) : export;; + fsck-objects) : plumbing;; + fetch-pack) : plumbing;; + fmt-merge-msg) : plumbing;; + for-each-ref) : plumbing;; + hash-object) : plumbing;; + http-*) : transport;; + index-pack) : plumbing;; + init-db) : deprecated;; + local-fetch) : plumbing;; + lost-found) : infrequent;; + ls-files) : plumbing;; + ls-remote) : plumbing;; + ls-tree) : plumbing;; + mailinfo) : plumbing;; + mailsplit) : plumbing;; + merge-*) : plumbing;; + mktree) : plumbing;; + mktag) : plumbing;; + pack-objects) : plumbing;; + pack-redundant) : plumbing;; + pack-refs) : plumbing;; + parse-remote) : plumbing;; + patch-id) : plumbing;; + peek-remote) : plumbing;; + prune) : plumbing;; + prune-packed) : plumbing;; + quiltimport) : import;; + read-tree) : plumbing;; + receive-pack) : plumbing;; + reflog) : plumbing;; + repo-config) : deprecated;; + rerere) : plumbing;; + rev-list) : plumbing;; + rev-parse) : plumbing;; + runstatus) : plumbing;; + sh-setup) : internal;; + shell) : daemon;; + show-ref) : plumbing;; + send-pack) : plumbing;; + show-index) : plumbing;; + ssh-*) : transport;; + stripspace) : plumbing;; + symbolic-ref) : plumbing;; + tar-tree) : deprecated;; + unpack-file) : plumbing;; + unpack-objects) : plumbing;; + update-index) : plumbing;; + update-ref) : plumbing;; + update-server-info) : daemon;; + upload-archive) : plumbing;; + upload-pack) : plumbing;; + write-tree) : plumbing;; + var) : infrequent;; + verify-pack) : infrequent;; + verify-tag) : plumbing;; + *) echo $i;; + esac + done +} +__git_porcelain_commandlist="$(__git_porcelain_commands 2>/dev/null)" + __git_aliases () { local i IFS=$'\n'
-- 1.6.5.2.181.gd6f41