feat(completion): complete zsh completion for dotbare

dotbare.plugin.zsh

@@ -1,4 +1,3 @@
-# Standardized $0 handling
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 local _path="${0:h}"
 
@@ -7,13 +6,13 @@ if [[ -z "${path[(r)$_path]}" ]]; then
 fi
 
 function _dotbare_completion_cmd {
-  local context state state_descr line ret
+  local context state state_descr line
   local -A opt_args
   ret=1
 
   _arguments -C \
-    '(- : *)'{-h,--help}'[Show help information]' \
-    '(- : *)'{-v,--version}'[Display dotbare version]' \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(- : *)'{-v,--version}'[display dotbare version]' \
     '1:cmds:->cmds' \
     '*::options:->options' \
     && ret=0
@@ -48,6 +47,30 @@ function _dotbare_completion_cmd {
         fcheckout)
           __dotbare_complete_fcheckout
           ;;
+        fedit)
+          __dotbare_complete_fedit
+          ;;
+        finit)
+          __dotbare_complete_finit
+          ;;
+        flog)
+          __dotbare_complete_flog
+          ;;
+        freset)
+          __dotbare_complete_freset
+          ;;
+        fstash)
+          __dotbare_complete_fstash
+          ;;
+        fstat)
+          __dotbare_complete_fstat
+          ;;
+        funtrack)
+          __dotbare_complete_funtrack
+          ;;
+        fupgrade)
+          __dotbare_complete_fsimple
+          ;;
       esac
   esac
 
@@ -59,11 +82,10 @@ function __dotbare_complete_fadd() {
   typeset -A opt_args
   ret=1
   _arguments \
-    '(- : *)'{-h,--help}'[Show help information]' \
-    '(-f --file -d --dir)'{-f,--file}'[Select files from PWD and stage]' \
-    '(-d --dir -f --file)'{-d,--dir}'[Select directory from PWD and stage]' \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-f --file -d --dir)'{-f,--file}'[select files from PWD and stage]' \
+    '(-d --dir -f --file)'{-d,--dir}'[select directory from PWD and stage]' \
     && ret=0
-  return "${ret}"
 }
 
 function __dotbare_complete_fbackup() {
@@ -71,12 +93,11 @@ function __dotbare_complete_fbackup() {
   typeset -A opt_args
   ret=1
   _arguments \
-    '(- : *)'{-h,--help}'[Show help information]' \
-    '(-s --select -p --path)'{-s,--select}'[Select tracked files to backup]' \
-    '(-p --path -s --select)'{-p,--path}'[Sepcify path of files to backup]:filename:_files' \
-    '(-m --move)'{-m,--move}'[Use mv cmd instead of cp cmd]' \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-s --select -p --path)'{-s,--select}'[select tracked files to backup]' \
+    '(-p --path -s --select)'{-p,--path}'[sepcify path of files to backup]:filename:_files' \
+    '(-m --move)'{-m,--move}'[use mv cmd instead of cp cmd]' \
     && ret=0
-  return "${ret}"
 }
 
 function __dotbare_complete_fcheckout() {
@@ -84,13 +105,95 @@ function __dotbare_complete_fcheckout() {
   typeset -A opt_args
   ret=1
   _arguments \
-    '(- : *)'{-h,--help}'[Show help information]' \
-    '(-s --select -b --branch -c --commit)'{-s,--select}'[Select files and then checkout them in selected commits]' \
-    '(-b --branch -s --select -c --commit)'{-b,--branch}'[Checkout branch]' \
-    '(-c --commit -b --branch -s --select)'{-c,--commit}'[Checkout commit]' \
-    '(-y --yes)'{-y,--yes}'[Acknowledge all actions and skip confirmation]' \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-s --select -b --branch -c --commit)'{-s,--select}'[select files and then checkout them in selected commits]' \
+    '(-b --branch -s --select -c --commit)'{-b,--branch}'[checkout branch]' \
+    '(-c --commit -b --branch -s --select)'{-c,--commit}'[checkout commit]' \
+    '(-y --yes)'{-y,--yes}'[acknowledge all actions and skip confirmation]' \
+    && ret=0
+}
+
+function __dotbare_complete_fedit() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-m --modified -c --commit)'{-m,--modified}'[edit modified files]' \
+    '(-c --commit -m --modified)'{-c,--commit}'[edit commits]' \
+    && ret=0
+}
+
+function __dotbare_complete_finit() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-u --url)'{-u,--url}'[migrate remote dotfiles to current system]: :->url' \
+    '(-s --submodule)'{-s,--submodule}'[clone submodules during migration]' \
+    '(-y --yes)'{-y,--yes}'[acknowledge all actions and skip confirmation]' \
+    && ret=0
+}
+
+function __dotbare_complete_flog() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-r --revert -R --reset -e --edit -c --checkout)'{-r,--revert}'[revert the selected commit and skip action menu]' \
+    '(-r --revert -R --reset -e --edit -c --checkout)'{-R,--reset}'[reset the selected commit and skip action menu]' \
+    '(-r --revert -R --reset -e --edit -c --checkout)'{-e,--edit}'[edit the selected commit and skip action menu]' \
+    '(-r --revert -R --reset -e --edit -c --checkout)'{-c,--checkout}'[checkout the selected commit and skip action menu]' \
+    '(-y --yes)'{-y,--yes}'[acknowledge all actions and skip confirmation]' \
+    && ret=0
+}
+
+function __dotbare_complete_freset() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-c --commit)'{-c,--commit}'[reset HEAD to certain commit]' \
+    '(-S --soft -H --hard)'{-S,--soft}'[reset commit using --soft flag]' \
+    '(-H --hard -S --soft)'{-H,--hard}'[reset commit using --hard flag]' \
+    '(-y --yes)'{-y,--yes}'[acknowledge all actions and skip confirmation]' \
+    && ret=0
+}
+
+function __dotbare_complete_fstash() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-s --select -d --delete -p --pop)'{-s,--select}'[list modified files and stash the selected files]' \
+    '(-s --select -d --delete -p --pop)'{-d,--delete}'[list stash and delete the selected stash]' \
+    '(-s --select -d --delete -p --pop)'{-p,--pop}'[use "stash pop" instead of "stash apply"]' \
+    && ret=0
+}
+
+function __dotbare_complete_fsimple() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    && ret=0
+}
+
+function __dotbare_complete_funtrack() {
+  local context state state_descr line
+  typeset -A opt_args
+  ret=1
+  _arguments \
+    '(- : *)'{-h,--help}'[show help information]' \
+    '(-t --temp -r --resume)'{-t,--temp}'[temporarily ignore changes of the selected files]' \
+    '(-t --temp -r --resume)'{-r,--resume}'[resume tracking changes of the selected files]' \
+    '(-y --yes)'{-y,--yes}'[acknowledge all actions and skip confirmation]' \
     && ret=0
-  return "${ret}"
 }
 
 compdef _dotbare_completion_cmd dotbare

scripts/freset

@@ -33,7 +33,7 @@ function usage() {
   echo -e "Default: unstage the selected files.\n"
   echo -e "optional arguments:"
   echo -e "  -h, --help\t\tshow this help message and exit."
-  echo -e "  -c, --commit\t\treset commit to certain commit, default --mixed flag, reset HEAD to certain commit put all changes into modified state."
+  echo -e "  -c, --commit\t\treset HEAD to certain commit, default --mixed flag, reset HEAD to certain commit put all changes into modified state."
   echo -e "  -S, --soft\t\treset commit using --soft flag, reset HEAD to certain commit without modify working tree."
   echo -e "  -H, --hard\t\treset commit using --hard flag, reset HEAD to certain commit discard all changes from the working tree."
   echo -e "  -y, --yes\t\tacknowledge all actions that will be taken and skip confirmation."