From: Ingmar Vanhassel <ingmar@exherbo.org>
To: Zsh Hackers' List <zsh-workers@sunsite.dk>
Cc: Ingmar Vanhassel <ingmar@exherbo.org>
Subject: [PATCH] Update "git svn" completion.
Date: Thu, 29 Jan 2009 12:21:50 +0000 [thread overview]
Message-ID: <1233231710-1204-9-git-send-email-ingmar@exherbo.org> (raw)
In-Reply-To: <1233231710-1204-8-git-send-email-ingmar@exherbo.org>
---
Completion/Unix/Command/_git | 44 +++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 1097611..f08c35d 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2466,8 +2466,6 @@ _git-send-email () {
'*:file:_files' && ret=0
}
-# TODO: -h, -H, and --help are undocumented.
-# TODO: -V and --version are undocumented.
# TODO: --minimize-connections is undocumented.
# TODO: --remote is undocumented.
# TODO: --log-window-size is undocumented.
@@ -2480,7 +2478,6 @@ _git-send-email () {
# TODO: migrate is undocumented.
# TODO: --minimize for migrate is undocumented.
# TODO: -r, --color, --pager, and --non-recursive for log are undocumented.
-# TODO: --local for rebase is undocumented.
# TODO: --message, -m, --file, -F, --revision, and -r for commit-diff are
# undocumented.
(( $+functions[_git-svn] )) ||
@@ -2504,11 +2501,19 @@ _git-svn () {
'clone:same as init, followed by fetch'
'rebase:fetch revs from SVN parent of HEAD and rebase current work on it'
'dcommit:commit diffs from given head onto SVN repository'
+ 'branch:create a branch in the SVN repository'
+ 'tag:create a tag in the SVN repository'
'log:output SVN log-messages'
+ 'blame:show what revision and author last modified each line of a file:'
'find-rev:output git commit corresponding to the given SVN revision'\''s hash'
'set-tree:commit given commit or tree to SVN repository'
- 'show-ignore:output corresponding .gitignore file of svn:ignore'
- 'commit-diff:commit diff of two tree-ishs')
+ 'create-ignore:recursively finds the svn:ignore property and creates .gitignore files'
+ 'show-ignore:output corresponding toplevel .gitignore file of svn:ignore'
+ 'commit-diff:commit diff of two tree-ishs'
+ 'info:show information about a file or directory'
+ 'proplist:list the SVN properties stored for a file or directory'
+ 'propget:get a given SVN property for a file'
+ 'show-externals:show the subversion externals')
_describe -t commands command commands && ret=0
;;
(options)
@@ -2546,10 +2551,13 @@ _git-svn () {
'(-T --trunk)'{-T-,--trunk=}'[set trunk sub-directory]:trunk sub-directory:->subdirectory'
'(-t --tags)'{-t-,--tags=}'[set tags sub-directory]:tags sub-directory:->subdirectory'
'(-b --branches)'{-b-,--branches=}'[set branches sub-directory]:branches sub-directory:->subdirectory'
+ '--stdlayout[shorthand for setting trunk,tags,branches as relative paths, the SVN default]'
'--no-metadata[set svn-remote.X.noMetadata]'
'--use-svm-props[set svn-remote.X.useSvmProps]'
'--use-svnsync-props[set svn-remote.X.useSvnsyncProps]'
'--rewrite-root=[set svn-remote.X.rewriteRoot]:new root'
+ '--use-log-author[use author from the first From: or Signed-Off-By: line, when fetching into git]'
+ '--add-author-from[when committing to svn, append a From: line based on the git commit'\''s author string]'
'--prefix=[prefix to use for names of remotes]:path prefix:_directories -r ""')
fi
@@ -2562,8 +2570,7 @@ _git-svn () {
'(-C --copy-similarity)'{-C-,--copy-similarity=}'[undocumented]:number')
fi
- # FIXME: What arguments does clone actually take here?
- if [[ $line[1] == (fetch|clone) ]]; then
+ if [[ $line[1] == (fetch|clone|log|create-ignore|info|propget|proplist|show-externals) ]]; then
arguments+=(
'(-r --revision)'{-r,--revision}'[only fetch given revision or revision range]:revision:->__git_svn_revisions'
'::svn remote:__git_svn-remotes')
@@ -2571,7 +2578,8 @@ _git-svn () {
if [[ $line[1] == (dcommit|rebase) ]]; then
arguments+=(
- '(-m --merge)'{-m,--merge}'[use merging strategies, if necessary]')
+ '(-m --merge)'{-m,--merge}'[use merging strategies, if necessary]'
+ '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies')
fi
if [[ $line[1] == (fetch|dcommit|rebase) ]]; then
@@ -2579,11 +2587,6 @@ _git-svn () {
'(--fetch-all --all)'{--fetch-all,--all}'[undocumented]')
fi
- if [[ $line[1] == (dcommit|rebase) ]]; then
- arguments+=(
- '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies')
- fi
-
if [[ $line[1] == (dcommit|log|rebase) ]]; then
arguments+=(
'(-v --verbose)'{-v,--verbose}'[output extra information]')
@@ -2603,7 +2606,14 @@ _git-svn () {
;;
(dcommit)
arguments+=(
- '(-n --dry-run)'{-n,--dry-run}'[output git-commands that would show diffs that would be committed]')
+ '(-n --dry-run)'{-n,--dry-run}'[output git-commands that would show diffs that would be committed]'
+ '--no-rebase[do not rebase or reset after committing]'
+ '--commit-url[commit to a different SVN url]:SVN URL:_url')
+ ;;
+ (branch)
+ arguments+=(
+ '(-m --message)'{-m,--message}'[specify the commit message]:message'
+ '(-t --tag)'{-t,--tag}'[create a tag]')
;;
(migrate)
arguments+=(
@@ -2623,9 +2633,13 @@ _git-svn () {
'--pager[undocumented]:pager:_files -g *(*)'
'--non-recursive[undocumented]')
;;
+ (blame)
+ arguments+=(
+ '--git-format[produce output in git-blame format, with SVN revision numbers instead of git commit hashes]')
+ ;;
(rebase)
arguments+=(
- '--local[undocumented]')
+ '--local[do not fetch remotely, rebase against the last fetched commit from SVN]')
;;
(commit-diff)
arguments+=(
--
1.6.0.1
next prev parent reply other threads:[~2009-01-29 12:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-29 12:21 [PATCH] Updates to git completion Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Add "git remote rename" completion Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Add "git describe --tags" completion. Fix typos Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Complete "git add --intent-to-add" Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] "git stage" is now a synonym for "git add". git diff: --staged is a synonym for --cached Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Complete "git clone --verbose" Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Complete "git commit --cleanup=" and "git commit --allow-empty" Ingmar Vanhassel
2009-01-29 12:21 ` [PATCH] Update "git rebase" completions Ingmar Vanhassel
2009-01-29 12:21 ` Ingmar Vanhassel [this message]
2009-01-29 14:33 ` [PATCH] "git stage" is now a synonym for "git add". git diff: --staged is a synonym for --cached Richard Hartmann
2009-01-29 14:36 ` [PATCH] Updates to git completion Richard Hartmann
2009-01-29 14:40 ` Mikael Magnusson
2009-01-29 15:07 ` Richard Hartmann
2009-01-29 15:18 ` Nikolai Weibull
2009-02-02 14:48 ` Allan Caffee
2009-02-03 10:44 ` Doug Kearns
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=1233231710-1204-9-git-send-email-ingmar@exherbo.org \
--to=ingmar@exherbo.org \
--cc=zsh-workers@sunsite.dk \
/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).