1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-22 04:11:58 +00:00

feat(git-extras): update completion (2023-06-19 3a258cb)

Closes #11712
This commit is contained in:
kang 2023-06-20 08:49:56 +02:00 committed by Carlo Sala
parent c0e811c90d
commit 8ace453f37
No known key found for this signature in database
GPG key ID: DA6FB450C1A4FE9A

View file

@ -80,22 +80,10 @@ __gitex_specific_branch_names() {
_wanted branch-names expl branch-name compadd - $branch_names _wanted branch-names expl branch-name compadd - $branch_names
} }
__gitex_chore_branch_names() {
__gitex_specific_branch_names 'chore'
}
__gitex_feature_branch_names() { __gitex_feature_branch_names() {
__gitex_specific_branch_names 'feature' __gitex_specific_branch_names 'feature'
} }
__gitex_refactor_branch_names() {
__gitex_specific_branch_names 'refactor'
}
__gitex_bug_branch_names() {
__gitex_specific_branch_names 'bug'
}
__gitex_submodule_names() { __gitex_submodule_names() {
local expl local expl
declare -a submodule_names declare -a submodule_names
@ -114,88 +102,29 @@ __gitex_author_names() {
} }
# subcommands # subcommands
# new subcommand should be added in alphabetical order
_git-authors() { _git-authors() {
_arguments -C \ _arguments -C \
'(--list -l)'{--list,-l}'[show authors]' \ '(--list -l)'{--list,-l}'[show authors]' \
'--no-email[without email]' \ '--no-email[without email]' \
} }
_git-bug() {
local curcontext=$curcontext state line ret=1
declare -A opt_args
_arguments -C \
': :->command' \
'*:: :->option-or-argument' && ret=0
case $state in
(command)
declare -a commands
commands=(
'finish:merge bug into the current branch'
)
_describe -t commands command commands && ret=0
;;
(option-or-argument)
curcontext=${curcontext%:*}-$line[1]:
case $line[1] in
(finish)
_arguments -C \
':branch-name:__gitex_bug_branch_names'
;;
-r|--remote )
_arguments -C \
':remote-name:__gitex_remote_names'
;;
esac
return 0
esac
_arguments \
'(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
}
_git-changelog() { _git-changelog() {
_arguments \ _arguments \
'(-l --list)'{-l,--list}'[list commits]' \ '(-l --list)'{-l,--list}'[list commits]' \
} }
_git-chore() { _git-clear() {
local curcontext=$curcontext state line ret=1
declare -A opt_args
_arguments -C \
': :->command' \
'*:: :->option-or-argument' && ret=0
case $state in
(command)
declare -a commands
commands=(
'finish:merge and delete the chore branch'
)
_describe -t commands command commands && ret=0
;;
(option-or-argument)
curcontext=${curcontext%:*}-$line[1]:
case $line[1] in
(finish)
_arguments -C \
':branch-name:__gitex_chore_branch_names'
;;
-r|--remote )
_arguments -C \
':remote-name:__gitex_remote_names'
;;
esac
return 0
esac
_arguments \ _arguments \
'(--remote -r)'{--remote,-r}'[setup remote tracking branch]' '(-f --force)'{-f,--force}'[force clear]' \
'(-h --help)'{-h,--help}'[help message]' \
} }
_git-coauthor() {
_arguments \
':co-author[co-author to add]' \
':co-author-email[email address of co-author to add]'
}
_git-contrib() { _git-contrib() {
_arguments \ _arguments \
@ -235,6 +164,11 @@ _git-delete-branch() {
':branch-name:__gitex_branch_names' ':branch-name:__gitex_branch_names'
} }
_git-delete-squashed-branches() {
_arguments \
':branch-name:__gitex_branch_names'
}
_git-delete-submodule() { _git-delete-submodule() {
_arguments \ _arguments \
@ -298,6 +232,7 @@ _git-feature() {
case $line[1] in case $line[1] in
(finish) (finish)
_arguments -C \ _arguments -C \
'--squash[Use squash merge]' \
':branch-name:__gitex_feature_branch_names' ':branch-name:__gitex_feature_branch_names'
;; ;;
-r|--remote ) -r|--remote )
@ -334,13 +269,10 @@ _git-ignore() {
} }
_git-ignore() { _git-info() {
_arguments -C \ _arguments -C \
'(--append -a)'{--append,-a}'[append .gitignore]' \ '(--color -c)'{--color,-c}'[use color for information titles]' \
'(--replace -r)'{--replace,-r}'[replace .gitignore]' \ '--no-config[do not show list all variables set in config file, along with their values]'
'(--list-in-table -l)'{--list-in-table,-l}'[print available types in table format]' \
'(--list-alphabetically -L)'{--list-alphabetically,-L}'[print available types in alphabetical order]' \
'(--search -s)'{--search,-s}'[search word in available types]'
} }
@ -357,44 +289,21 @@ _git-missing() {
':second-branch-name:__gitex_branch_names' ':second-branch-name:__gitex_branch_names'
} }
_git-release() {
_git-refactor() {
local curcontext=$curcontext state line ret=1
declare -A opt_args
_arguments -C \ _arguments -C \
': :->command' \ '-c[Generates/populates the changelog with all commit message since the last tag.]' \
'*:: :->option-or-argument' && ret=0 '-r[The "remote" repository that is destination of a push operation.]' \
'-m[use the custom commit information instead of the default message.]' \
case $state in '-s[Create a signed and annotated tag.]' \
(command) '-u[Create a tag, annotated and signed with the given key.]' \
declare -a commands '--semver[If the latest tag in your repo matches the semver format requirement, you could increase part of it as the new release tag.]' \
commands=( '--prefix[Add a prefix string to semver to allow more complex tags.]' \
'finish:merge refactor into the current branch' '--no-empty-commit[Avoid creating empty commit if nothing could be committed.]' \
) '--[The arguments listed after "--" separator will be passed to pre/post-release hook.]'
_describe -t commands command commands && ret=0
;;
(option-or-argument)
curcontext=${curcontext%:*}-$line[1]:
case $line[1] in
(finish)
_arguments -C \
':branch-name:__gitex_refactor_branch_names'
;;
-r|--remote )
_arguments -C \
':remote-name:__gitex_remote_names'
;;
esac
return 0
esac
_arguments \
'(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
} }
_git-squash() { _git-squash() {
_arguments '--squash-msg[commit with the squashed commit messages]'
_arguments \ _arguments \
':branch-name:__gitex_branch_names' ':branch-name:__gitex_branch_names'
} }
@ -413,15 +322,17 @@ _git-standup() {
'-g[Display GPG signed info]' \ '-g[Display GPG signed info]' \
'-h[Display help message]' \ '-h[Display help message]' \
'-L[Enable the inclusion of symbolic links]' \ '-L[Enable the inclusion of symbolic links]' \
'-m[The depth of recursive directory search]' '-m[The depth of recursive directory search]' \
'-B[Display the commits in branch groups]'
} }
_git-summary() { _git-summary() {
_arguments '--line[summarize with lines rather than commits]' _arguments '--line[summarize with lines rather than commits]'
_arguments '--dedup-by-email[remove duplicate users by the email address]'
_arguments '--no-merges[exclude merge commits]'
__gitex_commits __gitex_commits
} }
_git-undo(){ _git-undo(){
_arguments -C \ _arguments -C \
'(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \ '(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \
@ -432,21 +343,26 @@ zstyle -g existing_user_commands ':completion:*:*:git:*' user-commands
zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
alias:'define, search and show aliases' \ alias:'define, search and show aliases' \
abort:'abort current revert, merge, rebase, or cherry-pick process' \
archive-file:'export the current head of the git repository to an archive' \ archive-file:'export the current head of the git repository to an archive' \
authors:'generate authors report' \ authors:'generate authors report' \
back:'undo and stage latest commits' \ browse:'open repo website in browser' \
browse-ci:'open repo CI page in browser' \
bug:'create bug branch' \ bug:'create bug branch' \
bulk:'run bulk commands' \ bulk:'run bulk commands' \
brv:'list branches sorted by their last commit date'\
changelog:'generate a changelog report' \ changelog:'generate a changelog report' \
chore:'create chore branch' \ chore:'create chore branch' \
clear-soft:'soft clean up a repository' \ clear-soft:'soft clean up a repository' \
clear:'rigorously clean up a repository' \ clear:'rigorously clean up a repository' \
coauthor:'add a co-author to the last commit' \
commits-since:'show commit logs since some date' \ commits-since:'show commit logs since some date' \
contrib:'show user contributions' \ contrib:'show user contributions' \
count:'show commit count' \ count:'show commit count' \
create-branch:'create branches' \ create-branch:'create branches' \
delete-branch:'delete branches' \ delete-branch:'delete branches' \
delete-merged-branches:'delete merged branches' \ delete-merged-branches:'delete merged branches' \
delete-squashed-branches:'delete squashed branches' \
delete-submodule:'delete submodules' \ delete-submodule:'delete submodules' \
delete-tag:'delete tags' \ delete-tag:'delete tags' \
delta:'lists changed files' \ delta:'lists changed files' \
@ -465,11 +381,13 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
local-commits:'list local commits' \ local-commits:'list local commits' \
lock:'lock a file excluded from version control' \ lock:'lock a file excluded from version control' \
locked:'ls files that have been locked' \ locked:'ls files that have been locked' \
magic:'commits everything with a generated message' \
merge-into:'merge one branch into another' \ merge-into:'merge one branch into another' \
merge-repo:'merge two repo histories' \ merge-repo:'merge two repo histories' \
missing:'show commits missing from another branch' \ missing:'show commits missing from another branch' \
mr:'checks out a merge request locally' \ mr:'checks out a merge request locally' \
obliterate:'rewrite past commits to remove some files' \ obliterate:'rewrite past commits to remove some files' \
paste:'send patches to pastebin sites' \
pr:'checks out a pull request locally' \ pr:'checks out a pull request locally' \
psykorebase:'rebase a branch with a merge commit' \ psykorebase:'rebase a branch with a merge commit' \
pull-request:'create pull request to GitHub project' \ pull-request:'create pull request to GitHub project' \
@ -479,6 +397,7 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
release:'commit, tag and push changes to the repository' \ release:'commit, tag and push changes to the repository' \
rename-branch:'rename a branch' \ rename-branch:'rename a branch' \
rename-tag:'rename a tag' \ rename-tag:'rename a tag' \
rename-remote:'rename a remote' \
repl:'git read-eval-print-loop' \ repl:'git read-eval-print-loop' \
reset-file:'reset one file' \ reset-file:'reset one file' \
root:'show path of root' \ root:'show path of root' \
@ -495,4 +414,5 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
sync:'sync local branch with remote branch' \ sync:'sync local branch with remote branch' \
touch:'touch and add file to the index' \ touch:'touch and add file to the index' \
undo:'remove latest commits' \ undo:'remove latest commits' \
unlock:'unlock a file excluded from version control' unlock:'unlock a file excluded from version control' \
utimes:'change files modification time to their last commit date'