From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] _git: Respect tags for subcommand completion.
Date: Mon, 22 Dec 2014 20:45:46 +0000 [thread overview]
Message-ID: <20141222204546.GC15399@tarsus.local2> (raw)
[-- Attachment #1: Type: text/plain, Size: 70 bytes --]
Attached a patch to improve the 'git <TAB>' user experience.
Daniel
[-- Attachment #2: 0001-_git-Respect-tags-for-subcommand-completion.patch --]
[-- Type: text/x-patch, Size: 4677 bytes --]
>From 6c5bc94d11ddf516188fb96f2cf16b15991f8f5f Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Tue, 16 Dec 2014 23:43:28 +0000
Subject: [PATCH] _git: Respect tags for subcommand completion.
It is now possible to use the tag-order style to stagger the overwhelming
'git <TAB>' subcommand listing. For example:
zstyle ':completion::complete:git:argument-1:' tag-order \
main-porcelain-commands user-commands third-party-commands \
ancillary-manipulator-commands ancillary-interrogator-commands \
plumbing-manipulator-commands plumbing-interrogator-commands \
aliases
---
Completion/Unix/Command/_git | 68 +++++++++++++++++++++++++++++++++++---------
1 file changed, 54 insertions(+), 14 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 8fcfc15..bdb58e5 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5206,20 +5206,60 @@ _git_commands () {
integer ret=1
- # TODO: Is this the correct way of doing it? Should we be using _alternative
- # and separate functions for each set of commands instead?
- _describe -t aliases alias unique_aliases && ret=0
- _describe -t main-porcelain-commands 'main porcelain command' main_porcelain_commands && ret=0
- _describe -t user-commands 'user command' user_commands && ret=0
- _describe -t third-party-commands 'third-party command' third_party_commands && ret=0
- _describe -t ancillary-manipulator-commands 'ancillary manipulator command' ancillary_manipulator_commands && ret=0
- _describe -t ancillary-interrogator-commands 'ancillary interrogator command' ancillary_interrogator_commands && ret=0
- _describe -t interaction-commands 'interaction command' interaction_commands && ret=0
- _describe -t plumbing-manipulator-commands 'plumbing manipulator command' plumbing_manipulator_commands && ret=0
- _describe -t plumbing-interrogator-commands 'plumbing interrogator command' plumbing_interrogator_commands && ret=0
- _describe -t plumbing-sync-commands 'plumbing sync command' plumbing_sync_commands && ret=0
- _describe -t plumbing-sync-helper-commands 'plumbing sync helper command' plumbing_sync_helper_commands && ret=0
- _describe -t plumbing-internal-helper-commands 'plumbing internal helper command' plumbing_internal_helper_commands && ret=0
+ _tags \
+ aliases \
+ main-porcelain-commands \
+ user-commands \
+ third-party-commands \
+ ancillary-manipulator-commands \
+ ancillary-interrogator-commands \
+ interaction-commands \
+ plumbing-manipulator-commands \
+ plumbing-interrogator-commands \
+ plumbing-sync-commands \
+ plumbing-sync-helper-commands \
+ plumbing-internal-helper-commands
+
+ while _tags; do
+
+ _requested aliases && \
+ _describe -t aliases 'alias' unique_aliases && ret=0
+
+ _requested main-porcelain-commands && \
+ _describe -t main-porcelain-commands 'main porcelain command' main_porcelain_commands && ret=0
+
+ _requested user-commands && \
+ _describe -t user-commands 'user command' user_commands && ret=0
+
+ _requested third-party-commands && \
+ _describe -t third-party-commands 'third-party command' third_party_commands && ret=0
+
+ _requested ancillary-manipulator-commands && \
+ _describe -t ancillary-manipulator-commands 'ancillary manipulator command' ancillary_manipulator_commands && ret=0
+
+ _requested ancillary-interrogator-commands && \
+ _describe -t ancillary-interrogator-commands 'ancillary interrogator command' ancillary_interrogator_commands && ret=0
+
+ _requested interaction-commands && \
+ _describe -t interaction-commands 'interaction command' interaction_commands && ret=0
+
+ _requested plumbing-manipulator-commands && \
+ _describe -t plumbing-manipulator-commands 'plumbing manipulator command' plumbing_manipulator_commands && ret=0
+
+ _requested plumbing-interrogator-commands && \
+ _describe -t plumbing-interrogator-commands 'plumbing interrogator command' plumbing_interrogator_commands && ret=0
+
+ _requested plumbing-sync-commands && \
+ _describe -t plumbing-sync-commands 'plumbing sync command' plumbing_sync_commands && ret=0
+
+ _requested plumbing-sync-helper-commands && \
+ _describe -t plumbing-sync-helper-commands 'plumbing sync helper command' plumbing_sync_helper_commands && ret=0
+
+ _requested plumbing-internal-helper-commands && \
+ _describe -t plumbing-internal-helper-commands 'plumbing internal helper command' plumbing_internal_helper_commands && ret=0
+
+ (( ret )) || break
+ done
return ret
}
--
1.9.1
next reply other threads:[~2014-12-22 20:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-22 20:45 Daniel Shahaf [this message]
2014-12-22 22:04 ` Mikael Magnusson
2014-12-23 0:27 ` Oliver Kiddle
2014-12-23 1:33 ` Mikael Magnusson
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=20141222204546.GC15399@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).