D4362: zsh_completion: complete merge tools for -t/--tool
av6 (Anton Shestakov)
phabricator at mercurial-scm.org
Thu Aug 23 07:45:06 UTC 2018
av6 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4362
AFFECTED FILES
contrib/zsh_completion
CHANGE DETAILS
diff --git a/contrib/zsh_completion b/contrib/zsh_completion
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -281,6 +281,18 @@
(( $#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)"})
+ (( $#external_tools )) && _describe -t external_tools 'external merge tools' external_tools
+}
+
_hg_addremove() {
_alternative 'files:unknown files:_hg_unknown' \
'files:missing files:_hg_missing'
@@ -416,7 +428,7 @@
'--nodates[omit dates from diff headers]')
_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=(
To: av6, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list