This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4362

zsh_completion: complete merge tools for -t/--tool
ClosedPublic

Authored by av6 on Aug 23 2018, 3:45 AM.
Tags
Subscribers
spectral, mercurial-devel

Details

Reviewers
spectral
Group Reviewers
hg-reviewers
Commits
rHGb4e7e1f09c09: zsh_completion: complete merge tools for -t/--tool
Summary

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.Aug 23 2018, 3:45 AM
spectral accepted this revision.Aug 29 2018, 2:33 PM
spectral added a subscriber: spectral.
spectral added inline comments.
contrib/zsh_completion
292

I'm slightly concerned this might give a false impression of what's available, listing things that I don't have installed, but I think this might be the best we can do at the moment - there doesn't appear to be a way to convince filemerge.py's _picktool to dump a list of them.

292

Do we need to uniquify this, or is zsh smart enough to do so?

av6 added inline comments.Aug 30 2018, 1:01 AM
contrib/zsh_completion
292

zsh will uniquify this, yes.

This seems to be the best way to do it so far, but maybe there needs to be a debugmergetool command or something. This is, by the way, a port of fish-shell's way to get the list of merge tools.

Closed by commit rHGb4e7e1f09c09: zsh_completion: complete merge tools for -t/--tool (authored by av6). · Explain WhyAug 30 2018, 5:25 PM
This revision was automatically updated to reflect the committed changes.
av6 added projects: Restricted Project, hg-reviewers.Nov 2 2018, 3:12 PM

Changing project tags, please ignore.

Revision Contents
Changeset List

PathPackages
Mcontrib/zsh_completion (14 lines)

Diff 10680

contrib/zsh_completion

} }
_hg_config() { _hg_config() {
typeset -a items typeset -a items
items=(${${(%f)"$(_call_program hg hg showconfig)"}%%\=*}) items=(${${(%f)"$(_call_program hg hg showconfig)"}%%\=*})
(( $#items )) && _describe -t config 'config item' items (( $#items )) && _describe -t config 'config item' items
} }
_hg_internal_merge_tools=(
\\:dump \\:fail \\:forcedump \\:local \\:merge \\:merge-local \\:merge-other
\\:merge3 \\:other \\:prompt \\:tagmerge \\:union
)
_hg_merge_tools() {
typeset -a external_tools
_describe -t internal_tools 'internal merge tools' _hg_internal_merge_tools
external_tools=(${(f)"$(_hg_cmd showconfig merge-tools | cut -d . -f 2)"})
spectralUnsubmitted
Not Done

I'm slightly concerned this might give a false impression of what's available, listing things that I don't have installed, but I think this might be the best we can do at the moment - there doesn't appear to be a way to convince filemerge.py's _picktool to dump a list of them.

spectral: I'm slightly concerned this might give a false impression of what's available, listing things…
av6AuthorUnsubmitted
Not Done

zsh will uniquify this, yes.

This seems to be the best way to do it so far, but maybe there needs to be a debugmergetool command or something. This is, by the way, a port of fish-shell's way to get the list of merge tools.

av6: zsh will uniquify this, yes. This seems to be the best way to do it so far, but maybe there…
spectralUnsubmitted
Not Done

Do we need to uniquify this, or is zsh smart enough to do so?

spectral: Do we need to uniquify this, or is zsh smart enough to do so?
(( $#external_tools )) && _describe -t external_tools 'external merge tools' external_tools
}
_hg_addremove() { _hg_addremove() {
_alternative 'files:unknown files:_hg_unknown' \ _alternative 'files:unknown files:_hg_unknown' \
'files:missing files:_hg_missing' 'files:missing files:_hg_missing'
} }
_hg_ssh_urls() { _hg_ssh_urls() {
if [[ -prefix */ ]] if [[ -prefix */ ]]
then then
'(--git -g)'{-g,--git}'[use git extended diff format]') '(--git -g)'{-g,--git}'[use git extended diff format]')
_hg_diff_opts=( _hg_diff_opts=(
$_hg_gitlike_opts $_hg_gitlike_opts
'(--text -a)'{-a,--text}'[treat all files as text]' '(--text -a)'{-a,--text}'[treat all files as text]'
'--nodates[omit dates from diff headers]') '--nodates[omit dates from diff headers]')
_hg_mergetool_opts=( _hg_mergetool_opts=(
'(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool' '(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool:_hg_merge_tools'
) )
_hg_dryrun_opts=( _hg_dryrun_opts=(
'(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]') '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]')
_hg_ignore_space_opts=( _hg_ignore_space_opts=(
'(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]' '(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
'(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' '(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]'