diff options
| -rw-r--r-- | Completion/Unix/Command/_bzr | 134 |
1 files changed, 92 insertions, 42 deletions
diff --git a/Completion/Unix/Command/_bzr b/Completion/Unix/Command/_bzr index 093adc857..62f1151e7 100644 --- a/Completion/Unix/Command/_bzr +++ b/Completion/Unix/Command/_bzr @@ -57,20 +57,27 @@ args=( '(-)'{--help,-h}'[show help message]' ) case $cmd in (add) args+=( + '--dry-run[show what would be added without adding anything]' '--no-recurse[do not recurse into subdirectories]' - '(-q --quiet)'{--quiet,-q}'[be quiet]' + '(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]' + '(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]' '*:unknown files:_bzr_unknownFiles' ) ;; -(annotate|praise|blame) - args+=( '*:files:_bzr_versionedFiles' ) +(annotate|blame|praise) + args+=( + '--all[show annotations on all lines]' + '--long[show date in annotations]' + '(-r --revision)'{--revision=,-r}'[the revision to show]:rev:' + '*:files:_bzr_versionedFiles' + ) ;; -(clone|branch|get) +(branch|get|clone) args+=( - '(-r --revision)'{--revision,-r}'[the revision to get]:rev:' - '--basis[specify basis branch]:basis:' + '(-r --revision)'{--revision=,-r}'[the revision to get]:rev:' + '--basis=[specify basis branch]:basis:' ) if (( CURRENT == 2 )); then args+=( '*:FROM_LOCATION:_files -/' ) @@ -82,7 +89,7 @@ case $cmd in (checkout) args+=( '--lightweight[perform a lightweight checkout]' - '(-r --revision)'{--revision,-r}'[the revision to get]:rev:' + '(-r --revision)'{--revision=,-r}'[the revision to get]:rev:' ) _bzr_completeParents ;; @@ -97,7 +104,7 @@ case $cmd in (cat) args+=( - '(-r --revision)'{--revision,-r}'[revision]:rev:' + '(-r --revision)'{--revision=,-r}'[revision]:rev:' '*:file:_bzr_versionedFiles' ) ;; @@ -108,14 +115,16 @@ case $cmd in (log) args+=( - '(-r --revision)'{--revision,-r}'[revision or range]:rev or rev range:' - '(-v --verbose)'{--verbose,-v}'[show revision manifest]' - '(-l --short --long)'{--long,-l}'[use long format (default)]' - '(-l --long)--short[use short format]' - '(-m --message)'{--message,-m}'[specify regexp]:regexp:' - '--show-ids[show file IDs]' '--forward[reverse direction of revisions]' - '--timezone[specify timezone for dates]:timezone:' + '(-l --long --short --log_format)--line[Use log format with one line per revision. Same as "--log-format line"]' + '(-l --long --short --line)--log-format=[Use the specified log format]:log format:(line short long)' + '(-l --long --short --line --log-format)'{--long,-l}'[Use detailed log format. Same as "--log-format long"]' + '(-l --long --log_format)--short[Use moderately short log format. Same as "--log-format short"]' + '(-m --message)'{--message=,-m}'[specify regexp]:regexp:' + '(-r --revision)'{--revision=,-r}'[revision or range]:rev or rev range:' + '--show-ids[show file IDs]' + '--timezone=[specify timezone for dates]:timezone:' + '(-v --verbose)'{--verbose,-v}'[show revision manifest]' '*:file:_bzr_versionedFiles' ) ;; @@ -130,6 +139,7 @@ case $cmd in (status|st|stat) args+=( '--all[include unchanged versioned files]' + '(-r --revision)'{--revision=,-r}'[compare working tree with revision]:revision:' '--show-ids[show file IDs]' '*:file:_bzr_versionedFiles' ) @@ -146,9 +156,17 @@ case $cmd in args+=( '*:DIR:_files -/' ) ;; -(upgrade) +(init|upgrade) args+=( - '--format=[new format for repository]:format:(default knit metaweave weave)' + '--format=[format for repository]:format:(default knit metaweave weave)' + '*:DIR:_files -/' + ) + ;; + +(init-repo|init-repository) + args+=( + '--format=[format for repository]:format:(default knit metaweave weave)' + '--trees[allows branches in repository to have a working tree]' '*:DIR:_files -/' ) ;; @@ -162,8 +180,10 @@ case $cmd in (pull) args+=( - '--remember[Remember the specified location as a default]' '--overwrite[Ignore differences, overwrite unconditionally]' + '--remember[Remember the specified location as a default]' + '(-r --revision)'{--revision=,-r}'[get a particular revision]:revision:' + '(-v --verbose)'{--verbose,-v}'[display more information]' '*:local repository:_files -/' ) _bzr_completeParents @@ -171,16 +191,15 @@ case $cmd in (missing) args+=( - '(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]' - '(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]' '(-l --long --short --log_format)--line[Use log format with one line per revision. Same as "--log-format line"]' - '(-l --long --short --line)--log-format[Use the specified log format]:log format' + '(-l --long --short --line)--log-format=[Use the specified log format]:log format:(line short long)' '(-l --long --short --line --log-format)'{--long,-l}'[Use detailed log format. Same as "--log-format long"]' + '(-l --long --log_format)--short[Use moderately short log format. Same as "--log-format short"]' '--mine-only[Display changes in the local branch only]' '--reverse[Reverse the order of revisions]' - '(-l --long --log_format)--short[Use moderately short log format. Same as "--log-format short"]' '--show-ids[show internal object ids]' '--theirs-only[Display changes in the remote branch only]' + '(-v --verbose)'{--verbose,-v}'[display more information]' '*:local repository:_files -/' ) _bzr_completeParents @@ -188,10 +207,13 @@ case $cmd in (commit|checkin|ci) args+=( - '(-m --message)'{--message,-m}'[commit message]:message text:' - '(-F --file)'{--file,-F}'[commit message from file]:message file:' + '(-F --file)'{--file=,-F}'[commit message from file]:message file:' + '--local[perform a local only commit in a bound branch]' + '(-m --message)'{--message=,-m}'[commit message]:message text:' + '--strict[refuse to commit if there are unknown files]' '--unchanged[include unchanged files]' - '(-v --verbose)'{--verbose,-v}'[display more information]' + '(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]' + '(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]' '*:modified files:_bzr_versionedFiles' ) ;; @@ -200,10 +222,29 @@ case $cmd in _bzr_completeParents ;; -(conflicts|added|deleted|modified|unknowns|directories|ignored|unbind|nick) +(register-branch) + args+=( + '--author=[email of the branch author, if not you]:email:' + '--branch-description=[longer description of the branch]:description:' + '--branch-name=[short name for the branch]:name:' + '--branch-title=[one-sentence description of the branch]:title:' + '--dry-run[prepare the request but do not actually send it]' + '--link-bug=[the bug this branch fixes]:bug-ID:' + '--product=[launchpad product short name to associate with the branch]:product:' + ) + _bzr_completeParents + ;; + +(remerge) + args+=( + '--merge-type=[the type of the merge]:type:' + '--reprocess[Reprocess to reduce spurious conflicts]' + '--show-base[Show base revision text in conflicts]' + ) + _bzr_completeParents ;; -(revno|init|init-repo|init-repository|version) +(conflicts|added|deleted|modified|unknowns|directories|ignored|unbind|nick|revno|version) ;; (whoami) @@ -212,24 +253,26 @@ case $cmd in (inventory) args+=( - '(-r --revision)'{--revision,-r}'[show inventory of a revision]:revision:' + '--kind=[limit output by type]:kind:(file directory symlink)' + '(-r --revision)'{--revision=,-r}'[show inventory of a revision]:revision:' '--show-ids[show file IDs]' ) ;; (diff|dif|di) args+=( - '(-r --revision)'{--revision,-r}'[revision]:revision:' - '--diff-options[options to pass to gdiff]:diff options:' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' + '--diff-options=[options to pass to gdiff]:diff options:' + '(-p --prefix)'{--prefix,-p}'[set prefix added to old and new filenames]' '*:files:_files' ) ;; (export) args+=( - '(-r --revision)'{--revision,-r}'[revision]:revision:' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' '--format=[format of exported file]:format:(dir tar tgz tbz2)' - '--root[root directory of patch]:_files -/' + '--root=[root directory of patch]:_files -/' '*:destination:_files' ) ;; @@ -239,32 +282,36 @@ case $cmd in ;; (info) - args+=( '*:branch:_files -/' ) + args+=( + '(-v --verbose)'{--verbose,-v}'[display more information]' + '*:branch:_files -/' + ) ;; (testament) args+=( - '(-r --revision)'{--revision,-r}'[revision]:revision:' '(-l --long)'{--long,-l}'[use long format]' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' '*:branch:_files -/' ) ;; (revert|merge-revert) args+=( - '(-r --revision)'{--revision,-r}'[revision]:revision:' '--no-backup[skip generation of backup~ files]' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' '*:file:_bzr_versionedFiles' ) ;; (merge) args+=( - '(-r --revision)'{--revision,-r}'[revision]:revision:' - '--reprocess[Reprocess to reduce spurious conflicts]' - '--show-base[Show base revision text in conflicts]' '--force[ignore uncommitted changes]' '--merge-type:merge type:(diff3 merge3 weave)' + '--remember[Remember the specified location as a default]' + '--reprocess[Reprocess to reduce spurious conflicts]' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' + '--show-base[Show base revision text in conflicts]' '*:local repository:_files -/' ) _bzr_completeParents @@ -272,8 +319,9 @@ case $cmd in (ls) args+=( - '(-v --verbose)'{--verbose,-v}'[display more information]' - '(-r --revision)'{--revision,-r}'[revision]:revision:' + '(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]' + '(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]' + '(-r --revision)'{--revision=,-r}'[revision]:revision:' '--from-root[Print all paths from the root of the branch]' '--non-recursive[Do not recurse into subdirectories]' '--null[Null separate the files]' @@ -296,7 +344,7 @@ case $cmd in # Plugins (visualize|visualise|viz|vis) - args+=( '(-r --revision)'{--revision,-r}'[starting revision]:rev:' ) + args+=( '(-r --revision)'{--revision=,-r}'[starting revision]:rev:' ) ;; (gannotate|gblame|gpraise) @@ -309,7 +357,9 @@ case $cmd in (push) args+=( + '--create-prefix[Create the path leading up to the branch when missing]' '--overwrite[Ignore differences, overwrite unconditionally]' + '--remember[Remember the specified location as a default]' '*:local repository:_files -/' ) _bzr_completeParents @@ -327,7 +377,7 @@ case $cmd in args+=( '--dry-run[do not make any changes]' '--force[say "yes" to all questions]' - '(-r --revision)'{--revision,-r}'[the earliest revision to delete]:rev:' + '(-r --revision)'{--revision=,-r}'[the earliest revision to delete]:rev:' '(-v --verbose)'{--verbose,-v}'[display more information]' ) ;; |