mercurial-crew-with-dirclash: comparison contrib/zsh

equal deleted inserted replaced

-:ec221317e018
+:ef9c515836ae
 local curcontext="$curcontext" state line
 typeset -A _hg_cmd_globals
 _hg() {
-local cmd
+local cmd _hg_root
 integer i=2
 _hg_cmd_globals=()
 while (( i < $#words ))
 do
 case "$words[$i]" in
--R|--repository|--cwd|--config)
+-R|--repository)
-# pass along arguments to hg completer
+_hg_root="$words[$i+1]"
-_hg_cmd_globals+="$words[$i]"
+_hg_cmd_globals+=("$words[$i]" "$_hg_root")
-_hg_cmd_globals+="$words[$i+1]"
 (( i += 2 ))
 continue
 ;;
 -R*)
 _hg_cmd_globals+="$words[$i]"
+_hg_root="${words[$i]#-R}"
 (( i++ ))
 continue
+;;
+--cwd|--config)
+# pass along arguments to hg completer
+_hg_cmd_globals+=("$words[$i]" "$words[$i+1]")
+(( i += 2 ))
+continue
 ;;
 -*)
 # skip option
 (( i++ ))
 continue
 then
 _hg_cmd_${cmd}
 else
 # complete unknown commands normally
 _arguments -s -w : $_hg_global_opts \
-'*:files:_files -W $(_hg_cmd root)'
+'*:files:_hg_files'
 fi
 }
 _hg_cache_policy() {
 typeset -a old
 tags+=($tag)
 done
 (( $#tags )) && _describe -t tags 'tags' tags
 }
+_hg_files() {
+if [[ -n "$_hg_root" ]]
+then
+[[ -d "$_hg_root/.hg" ]] || return
+case "$_hg_root" in
+/*)
+_files -W $_hg_root
+;;
+*)
+_files -W $PWD/$_hg_root
+;;
+esac
+else
+_files
+fi
+}
 _hg_status() {
 status_files=(${(ps:\0:)"$(_hg_cmd status -0n$1 . 2>/dev/null)"})
 }
 _hg_unknown() {
 '(--text -a)'{-a,--text}'[treat all files as text]' \
 '(--user -u)'{-u,--user}'[list the author]' \
 '(--date -d)'{-d,--date}'[list the date]' \
 '(--number -n)'{-n,--number}'[list the revision number (default)]' \
 '(--changeset -c)'{-c,--changeset}'[list the changeset]' \
-'*:files:_files -W $(_hg_cmd root)'
+'*:files:_hg_files'
 }
 _hg_cmd_archive() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
 '--no-decode[do not pass files through decoders]' \
 _hg_cmd_cat() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
 '(--output -o)'{-o+,--output}'[print output to file with formatted name]:filespec:' \
 '(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
-'*:file:_files -W $(_hg_cmd root)'
+'*:file:_hg_files'
 }
 _hg_cmd_clone() {
 _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
 '(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]' \
 '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]'
 '(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
 '(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_file -g \*.txt' \
 '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
 '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
-'*:file:_files -W $(_hg_cmd root)'
+'*:file:_hg_files'
 }
 _hg_cmd_copy() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
 '(--after -A)'{-A,--after}'[record a copy that has already occurred]' \
 '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
-'*:file:_files -W $(_hg_cmd root)'
+'*:file:_hg_files'
 }
 _hg_cmd_diff() {
 typeset -A opt_args
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \
 if [[ $state == 'diff_files' ]]
 then
 if [[ -n $opt_args[-r] ]]
 then
-_files -W $(_hg_cmd root)
+_hg_files
 else
 _hg_modified
 fi
 fi
 }
 '(--ignore-case -i)'{-i,--ignore-case}'[ignore case when matching]' \
 '(--files-with-matches -l)'{-l,--files-with-matches}'[print only filenames and revs that match]' \
 '(--line-number -n)'{-n,--line-number}'[print matching line numbers]' \
 '*'{-r+,--rev}'[search in given revision range]:revision:_hg_revrange' \
 '(--user -u)'{-u,--user}'[print user who committed change]' \
-'*:search pattern:_files -W $(_hg_cmd root)'
+'*:search pattern:_hg_files'
 }
 _hg_cmd_heads() {
 _arguments -s -w : $_hg_global_opts $_hg_style_opts \
 '(--rev -r)'{-r+,--rev}'[show only heads which are descendants of rev]:revision:_hg_tags'
 _hg_cmd_locate() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
 '(--rev -r)'{-r+,--rev}'[search repository as it stood at revision]:revision:_hg_tags' \
 '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
 '(--fullpath -f)'{-f,--fullpath}'[print complete paths]' \
-'*:search pattern:_files -W $(_hg_cmd root)'
+'*:search pattern:_hg_files'
 }
 _hg_cmd_log() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \
 '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
 '*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
 '(--no-merges -M)'{-M,--no-merges}'[do not show merges]' \
 '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
 '(--patch -p)'{-p,--patch}'[show patch]' \
 '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_tags' \
-'*:files:_files -W $(_hg_cmd root)'
+'*:files:_hg_files'
 }
 _hg_cmd_manifest() {
 _arguments -s -w : $_hg_global_opts \
 ':revision:_hg_tags'
 _hg_cmd_remove() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
 '(--after -A)'{-A,--after}'[record remove that has already occurred]' \
 '(--force -f)'{-f,--force}'[remove file even if modified]' \
-'*:file:_files -W $(_hg_cmd root)'
+'*:file:_hg_files'
 }
 _hg_cmd_rename() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
 '(--after -A)'{-A,--after}'[record a rename that has already occurred]' \
 '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
-'*:file:_files -W $(_hg_cmd root)'
+'*:file:_hg_files'
 }
 _hg_cmd_revert() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
 '(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \
 if [[ $state == 'diff_files' ]]
 then
 if [[ -n $opt_args[-r] ]]
 then
-_files -W $(_hg_cmd root)
+_hg_files
 else
 typeset -a status_files
 _hg_status mard
 _wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files
 fi
 '*:unapplied patch:_hg_qunapplied'
 }
 _hg_cmd_qdiff() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-'*:pattern:_files -W $(_hg_cmd root)'
+'*:pattern:_hg_files'
 }
 _hg_cmd_qfold() {
 _arguments -s -w : $_hg_global_opts $_h_commit_opts \
 '(--keep,-k)'{-k,--keep}'[keep folded patch files]' \
 _hg_cmd_qrefresh() {
 _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts \
 '(--git -g)'{-g,--git}'[use git extended diff format]' \
 '(--short -s)'{-s,--short}'[short refresh]' \
-'*:files:_files -W $(_hg_cmd root)'
+'*:files:_hg_files'
 }
 _hg_cmd_qrename() {
 _arguments -s -w : $_hg_global_opts \
 ':patch:_hg_qseries' \

changeset 3603	ef9c515836ae
parent 3602	ec221317e018
child 3605	9d815b074dcb