This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4612

zsh_completion: add -b/--branch and -B/--bookmark(s) flags properly
ClosedPublic

Authored by av6 on Sep 17 2018, 2:08 AM.

Details

Reviewers
spectral
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3f11cb1aeb90: zsh_completion: add -b/--branch and -B/--bookmark(s) flags properly
Summary

_hg_branch_bmark_opts used to add these two flags, but had the same
descriptions for the flags regardless of what command took them and didn't
allow specifying flags more than once (no '*' at the start). Even more
importantly, it assumed that -B was always expecting an argument (i.e.
--bookmark=foo), but in case of incoming and outgoing it's not so (--bookmarks
is self-sufficient).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

av6 created this revision.Sep 17 2018, 2:08 AM
spectral accepted this revision.Sep 17 2018, 5:46 PM
pulkit accepted this revision.Sep 18 2018, 11:52 AM
Closed by commit rHG3f11cb1aeb90: zsh_completion: add -b/--branch and -B/--bookmark(s) flags properly (authored by av6). · Explain WhySep 18 2018, 11:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/zsh_completion (23 lines)

Diff 11142

contrib/zsh_completion

'(-e --edit -m --message --logfile -l)'{-l+,--logfile=}'[read the commit message from <file>]:log file:_files') '(-e --edit -m --message --logfile -l)'{-l+,--logfile=}'[read the commit message from <file>]:log file:_files')
_hg_remote_opts=( _hg_remote_opts=(
'(--ssh -e)'{-e+,--ssh=}'[specify ssh command to use]:command' '(--ssh -e)'{-e+,--ssh=}'[specify ssh command to use]:command'
'--remotecmd=[specify hg command to run on the remote side]:remote command' '--remotecmd=[specify hg command to run on the remote side]:remote command'
'--insecure[do not verify server certificate (ignoring web.cacerts config)]' '--insecure[do not verify server certificate (ignoring web.cacerts config)]'
) )
_hg_branch_bmark_opts=(
'(--bookmark -B)'{-B+,--bookmark=}'[specify bookmark(s)]:bookmark:_hg_bookmarks'
'(--branch -b)'{-b+,--branch=}'[specify branch(es)]:branch:_hg_branches'
)
_hg_subrepos_opts=( _hg_subrepos_opts=(
'(--subrepos -S)'{-S,--subrepos}'[recurse into subrepositories]') '(--subrepos -S)'{-S,--subrepos}'[recurse into subrepositories]')
_hg_cmd() { _hg_cmd() {
_call_program hg HGPLAIN=1 hg "$_hg_cmd_globals[@]" "$@" 2> /dev/null _call_program hg HGPLAIN=1 hg "$_hg_cmd_globals[@]" "$@" 2> /dev/null
} }
_hg_cmd_add() { _hg_cmd_add() {
'--import-branch[use any branch information in patch (implied by --exact)]' \ '--import-branch[use any branch information in patch (implied by --exact)]' \
'(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \ '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \
'(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:similarity' \ '(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:similarity' \
'*:patch:_files' '*:patch:_files'
} }
_hg_cmd_incoming() { _hg_cmd_incoming() {
_arguments -s -S : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ _arguments -s -S : $_hg_log_opts $_hg_remote_opts $_hg_subrepos_opts \
$_hg_subrepos_opts \
'(--force -f)'{-f,--force}'[run even if remote repository is unrelated]' \ '(--force -f)'{-f,--force}'[run even if remote repository is unrelated]' \
'*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \ '*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \ '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
'--bundle=[file to store the bundles into]:bundle file:_files' \ '--bundle=[file to store the bundles into]:bundle file:_files' \
'(--bookmarks -B)'{-B,--bookmarks}'[compare bookmarks]' \
'*'{-b+,--branch=}'[a specific branch you would like to pull]:branch:_hg_branches' \
':source:_hg_remote' ':source:_hg_remote'
} }
_hg_cmd_init() { _hg_cmd_init() {
_arguments -s -S : $_hg_global_opts $_hg_remote_opts \ _arguments -s -S : $_hg_global_opts $_hg_remote_opts \
':directory:_files -/' ':directory:_files -/'
} }
_arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \ _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \
'(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \ '(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \
'(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \ '(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \
'(- :)--abort[abort the ongoing merge]' \ '(- :)--abort[abort the ongoing merge]' \
':revision:_hg_mergerevs' ':revision:_hg_mergerevs'
} }
_hg_cmd_outgoing() { _hg_cmd_outgoing() {
_arguments -s -S : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ _arguments -s -S : $_hg_log_opts $_hg_remote_opts $_hg_subrepos_opts \
$_hg_subrepos_opts \
'(--force -f)'{-f,--force}'[run even when the destination is unrelated]' \ '(--force -f)'{-f,--force}'[run even when the destination is unrelated]' \
'*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_revrange' \
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \ '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
'(--bookmarks -B)'{-B,--bookmarks}'[compare bookmarks]' \
'*'{-b+,--branch=}'[a specific branch you would like to push]:branch:_hg_branches' \
':destination:_hg_remote' ':destination:_hg_remote'
} }
_hg_cmd_parents() { _hg_cmd_parents() {
_arguments -s -S : $_hg_global_opts $_hg_template_opts \ _arguments -s -S : $_hg_global_opts $_hg_template_opts \
'(--rev -r)'{-r+,--rev=}'[show parents of the specified revision]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[show parents of the specified revision]:revision:_hg_labels' \
':last modified file:_hg_files' ':last modified file:_hg_files'
} }
'(--public -p --draft -d --secret -s)'{-d,--draft}'[set changeset phase to draft]' \ '(--public -p --draft -d --secret -s)'{-d,--draft}'[set changeset phase to draft]' \
'(--public -p --draft -d --secret -s)'{-s,--secret}'[set changeset phase to secret]' \ '(--public -p --draft -d --secret -s)'{-s,--secret}'[set changeset phase to secret]' \
'(--force -f)'{-f,--force}'[allow to move boundary backward]' \ '(--force -f)'{-f,--force}'[allow to move boundary backward]' \
'*'{-r+,--rev=}'[target revision]:revision:_hg_labels' \ '*'{-r+,--rev=}'[target revision]:revision:_hg_labels' \
'*:revision:_hg_labels' '*:revision:_hg_labels'
} }
_hg_cmd_pull() { _hg_cmd_pull() {
_arguments -s -S : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ _arguments -s -S : $_hg_global_opts $_hg_remote_opts \
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
'(--update -u)'{-u,--update}'[update to new branch head if new descendants were pulled]' \ '(--update -u)'{-u,--update}'[update to new branch head if new descendants were pulled]' \
'*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \ '*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \
'*'{-B+,--bookmark=}'[bookmark to pull]:bookmark:_hg_bookmarks' \
'*'{-b+,--branch=}'[a specific branch you would like to pull]:branch:_hg_branches' \
':source:_hg_remote' ':source:_hg_remote'
} }
_hg_cmd_push() { _hg_cmd_push() {
_arguments -s -S : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ _arguments -s -S : $_hg_global_opts $_hg_remote_opts \
'(--force -f)'{-f,--force}'[force push]' \ '(--force -f)'{-f,--force}'[force push]' \
'*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_labels' \ '*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_labels' \
'*'{-B+,--bookmark=}'[bookmark to push]:bookmark:_hg_bookmarks' \
'*'{-b+,--branch=}'[a specific branch you would like to push]:branch:_hg_branches' \
'--new-branch[allow pushing a new branch]' \ '--new-branch[allow pushing a new branch]' \
':destination:_hg_remote' ':destination:_hg_remote'
} }
_hg_cmd_remove() { _hg_cmd_remove() {
_arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts $_hg_subrepos_opts \ _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts $_hg_subrepos_opts \
'(--after -A)'{-A,--after}'[record delete for missing files]' \ '(--after -A)'{-A,--after}'[record delete for missing files]' \
'(--force -f)'{-f,--force}'[forget added files, delete modified files]' \ '(--force -f)'{-f,--force}'[forget added files, delete modified files]' \