git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/5] completion: add missing configuration variables to _git_config()
@ 2009-05-04  6:25 Stephen Boyd
  2009-05-04  6:25 ` [PATCH 2/5] completion: add {gui,diff,merge}tool, man, and pager config variables Stephen Boyd
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2009-05-04  6:25 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |   48 ++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1a90cb8..28682a7 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1393,6 +1393,7 @@ _git_config ()
 		;;
 	esac
 	__gitcomp "
+		alias.
 		apply.whitespace
 		branch.autosetupmerge
 		branch.autosetuprebase
@@ -1410,6 +1411,9 @@ _git_config ()
 		color.diff.old
 		color.diff.plain
 		color.diff.whitespace
+		color.grep
+		color.grep.external
+		color.grep.match
 		color.interactive
 		color.interactive.header
 		color.interactive.help
@@ -1427,6 +1431,7 @@ _git_config ()
 		core.autocrlf
 		core.bare
 		core.compression
+		core.createObject
 		core.deltaBaseCacheLimit
 		core.editor
 		core.excludesfile
@@ -1457,11 +1462,20 @@ _git_config ()
 		diff.renameLimit
 		diff.renameLimit.
 		diff.renames
+		diff.suppressBlankEmpty
+		diff.tool
+		diff.wordRegex
+		difftool.prompt
 		fetch.unpackLimit
+		format.attach
+		format.cc
 		format.headers
 		format.numbered
 		format.pretty
+		format.signoff
+		format.subjectprefix
 		format.suffix
+		format.thread
 		gc.aggressiveWindow
 		gc.auto
 		gc.autopacklimit
@@ -1472,6 +1486,7 @@ _git_config ()
 		gc.rerereresolved
 		gc.rerereunresolved
 		gitcvs.allbinary
+		gitcvs.commitmsgannotation
 		gitcvs.dbTableNamePrefix
 		gitcvs.dbdriver
 		gitcvs.dbname
@@ -1506,13 +1521,23 @@ _git_config ()
 		http.sslVerify
 		i18n.commitEncoding
 		i18n.logOutputEncoding
+		imap.folder
+		imap.host
+		imap.pass
+		imap.port
+		imap.preformattedHTML
+		imap.sslverify
+		imap.tunnel
+		imap.user
 		instaweb.browser
 		instaweb.httpd
 		instaweb.local
 		instaweb.modulepath
 		instaweb.port
+		interactive.singlekey
 		log.date
 		log.showroot
+		mailmap.file
 		man.viewer
 		merge.conflictstyle
 		merge.log
@@ -1521,6 +1546,7 @@ _git_config ()
 		merge.tool
 		merge.verbosity
 		mergetool.keepBackup
+		mergetool.prompt
 		pack.compression
 		pack.deltaCacheLimit
 		pack.deltaCacheSize
@@ -1532,6 +1558,8 @@ _git_config ()
 		pack.windowMemory
 		pull.octopus
 		pull.twohead
+		push.default
+		rebase.stat
 		receive.denyCurrentBranch
 		receive.denyDeletes
 		receive.denyNonFastForwards
@@ -1540,6 +1568,26 @@ _git_config ()
 		repack.usedeltabaseoffset
 		rerere.autoupdate
 		rerere.enabled
+		sendemail.aliasesfile
+		sendemail.aliasesfiletype
+		sendemail.bcc
+		sendemail.cc
+		sendemail.cccmd
+		sendemail.chainreplyto
+		sendemail.confirm
+		sendemail.envelopesender
+		sendemail.multiedit
+		sendemail.signedoffbycc
+		sendemail.smtpencryption
+		sendemail.smtppass
+		sendemail.smtpserver
+		sendemail.smtpserverport
+		sendemail.smtpuser
+		sendemail.suppresscc
+		sendemail.suppressfrom
+		sendemail.thread
+		sendemail.to
+		sendemail.validate
 		showbranch.default
 		status.relativePaths
 		status.showUntrackedFiles
-- 
1.6.2.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/5] completion: add {gui,diff,merge}tool, man, and pager config variables
  2009-05-04  6:25 [PATCH 1/5] completion: add missing configuration variables to _git_config() Stephen Boyd
@ 2009-05-04  6:25 ` Stephen Boyd
  2009-05-04  6:25   ` [PATCH 3/5] completion: complete values for help.format Stephen Boyd
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2009-05-04  6:25 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |   45 ++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 28682a7..ec02b06 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1376,6 +1376,39 @@ _git_config ()
 		__gitcomp "$(__git_heads)" "$pfx" "$cur" "."
 		return
 		;;
+	guitool.*.*)
+		local pfx="${cur%.*}."
+		cur="${cur##*.}"
+		__gitcomp "
+			argprompt cmd confirm needsfile noconsole norescan
+			prompt revprompt revunmerged title
+			" "$pfx" "$cur"
+		return
+		;;
+	difftool.*.*)
+		local pfx="${cur%.*}."
+		cur="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur"
+		return
+		;;
+	man.*.*)
+		local pfx="${cur%.*}."
+		cur="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur"
+		return
+		;;
+	mergetool.*.*)
+		local pfx="${cur%.*}."
+		cur="${cur##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur"
+		return
+		;;
+	pager.*)
+		local pfx="${cur%.*}."
+		cur="${cur#*.}"
+		__gitcomp "$(__git_all_commands)" "$pfx" "$cur"
+		return
+		;;
 	remote.*.*)
 		local pfx="${cur%.*}."
 		cur="${cur##*.}"
@@ -1391,6 +1424,12 @@ _git_config ()
 		__gitcomp "$(__git_remotes)" "$pfx" "$cur" "."
 		return
 		;;
+	url.*.*)
+		local pfx="${cur%.*}."
+		cur="${cur##*.}"
+		__gitcomp "insteadof" "$pfx" "$cur"
+		return
+		;;
 	esac
 	__gitcomp "
 		alias.
@@ -1465,6 +1504,7 @@ _git_config ()
 		diff.suppressBlankEmpty
 		diff.tool
 		diff.wordRegex
+		difftool.
 		difftool.prompt
 		fetch.unpackLimit
 		format.attach
@@ -1495,6 +1535,7 @@ _git_config ()
 		gitcvs.enabled
 		gitcvs.logfile
 		gitcvs.usecrlfattr
+		guitool.
 		gui.blamehistoryctx
 		gui.commitmsgwidth
 		gui.copyblamethreshold
@@ -1538,6 +1579,7 @@ _git_config ()
 		log.date
 		log.showroot
 		mailmap.file
+		man.
 		man.viewer
 		merge.conflictstyle
 		merge.log
@@ -1545,6 +1587,7 @@ _git_config ()
 		merge.stat
 		merge.tool
 		merge.verbosity
+		mergetool.
 		mergetool.keepBackup
 		mergetool.prompt
 		pack.compression
@@ -1556,6 +1599,7 @@ _git_config ()
 		pack.threads
 		pack.window
 		pack.windowMemory
+		pager.
 		pull.octopus
 		pull.twohead
 		push.default
@@ -1593,6 +1637,7 @@ _git_config ()
 		status.showUntrackedFiles
 		tar.umask
 		transfer.unpackLimit
+		url.
 		user.email
 		user.name
 		user.signingkey
-- 
1.6.2.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/5] completion: complete values for help.format
  2009-05-04  6:25 ` [PATCH 2/5] completion: add {gui,diff,merge}tool, man, and pager config variables Stephen Boyd
@ 2009-05-04  6:25   ` Stephen Boyd
  2009-05-04  6:25     ` [PATCH 4/5] completion: complete values for log.date Stephen Boyd
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2009-05-04  6:25 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ec02b06..023b0c9 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1348,6 +1348,10 @@ _git_config ()
 			"
 		return
 		;;
+	help.format)
+		__gitcomp "man info web html"
+		return
+		;;
 	*.*)
 		COMPREPLY=()
 		return
-- 
1.6.2.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 4/5] completion: complete values for log.date
  2009-05-04  6:25   ` [PATCH 3/5] completion: complete values for help.format Stephen Boyd
@ 2009-05-04  6:25     ` Stephen Boyd
  2009-05-04  6:25       ` [PATCH 5/5] completion: complete values for send-email Stephen Boyd
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2009-05-04  6:25 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git

Add raw to the date formats too.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 023b0c9..d67ffd9 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1116,6 +1116,7 @@ __git_log_shortlog_options="
 "
 
 __git_log_pretty_formats="oneline short medium full fuller email raw format:"
+__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
 
 _git_log ()
 {
@@ -1139,9 +1140,7 @@ _git_log ()
 		return
 		;;
 	--date=*)
-		__gitcomp "
-			relative iso8601 rfc2822 short local default
-		" "" "${cur##--date=}"
+		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
 		return
 		;;
 	--*)
@@ -1352,6 +1351,10 @@ _git_config ()
 		__gitcomp "man info web html"
 		return
 		;;
+	log.date)
+		__gitcomp "$__git_log_date_formats"
+		return
+		;;
 	*.*)
 		COMPREPLY=()
 		return
-- 
1.6.2.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 5/5] completion: complete values for send-email
  2009-05-04  6:25     ` [PATCH 4/5] completion: complete values for log.date Stephen Boyd
@ 2009-05-04  6:25       ` Stephen Boyd
  2009-05-04 14:29         ` Shawn O. Pearce
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2009-05-04  6:25 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: git

Add completion for --confirm, --suppress-cc, and --smtp-encryption
command line arguments. Add completion for aliasfiletype and confirm
configuration variables.

Since --smtp-ssl is deprecated, replace it with --smtp-encryption and
the two options ssl and tls.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |   39 +++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d67ffd9..1683e6d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1282,18 +1282,39 @@ _git_rebase ()
 	__gitcomp "$(__git_refs)"
 }
 
+__git_send_email_confirm_options="always never auto cc compose"
+__git_send_email_suppresscc_options="author self cc ccbody sob cccmd body all"
+
 _git_send_email ()
 {
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	case "$cur" in
+	--confirm=*)
+		__gitcomp "
+			$__git_send_email_confirm_options
+			" "" "${cur##--confirm=}"
+		return
+		;;
+	--suppress-cc=*)
+		__gitcomp "
+			$__git_send_email_suppresscc_options
+			" "" "${cur##--suppress-cc=}"
+
+		return
+		;;
+	--smtp-encryption=*)
+		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
+		return
+		;;
 	--*)
 		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
-			--compose --dry-run --envelope-sender --from --identity
+			--compose --confirm= --dry-run --envelope-sender
+			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
 			--no-suppress-from --no-thread --quiet
 			--signed-off-by-cc --smtp-pass --smtp-server
-			--smtp-server-port --smtp-ssl --smtp-user --subject
-			--suppress-cc --suppress-from --thread --to
+			--smtp-server-port --smtp-encryption= --smtp-user
+			--subject --suppress-cc= --suppress-from --thread --to
 			--validate --no-validate"
 		return
 		;;
@@ -1355,6 +1376,18 @@ _git_config ()
 		__gitcomp "$__git_log_date_formats"
 		return
 		;;
+	sendemail.aliasesfiletype)
+		__gitcomp "mutt mailrc pine elm gnus"
+		return
+		;;
+	sendemail.confirm)
+		__gitcomp "$__git_send_email_confirm_options"
+		return
+		;;
+	sendemail.suppresscc)
+		__gitcomp "$__git_send_email_suppresscc_options"
+		return
+		;;
 	*.*)
 		COMPREPLY=()
 		return
-- 
1.6.2.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 5/5] completion: complete values for send-email
  2009-05-04  6:25       ` [PATCH 5/5] completion: complete values for send-email Stephen Boyd
@ 2009-05-04 14:29         ` Shawn O. Pearce
  0 siblings, 0 replies; 6+ messages in thread
From: Shawn O. Pearce @ 2009-05-04 14:29 UTC (permalink / raw)
  To: Stephen Boyd; +Cc: git, Junio C Hamano

Stephen Boyd <bebarino@gmail.com> wrote:
> Add completion for --confirm, --suppress-cc, and --smtp-encryption
> command line arguments. Add completion for aliasfiletype and confirm
> configuration variables.
> 
> Since --smtp-ssl is deprecated, replace it with --smtp-encryption and
> the two options ssl and tls.
> 
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>

For all 5 patches in this series: nicely written, thanks.

Acked-by: Shawn O. Pearce <spearce@spearce.or>

-- 
Shawn.

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-05-04 14:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-04  6:25 [PATCH 1/5] completion: add missing configuration variables to _git_config() Stephen Boyd
2009-05-04  6:25 ` [PATCH 2/5] completion: add {gui,diff,merge}tool, man, and pager config variables Stephen Boyd
2009-05-04  6:25   ` [PATCH 3/5] completion: complete values for help.format Stephen Boyd
2009-05-04  6:25     ` [PATCH 4/5] completion: complete values for log.date Stephen Boyd
2009-05-04  6:25       ` [PATCH 5/5] completion: complete values for send-email Stephen Boyd
2009-05-04 14:29         ` Shawn O. Pearce

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).