updated subcommand completion for btrfs

ChangeLog

@@ -1,5 +1,8 @@
 2014-02-18  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Eric Cook: Completion/Linux/Command/_btrfs: updated completion
+	for subcommands.
+
 	* Eric Cook: Completion/Linux/Command/_btrfs: minor typo.
 
 	* Eric Cook: Completion/Linux/Command/_btrfs: remove hard tabs.

Completion/Linux/Command/_btrfs

@@ -1,15 +1,22 @@
 #compdef btrfs
 
 local curcontext="$curcontext" curstate state line expl grp cmd ret=1
-local -a groups args cmds_1 cmds_2 cmds_3 cmds_4 cmds_5 cmds_6
+local -a cmds_1 cmds_2 cmds_3 cmds_4 cmds_5 cmds_6 cmds_7 cmds_8 cmds_9 cmds_10
+local -a groups args
 
-groups=( subvolume filesystem device scrub balance inspect-internal help version )
+groups=( subvolume filesystem device scrub balance inspect-internal 
-cmds_1=( create delete list snapshot get-default set-default find-new help )
+         quota qgroup replace rescue check restore send receive 
+         help version )
+cmds_1=( create delete list snapshot get-default set-default find-new show help )
 cmds_2=( df show sync defragment resize label balance help )
-cmds_3=( add delete scan help )
+cmds_3=( add delete ready scan stats help )
 cmds_4=( start cancel resume status help )
 cmds_5=( start pause cancel resume status )
-cmds_6=( inode-resolve logical-resolve help )
+cmds_6=( inode-resolve logical-resolve subvolid-resolve rootid help )
+cmds_7=( enable disable rescan help )
+cmds_8=( assign remove create destroy show limit help )
+cmds_9=( start status cancel help )
+cmds_10=( chunk-recover super-recover )
 
 [[ $words[2] = h(|e(|l(|p))) ]] && args=( '--full[display detailed help]' )
 
@@ -38,7 +45,7 @@ while (( $#state )); do
     args)
       : $words
       local grp=${groups[(i)$words[1]*]}
-      (( grp && grp < 7 )) || return 1
+      (( grp && grp <= 15 )) || return 1
       local group=cmds_$grp
       local cmd=${${(P)group}[(i)$words[2]*]}
       (( cmd )) || return 1
@@ -60,11 +67,14 @@ while (( $#state )); do
         subvolume:snapshot) args+=( '-r[readonly snapshot]' '1:snapshot:_files -/' );;
         subvolume:list) args+=( '-p[include parent ID in output]' '1:path:->mounts' );;
         subvolume:set-default) args+=( '1:id:_guard "[0-9]#" id' '2:path:->mounts' );;
+        subvolume:get-default) args+=( '1:path:_files -/' );;
+        subvolume:find-new) args+=( '1:subvol:_files -/' '2:lastgen: _message "last gen"' );;
         filesystem:resize) args+=( '1:size:_guard "(|+|-)[0-9]#[GKM]"' '2:path:->mounts' );;
         filesystem:defragment)
           args+=(
             '-v[verbose]'
             '-c[compress files while defragmenting]'
+            '-r[defragment files recursively]'
             '-f[flush after defragmenting]'
             '-s[start position]:byte position'
             '-l[defragment limited number of bytes]:length (bytes)'
@@ -73,18 +83,39 @@ while (( $#state )); do
             )
             ;;
         filesystem:label) args+=( '1:device:_files -g "*(d)"' '2:label' );;
-        filesystem:show) args+=( '(1 -)--all-devices[scan all devices in /dev]' '1: :_guard "^-*" uuid or label' );;
+        filesystem:show) 
-        device:(add|delete)) args+=( '1:device:_files -g "*(d)"' '2:path:->mounts' );;
+          args+=( 
+            '(1 -)'{-d,--all-devices}'[scan all devices in /dev]' 
+            '(1 -)'{-m,--mounted}'[show only mounted filesystems]'
+            '1: :_guard "^-*" uuid or label'
+            )
+            ;;
+        device:(add|delete)) 
+          args+=( 
+            '1:device:_files -g "*(d)"' 
+            '2:path:->mounts'
+            )
+          [[ ${${(P)group}[cmd]} == add ]] && 
+            args+=( 
+              {-K,--nodiscard}'[do not perform discard]'
+              {-f,--force}'[force overwrite of existing filesystem]'
+              )
+            ;;
         device:scan) args+=( '(1 -)--all-devices[scan all devices in /dev]' '1:device:_files -g "*(d)"' );;
+        device:stats) args+=( "1:device or mountpoint:_files -g '*(d,/)'" '-z[reset stats when done]' );;
+        device:ready) args+=( '1:device: _files -g "*(d)"' );;
         scrub:(start|resume))
           args+=(
             "-B[don't background and print statistics at end]"
             '-d[print separate statistics for each device]'
             '-q[omit error message and statistics]'
             '-r[read only mode]'
-            '-u[scrub unused space too]'
+            '-R[raw print mode]'
+            '-c[set ioprio class]:class:(( 0\:none 1\:realtime 2\:best-effort 3\:idle))'
+            '-n[set ioprio classdata]:classdata:(0 1 2 3 4 5 6 7)'
             '1:path or device:_files'
             )
+            [[ ${${(P)group}[cmd]} == start ]] && args+=( '-R[raw print mode]' )
             ;;
         scrub:cancel) args+=( '1:path or device' );;
         scrub:status) args+=( '-d[separate statistics for each device]' '1:path or device:_files' );;
@@ -105,6 +136,7 @@ while (( $#state )); do
           args+=(
             '-v[verbose mode]'
             '-P[skip the path resolving and print the inodes instead]'
+            '-s[buffer size]:buffer size:'
             '1:logical address:_files'
             '2:filesystem path:_files -/'
             )
@@ -136,7 +168,7 @@ while (( $#state )); do
     ;;
     profiles)
       compset -P '*\|'
-      _values -s ',' profile raid0 raid1 raid10 dup single && ret=0
+      _values -s ',' profile raid0 raid1 raid5 raid6 raid10 dup single && ret=0
     ;;
   esac
 done