Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/zsh/patches/completion.patch
author Danek Duvall <danek.duvall@oracle.com>
Tue, 25 Mar 2014 12:35:21 -0700
branchs11-update
changeset 3021 b9308977c65b
child 1803 62473f91da56
permissions -rw-r--r--
18037255 update zsh to 5.x 16992951 Deliver zsh in 64 bits 17418670 Userland zsh configure relies on ypcat
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3021
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     1
 
diff -ru zsh-5.0.5/Completion/Solaris/Command/_svcadm zsh-5.0.5/Completion/Solaris/Command/_svcadm
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     2
 
--- zsh-5.0.5/Completion/Solaris/Command/_svcadm	Thu Jan  2 14:23:56 2014
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     3
 
+++ zsh-5.0.5/Completion/Solaris/Command/_svcadm	Tue Jan  7 16:11:20 2014
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     4
 
@@ -23,8 +23,8 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     5
 
 	(enable)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     6
 
 		_arguments -A "-*" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     7
 
 			'-r[Recursively enable dependencies]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     8
 
-			'-s[Wait for service to come online]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     9
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    10
 
+			'-s[Synchronous mode: wait for service to come online]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    11
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    12
 
 			'-t[State change is temporary]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    13
 
 			'*:instance FMRI:_svcs_fmri -i'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    14
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    15
 
@@ -31,8 +31,8 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    16
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    17
 
 	(disable)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    18
 
 		_arguments -A "-*" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    19
 
-			'-s[Wait for service to become disabled]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    20
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    21
 
+			'-s[Synchronous mode: wait for service to become disabled]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    22
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    23
 
 			'-t[State change is temporary]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    24
 
 			'*:instance FMRI:_svcs_fmri -i'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    25
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    26
 
@@ -40,8 +40,8 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    27
 
 	(mark)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    28
 
 		_arguments -A "-*" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    29
 
 			'-I[Change state immediately]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    30
 
-			"-s[Wait for service to reach the new state]" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    31
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    32
 
+			"-s[Synchronous mode: wait for service to reach the new state]" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    33
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    34
 
 			'-t[State change is temporary]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    35
 
 			':state:(degraded maintenance)' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    36
 
 			':instance FMRI:_svcs_fmri -i'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    37
 
@@ -49,15 +49,15 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    38
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    39
 
 	(restart|refresh|clear)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    40
 
 		_arguments \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    41
 
-			"-s[Wait for service to $service]" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    42
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    43
 
+			"-s[Synchronous mode: wait for service to $service]" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    44
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    45
 
 			'*:instance FMRI:_svcs_fmri -i'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    46
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    47
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    48
 
 	(delegate)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    49
 
 		_arguments -A "-*" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    50
 
-			'-s[Wait for instances to come online]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    51
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    52
 
+			'-s[Synchronous mode: wait for instances to come online]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    53
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    54
 
 			':restarter FMRI:_svcs_fmri -r' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    55
 
 			'*:FMRI:_svcs_fmri -i'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    56
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    57
 
@@ -65,8 +65,8 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    58
 
 	(milestone)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    59
 
 		_arguments -A "-*" \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    60
 
 			'-d[Make milestone the default]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    61
 
-			'-s[Wait for the transition to the new milestone]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    62
 
-			'-T[Timeout for -s]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    63
 
+			'-s[Synchronous mode: wait for the transition to the new milestone]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    64
 
+			'-T[Timeout for synchronous mode]:seconds:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    65
 
 			'*:milestone FMRI:_svcs_fmri -m'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    66
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    67
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    68
 
diff -ru zsh-5.0.5/Completion/Unix/Command/_zpool zsh-5.0.5/Completion/Unix/Command/_zpool
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    69
 
--- zsh-5.0.5/Completion/Unix/Command/_zpool	Tue Jan  7 16:11:20 2014
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    70
 
+++ zsh-5.0.5/Completion/Unix/Command/_zpool	Thu Jan  2 14:23:56 2014
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    71
 
@@ -105,7 +105,7 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    72
 
 			':command/property:($subcmds ${fields%%\[*} properties)' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    73
 
 			- set2 \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    74
 
 			'-l[Display property information]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    75
 
-			': :(properties)'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    76
 
+			':help topics:(properties)'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    77
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    78
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    79
 
 	(clear)
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    80
 
@@ -241,7 +241,6 @@
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    81
 
 			'*:pool name or id:_zfs_pool' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    82
 
 			'::new pool name:' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    83
 
 			- set2 \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    84
 
-			'-N[Do not mount any filesystems]' \
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    85
 
 			'-a[All pools]'
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    86
 
 		;;
b9308977c65b 18037255 update zsh to 5.x
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    87
upstream/oracle/userland-gate