bash: update 'git svn' options

'git svn' got some new subcommands and otions in the last couple of
months.  This patch adds completion support for them.

In particular:

* 'fetch', 'clone', etc.: '--ignore-paths='
* 'init' and 'clone': '--prefix=', '--use-log-author',
'--add-author-from'
* 'dcommit': '--commit-url', '--revision'
* 'log': '--color'
* 'rebase': '--dry-run'
* 'branch', 'tag', 'blame', 'migrate' subcommands and their options

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0bb768f1c10494128fce8ecd496efed4cfb9c211..003017ac1b1313a864c513ed5927ba4321a90ae1 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1600,7 +1600,8 @@ _git_svn ()
        local subcommands="
                init fetch clone rebase dcommit log find-rev
                set-tree commit-diff info create-ignore propget
        local subcommands="
                init fetch clone rebase dcommit log find-rev
                set-tree commit-diff info create-ignore propget

-               proplist show-ignore show-externals
+               proplist show-ignore show-externals branch tag blame
+               migrate

                "
        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then
                "
        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then


@@ -1611,13 +1612,15 @@ _git_svn ()
                        --follow-parent --authors-file= --repack=
                        --no-metadata --use-svm-props --use-svnsync-props
                        --log-window-size= --no-checkout --quiet
                        --follow-parent --authors-file= --repack=
                        --no-metadata --use-svm-props --use-svnsync-props
                        --log-window-size= --no-checkout --quiet

-                       --repack-flags --use-log-author --localtime $remote_opts
+                       --repack-flags --use-log-author --localtime
+                       --ignore-paths= $remote_opts

                        "
                local init_opts="
                        --template= --shared= --trunk= --tags=
                        --branches= --stdlayout --minimize-url
                        --no-metadata --use-svm-props --use-svnsync-props
                        "
                local init_opts="
                        --template= --shared= --trunk= --tags=
                        --branches= --stdlayout --minimize-url
                        --no-metadata --use-svm-props --use-svnsync-props

-                       --rewrite-root= $remote_opts
+                       --rewrite-root= --prefix= --use-log-author
+                       --add-author-from $remote_opts

                        "
                local cmt_opts="
                        --edit --rmdir --find-copies-harder --copy-similarity=
                        "
                local cmt_opts="
                        --edit --rmdir --find-copies-harder --copy-similarity=


@@ -1637,7 +1640,8 @@ _git_svn ()
                dcommit,--*)
                        __gitcomp "
                                --merge --strategy= --verbose --dry-run
                dcommit,--*)
                        __gitcomp "
                                --merge --strategy= --verbose --dry-run

-                               --fetch-all --no-rebase $cmt_opts $fc_opts
+                               --fetch-all --no-rebase --commit-url
+                               --revision $cmt_opts $fc_opts

                                "
                        ;;
                set-tree,--*)
                                "
                        ;;
                set-tree,--*)


@@ -1651,13 +1655,13 @@ _git_svn ()
                        __gitcomp "
                                --limit= --revision= --verbose --incremental
                                --oneline --show-commit --non-recursive
                        __gitcomp "
                                --limit= --revision= --verbose --incremental
                                --oneline --show-commit --non-recursive

-                               --authors-file=
+                               --authors-file= --color

                                "
                        ;;
                rebase,--*)
                        __gitcomp "
                                --merge --verbose --strategy= --local
                                "
                        ;;
                rebase,--*)
                        __gitcomp "
                                --merge --verbose --strategy= --local

-                               --fetch-all $fc_opts
+                               --fetch-all --dry-run $fc_opts

                                "
                        ;;
                commit-diff,--*)
                                "
                        ;;
                commit-diff,--*)


@@ -1666,6 +1670,21 @@ _git_svn ()
                info,--*)
                        __gitcomp "--url"
                        ;;
                info,--*)
                        __gitcomp "--url"
                        ;;

+               branch,--*)
+                       __gitcomp "--dry-run --message --tag"
+                       ;;
+               tag,--*)
+                       __gitcomp "--dry-run --message"
+                       ;;
+               blame,--*)
+                       __gitcomp "--git-format"
+                       ;;
+               migrate,--*)
+                       __gitcomp "
+                               --config-dir= --ignore-paths= --minimize
+                               --no-auth-cache --username=
+                               "
+                       ;;

                *)
                        COMPREPLY=()
                        ;;
                *)
                        COMPREPLY=()
                        ;;