This is an archive of the discontinued Mercurial Phabricator instance.

contrib/zsh_completion
1272	Mine has a --cleanup flag. Not sure where that came from, and I think it's dangerous as heck and I don't like it, but ... should we list it? (I'm 100% fine with the answer being "no, it's too scary" :))
1277	Optional: should we make --delete exclusive with anything else? what about --list, patch, stat..?

av6 added inline comments.Aug 31 2018, 9:22 PM

contrib/zsh_completion
1272	I don't think it's too scary, but I do think it's too stealthy.
1277	I gave up on that idea. The logic in hgext.shelve.shelvecmd() is more or less clear, but translated into zsh completions it takes too much space: it would mean that many flags would mention almost every other flag, and --cleanup would mention literally all of them. But not global flags, mind, so you can't shortcut with `(-)`. I'd like to see some clever way to translate `allowables` and the related code into zsh instead, but I myself can't write that kind of zsh yet.

av6 updated this revision to Diff 10717.Sep 3 2018, 6:52 AM

Ah, and now the comments are grayed out. I shouldn't have re-phabsend-ed this, since there are no changes from the previous version.

spectral accepted this revision.Sep 4 2018, 4:31 PM

pulkit accepted this revision.Sep 5 2018, 6:39 AM

Closed by commit rHG45d12c49c3f3: zsh_completion: complete shelve and unshelve (authored by av6). · Explain WhySep 5 2018, 6:53 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/zsh_completion (49 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10684		Aug 31 2018, 1:42 AM	★	★
Diff 2	10717		Sep 3 2018, 6:52 AM	★	★
Diff 3	10781	rHG45d12c49c3f3e1b5feaf418f5698327a09357112	Aug 21 2018, 9:02 PM	★	★

Status	Author	Revision
Closed	av6	D4428 zsh_completion: complete shelve and unshelve
Closed	av6	D4427 zsh_completion: handle --rev as well as -r for diff and revert
Closed	av6	D4426 zsh_completion: use revsets to exclude this rev from suggestions to hg merge

Diff 10781

contrib/zsh_completion


	_hg_merge_tools() {			_hg_merge_tools() {
	typeset -a external_tools			typeset -a external_tools
	_describe -t internal_tools 'internal merge tools' _hg_internal_merge_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=(${(f)"$(_hg_cmd showconfig merge-tools \| cut -d . -f 2)"})
	(( $#external_tools )) && _describe -t external_tools 'external merge tools' external_tools			(( $#external_tools )) && _describe -t external_tools 'external merge tools' external_tools
	}			}

				_hg_shelves() {
				shelves=("${(f)$(_hg_cmd shelve -ql)}")
				(( $#shelves )) && _describe -t shelves 'shelves' shelves
				}

	_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
	_hg_cmd_purge() {			_hg_cmd_purge() {
	_arguments -s -S : $_hg_global_opts $_hg_pat_opts \			_arguments -s -S : $_hg_global_opts $_hg_pat_opts \
	'(--abort-on-err -a)'{-a,--abort-on-err}'[abort if an error occurs]' \			'(--abort-on-err -a)'{-a,--abort-on-err}'[abort if an error occurs]' \
	'--all[purge ignored files too]' \			'--all[purge ignored files too]' \
	'(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \			'(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \
	'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]'			'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]'
	}			}

				# Shelve
				_hg_cmd_shelve() {
				local context state state_descr line ret=1
				typeset -A opt_args

				_arguments -s -S : $_hg_global_opts $_hg_pat_opts \
				spectralUnsubmitted Not Done Mine has a --cleanup flag. Not sure where that came from, and I think it's dangerous as heck and I don't like it, but ... should we list it? (I'm 100% fine with the answer being "no, it's too scary" :)) spectral: Mine has a --cleanup flag. Not sure where that came from, and I think it's dangerous as heck…
				av6AuthorUnsubmitted Not Done I don't think it's too scary, but I do think it's too stealthy. av6: I don't think it's too scary, but I do think it's too stealthy.
				'(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before shelving]' \
				'(--unknown -u)'{-u,--unknown}'[store unknown files in the shelve]' \
				'(--name -n :)--cleanup[delete all shelved changes]' \
				'--date=[shelve with the specified commit date]:date' \
				'(--delete -d)'{-d,--delete}'[delete the named shelved change(s)]' \
				spectralUnsubmitted Not Done Optional: should we make --delete exclusive with anything else? what about --list, patch, stat..? spectral: Optional: should we make --delete exclusive with anything else? what about --list, patch, stat..
				av6AuthorUnsubmitted Not Done I gave up on that idea. The logic in hgext.shelve.shelvecmd() is more or less clear, but translated into zsh completions it takes too much space: it would mean that many flags would mention almost every other flag, and --cleanup would mention literally all of them. But not global flags, mind, so you can't shortcut with `(-)`. I'd like to see some clever way to translate `allowables` and the related code into zsh instead, but I myself can't write that kind of zsh yet. av6: I gave up on that idea. The logic in hgext.shelve.shelvecmd() is more or less clear, but…
				'(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \
				'(--list -l)'{-l,--list}'[list current shelves]' \
				'(--message -m)'{-m+,--message=}'[use text as shelve message]:text' \
				'(--name -n)'{-n+,--name=}'[use the given name for the shelved commit]:name' \
				'(--patch -p)'{-p,--patch}'[output patches for changes]' \
				'(--interactive -i)'{-i,--interactive}'[interactive mode, only works while creating a shelve]' \
				'--stat[output diffstat-style summary of changes]' \
				'*:file:->shelve_files' && ret=0

				if [[ $state == 'shelve_files' ]]
				then
				if [[ -n ${opt_args[(I)-d\|--delete\|-l\|--list\|-p\|--patch\|--stat]} ]]
				then
				_hg_shelves && ret=0
				else
				typeset -a status_files
				_hg_status mard
				_wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files && ret=0
				fi
				fi

				return ret
				}

				_hg_cmd_unshelve() {
				_arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \
				'(--abort -a --continue -c --name -n :)'{-a,--abort}'[abort an incomplete unshelve operation]' \
				'(--abort -a --continue -c --name -n :)'{-c,--continue}'[continue an incomplete unshelve operation]' \
				'(--keep -k)'{-k,--keep}'[keep shelve after unshelving]' \
				'(--name -n :)'{-n+,--name=}'[restore shelved change with given name]:shelve:_hg_shelves' \
				':shelve:_hg_shelves'
				}

	_hg "$@"			_hg "$@"

This is an archive of the discontinued Mercurial Phabricator instance.

zsh_completion: complete shelve and unshelveClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 10781

contrib/zsh_completion

zsh_completion: complete shelve and unshelve
ClosedPublic

Revision Contents
Changeset List