[PATCH 5/8] bash: Classify more commends out of completion.

[PATCH 5/8] bash: Classify more commends out of completion.

[Shawn O. Pearce]

Most of these commands are not ones you want to invoke from the
command line on a frequent basis, or have been renamed in 1.5.0 to
more friendly versions, but the old names are being left behind to
support existing scripts in the wild.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 contrib/completion/git-completion.bash |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1cf576e..382c817 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -250,16 +250,24 @@ __git_commands ()
 	do
 		case $i in
 		add--interactive) : plumbing;;
+		applymbox)        : ask gittus;;
+		applypatch)       : ask gittus;;
+		archimport)       : import;;
 		cat-file)         : plumbing;;
 		check-ref-format) : plumbing;;
 		commit-tree)      : plumbing;;
 		convert-objects)  : plumbing;;
+		cvsexportcommit)  : export;;
+		cvsimport)        : import;;
 		cvsserver)        : daemon;;
 		daemon)           : daemon;;
+		fsck-objects)     : plumbing;;
 		fetch-pack)       : plumbing;;
+		fmt-merge-msg)    : plumbing;;
 		hash-object)      : plumbing;;
 		http-*)           : transport;;
 		index-pack)       : plumbing;;
+		init-db)          : deprecated;;
 		local-fetch)      : plumbing;;
 		mailinfo)         : plumbing;;
 		mailsplit)        : plumbing;;
@@ -272,9 +280,13 @@ __git_commands ()
 		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)      : plumbing;;
 		rerere)           : plumbing;;
 		rev-list)         : plumbing;;
 		rev-parse)        : plumbing;;
@@ -285,14 +297,19 @@ __git_commands ()
 		show-index)       : plumbing;;
 		ssh-*)            : transport;;
 		stripspace)       : plumbing;;
+		svn)              : import export;;
+		svnimport)        : import;;
 		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;;
+		verify-tag)       : plumbing;;
 		*) echo $i;;
 		esac
 	done
@@ -834,7 +851,6 @@ _git ()
 	pull)        _git_pull ;;
 	push)        _git_push ;;
 	rebase)      _git_rebase ;;
-	repo-config) _git_config ;;
 	reset)       _git_reset ;;
 	show)        _git_show ;;
 	show-branch) _git_log ;;
-- 
1.5.0.rc3.22.g5057

Re: [PATCH 5/8] bash: Classify more commends out of completion.

[Junio C Hamano]

At some point we might want to generate this part from the table
defined in Documentation/cmd-list.perl (the latter might need to
be extended for that, but I think matching "helper", "plumbing"
and perhaps "foreign" would cover most of them).

Re: [PATCH 5/8] bash: Classify more commends out of completion.

[Shawn O. Pearce]

Junio C Hamano <junkio@cox.net> wrote:
> At some point we might want to generate this part from the table
> defined in Documentation/cmd-list.perl (the latter might need to
> be extended for that, but I think matching "helper", "plumbing"
> and perhaps "foreign" would cover most of them).

Actually I'm thinking of going in the other direction.  The set of
commands which we expect people to use in an interactive setting
on the command line is smaller than the set of commands we actually
ship.

But yea, maybe we can build it from the existing sources...

-- 
Shawn.

Re: [PATCH 5/8] bash: Classify more commends out of completion.

[Jakub Narebski]

Shawn O. Pearce wrote:

[cut]

Sidenote: do you have git-config and git-init as commands to use?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Re: [PATCH 5/8] bash: Classify more commends out of completion.

[Shawn O. Pearce]

Jakub Narebski <jnareb@gmail.com> wrote:
> Shawn O. Pearce wrote:
> 
> [cut]
> 
> Sidenote: do you have git-config and git-init as commands to use?

Yes.  init and config are not in that table, which means they will
be offered as possible completions.  The table defaults to include
every command, I filter out stuff which people aren't expected to
be running (frequently) from an interactive shell.  Err on the side
of caution...

But not only is config in the table, we support completion on
lots of the arguments, e.g. `git config branch.ma<tab>.re<tab>`
(for branch.master.remote).

-- 
Shawn.