Changeset 258

Timestamp:

11/20/08 10:39:09 (7 weeks ago)

Author:

docwhat

Message:

Added Git Hooks.

Location:

trunk/packages/git-support

Files:

• .git_hooks (added)
• .git_hooks/pre-commit (added)
• .homedir.control (modified) (1 diff)
• .zsh/functions/_git (modified) (49 diffs)

trunk/packages/git-support/.homedir.control

@@ -7 +7 @@
 
 dirs:
+ .git_hooks
  .zsh
  .zsh/functions

trunk/packages/git-support/.zsh/functions/_git

@@ -151 +151 @@
     'diff:show changes between commits, commit and working tree, etc.'
     'fetch:download objects and a head from another repository'
-    'gc:cleanup unnecessary files and optimize the local repository'
+    'gc:cleanup unnecessary files and optimize thee local repository'
     'grep:print lines matching a pattern'
     'init:create empty git object database'
@@ -165 +165 @@
     'rm:remove files from the working tree and from the index'
     'show-branch:show branches and their commits'
-    'status:show working-tree'\''s status'
+    "status:show working-tree's status"
     'tag:create tag object signed with GPG'
     'verify-tag:check GPG signature of a tag')
@@ -226 +226 @@
     'symbolic-ref:read and modify symbolic references'
     'tar-tree:create tar archive of the files in the named tree'
-    'unpack-file:create temporary file with blob'\''s contents'
+    "unpack-file:create temporary file with blob's contents"
     'unpack-objects:unpack objects out of packed archive'
     'update-ref:update object name stored in a reference safely'
@@ -239 +239 @@
     'format-patch:prepare patches for e-mail submission'
     'ls-files:information about files in the index/working directory'
+    'config:get and set options in "$GIT_DIR/config"'
     'instaweb:instantly browse your working repository in gitweb'
     'remote:manage set of tracked repositories'
@@ -666 +667 @@
           _arguments \
             '*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \
-            '(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \
+            '(--master -m)'{--master,-m}"[set the remote's HEAD to point to given master branch]:branch:__git_branch_names" \
             '(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \
             ':branch name:__git_remotes' \
@@ -826 +827 @@
         #   ...
         _alternative \
-          "original tree:original tree:__git_tree_files . $line[1]" \
-          "new tree:new tree:__git_tree_files . $line[2]" && ret=0
+          "original tree:original tree:__git_tree_files $line[1]" \
+          "new tree:new tree:__git_tree_files $line[2]" && ret=0
       else
         _alternative \
           ': :__git_tree_ishs' \
-          ": :__git_tree_files . $line[1]" && ret=0
+          ": :__git_tree_files $line[1]" && ret=0
       fi
       ;;
@@ -924 +925 @@
   case $state in
     files)
-      __git_tree_files . $line[1] && ret=0
+      __git_tree_files $line[1] && ret=0
       ;;
   esac
@@ -937 +938 @@
 _git-quiltimport () {
   _arguments \
-    '--dry-run[check patches and warn if they can'\''t be imported]' \
+    "--dry-run[check patches and warn if they can't be imported]" \
     '--author[default author name and email address to use for patches]' \
     '--patches[set directory containing patches]:patch directory:_directories' && ret=0
@@ -1016 +1017 @@
   _arguments -S \
     $revision_arguments \
-    '*:object:__git_objects' && ret=0
+    '*:object:->object' && ret=0
+
+  case $state in
+    (object)
+      compset -P '*:'
+      if [[ -n $IPREFIX ]]; then
+        __git_tree_files ${IPREFIX%:}
+      else
+        _alternative \
+          'revisions:revision:__git_revisions' \
+          'files:file:__git_files'
+      fi
+      ;;
+  esac
 }
 
@@ -1052 +1066 @@
     '*:index file:_files -g "*.idx"' && ret=0
 }
-
+ 
 (( $+functions[_git-clone-pack] )) ||
 _git-clone-pack () {
@@ -1366 +1380 @@
   case $state in
     (files)
-      __git_tree_files . $line[1] && ret=0
+      __git_tree_files $line[1] && ret=0
       ;;
   esac
@@ -1457 +1471 @@
       $my_abbrev_arg \
     - create \
-      '-l[create the branch'\''s reflog]' \
+      "-l[create the branch's reflog]" \
       '-f[force the creation of a new branch]' \
       ':branch-name:__git_branch_names' \
@@ -1483 +1497 @@
 
   if (( words[(I)-b] > 0 )); then
-    new_branch_reflog_arg='-l[create the new branch'\''s reflog]'
+    new_branch_reflog_arg="-l[create the new branch's reflog]"
   fi
 
@@ -1504 +1518 @@
     (files)
       if [[ -n $line[1] ]]; then
-        __git_tree_files . $line[1] && ret=0
+        __git_tree_files $line[1] && ret=0
       else
         __git_cached_files && ret=0
@@ -1664 +1678 @@
     ':pattern:' \
     '*::tree-or-file:->files' && ret=0
-
+  
   case $state in
     (files)
@@ -1690 +1704 @@
           _alternative \
             'tree:tree:__git_trees' \
-            "tree file:tree-files:__git_tree_files .  $line[first_tree,last_tree]" && ret=0
+            "tree file:tree-files:__git_tree_files $line[first_tree,last_tree]" && ret=0
         fi
       else
@@ -1696 +1710 @@
           __git_cached_files
         else
-          __git_tree_files . $line[first_tree,last_tree]
+          __git_tree_files $line[first_tree,last_tree]
         fi
       fi
@@ -1836 +1850 @@
   if [[ $words[2] == --mixed ]]; then
     commit_arg=':commit:__git_revisions'
-    path_arg="*:file:__git_tree_files . $words[3]"
+    path_arg="*:file:__git_tree_files $words[3]"
   else
     commit_arg='::commit:__git_revisions'
@@ -2031 +2045 @@
   _arguments \
     '--all[pack all refs]' \
-    '(        --no-prune)--prune[remove loose refs after packing them]' \
-    '(--prune           )--no-prune[don'\''t remove loose refs after packing them]' && ret=0
+    "(        --no-prune)--prune[remove loose refs after packing them]" \
+    "(--prune           )--no-prune[don't remove loose refs after packing them]" && ret=0
 }
 
@@ -2260 +2274 @@
     {--after=-,--since=-}'[show "--max-age=" parameter corresponding given date string]:datestring' \
     {--berore=-,--until=-}'[show "--min-age=" parameter corresponding given date string]:datestring' \
-    '*:objects:__git_objects' && ret=0
+    '*:args' && ret=0
 }
 
@@ -2277 +2291 @@
   _arguments -S -A '-*' \
     '-f[override the up-to-date check]' \
-    '-n[don'\''t actually remove the files, just show if they exist in the index]' \
+    "-n[don't actually remove the files, just show if they exist in the index]" \
     '-r[allow recursive removal when a leading directory-name is given]' \
     '--cached[only remove files from the index]' \
@@ -2343 +2357 @@
         'dcommit:commit diffs from given head onto SVN repository'
         'log:output SVN log-messages'
-        'find-rev:output git commit corresponding to the given SVN revision'\''s hash'
+        "find-rev:output git commit corresponding to the given SVN revision's hash"
         'set-tree:commit given commit or tree to SVN repository'
         'show-ignore:output corresponding .gitignore file of svn:ignore'
@@ -2557 +2571 @@
 (( $+functions[__git_objects] )) ||
 __git_objects () {
-  compset -P '*:'
-  if [[ -n $IPREFIX ]]; then
-    __git_tree_files "$PREFIX" "${IPREFIX%:}"
-  else
-    _alternative \
-      'revisions:revision:__git_revisions' \
-      'files:file:__git_files'
-  fi
+  __git_guard $* "[[:xdigit:]]#" "object"
 }
 
 (( $+functions[__git_trees] )) ||
 __git_trees () {
-  __git_objects
+  __git_guard $* "[[:xdigit:]]#" "tree"
 }
 
 (( $+functions[__git_tree_ishs] )) ||
 __git_tree_ishs () {
-  __git_commits
+  __git_commits 
 }
 
 (( $+functions[__git_blobs] )) ||
 __git_blobs () {
-  __git_objects
+  __git_guard $* "[[:xdigit:]]#" 'blob id'
 }
 
@@ -2652 +2659 @@
   zparseopts -D -E -a multi_parts_opts M: J: V: 1 2 n F: X:
 
-  local tree Path
+  local tree
   integer at_least_one_tree_added
   local -a tree_files
 
-  [[ "$1" == */ ]] && Path="$1" || Path="${1:h}/"
-  shift
   (( at_least_one_tree_added = 0 ))
   for tree in $*; do
-    tree_files+=(${(ps:\0:)"$(_call_program tree-files git ls-tree --name-only -z $tree $Path 2>/dev/null)"})
+    tree_files+=(${(ps:\0:)"$(_call_program tree-files git ls-tree --name-only -z -r $tree 2>/dev/null)"})
     __git_command_successful && (( at_least_one_tree_added = 1 ))
   done
@@ -2669 +2674 @@
 
   local expl
-  _wanted files expl 'tree file' compadd $multi_parts_opts -f -a tree_files
+
+  # FIXME: Why doesn’t -f to compadd work here?
+  _wanted files expl 'tree file' _multi_parts $multi_parts_opts - / tree_files
 }
 
@@ -2727 +2734 @@
       while _next_label files expl ${suf:-remote directory}; do
 #        [[ -n $suf ]] && compadd "$@" "$expl[@]" -d remdispf \
-#       ${(q)remdispf%[*=@|]} && ret=0
+#       ${(q)remdispf%[*=@|]} && ret=0 
     compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \
         ${(q)remdispd%/} && ret=0
@@ -2801 +2808 @@
       __git_heads
     else
-      _alternative \
-       'tags:tag:__git_tags' \
-       'heads:head:__git_heads -qS :'
+      __git_heads -S ':'
     fi
   fi
@@ -2935 +2940 @@
 
     __git_remote-groups
-    return
+    return 
   elif [[ -prefix gitcvs.* ]]; then
     names=(
@@ -2983 +2988 @@
     names=(
       'core.fileMode:whether differences in the executable bit is relevant'
-      'core.autocrlf:what type of conversion of CRLF'\''s git should do'
+      "core.autocrlf:what type of conversion of CRLF's git should do"
       'core.symlinks:whether symlinks are treated as special files or not'
       'core.gitProxy:command to execute to establish a connection to remote server'
@@ -3245 +3250 @@
       booleans=(
         {true,yes}':create ref files for branch heads'
-        {false,no}':don'\''t automatically create ref files')
+        {false,no}":don't automatically create ref files")
 
       _describe -t boolean 'boolean' booleans
@@ -3261 +3266 @@
         {true,yes}':warn if a ref name matches multiple refs'
         {false,no}':ignore ambiguous ref names')
-
+      
       _describe -t boolean 'boolean' booleans
       ;;
@@ -3354 +3359 @@
       settings=(
         {true,yes}':enable basic rename detection'
-        {false,no}':don'\''t try to detect renames'
+        {false,no}":don't try to detect renames"
         {copies,copy}':detect file renames and copies')
 
@@ -3388 +3393 @@
       booleans=(
         {true,yes}':enable the cvs server interface'
-        {false,no}':don'\''t enable the cvs server interface')
+        {false,no}":don't enable the cvs server interface")
 
       _describe -t booleans 'boolean' booleans
@@ -3473 +3478 @@
 
       booleans=(
-        {true,yes}':don'\''t use EPSV mode over FTP (for stupid servers)'
+        {true,yes}":don't use EPSV mode over FTP (for stupid servers)"
         {false,no}':use EPSV mode over FTP')
 
@@ -3496 +3501 @@
       booleans=(
         {true,yes}':include summaries in merge commit messages'
-        {false,no}':don'\''t add summaries to merge commit messages (default)')
+        {false,no}":don't add summaries to merge commit messages (default)")
 
       _describe -t booleans 'boolean' booleans
@@ -3552 +3557 @@
 
       opts=(
-        '--no-tags:don'\''t fetch tags automatically'
+        "--no-tags:don't fetch tags automatically"
         '"":fetch tags as usual')
 
@@ -3576 +3581 @@
       booleas=(
         {true,yes}':allow creation of delta-base-offset packs'
-        {false,no}':don'\''t create delta-base-offset packs')
+        {false,no}":don't create delta-base-offset packs")
 
       _describe -t booleans 'boolean' booleans
@@ -3590 +3595 @@
       _alternative \
         'number: :_guard "[0-7]#" "numeric mode"' \
-        'values:special value:((user:"use user'\''s current umask"))'
+        "values:special value:((user:\"use user's current umask\"))"
       ;;
     ((#i)user.email)
@@ -3609 +3614 @@
 
       booleans=(
-        {true,yes}':git-receive-pack will deny a ref update that isn'\''t a fast forward'
-        {false,no}':allow a ref update that isn'\''t a fast forward')
+        {true,yes}":git-receive-pack will deny a ref update that isn't a fast forward"
+        {false,no}":allow a ref update that isn't a fast forward")
 
       _describe -t booleans 'boolean' booleans
@@ -3638 +3643 @@
       booleans=(
         {true,yes}':bind the HTTP daemon to 127.0.0.1'
-        {false,no}':don'\''t bind the HTTP daemon to a specific address')
+        {false,no}":don't bind the HTTP daemon to a specific address")
 
       _describe -t booleans 'boolean' booleans
@@ -3671 +3676 @@
       booleans=(
         {true,yes}':remap URLs and UUIDs for mirrors'
-        {false,no}':don'\''t remap URLs and UUIDs for mirrors')
+        {false,no}":don't remap URLs and UUIDs for mirrors")
 
       _describe -t booleans 'boolean' booleans
@@ -3743 +3748 @@
       ;;
     ((#i)svn.merge)
-      __git_boolean_settings false 'use merging strategies' 'don'\''t try to merge'
+      __git_boolean_settings false 'use merging strategies' "don't try to merge"
       ;;
     ((#i)svn.fetch-all)
@@ -3749 +3754 @@
       ;;
     ((#i)svn.stdin)
-      __git_boolean_settings false 'read list of commits to commit from stdin' 'don'\''t necessarily read list of commits to commit from stdin'
+      __git_boolean_settings false 'read list of commits to commit from stdin' "don't necessarily read list of commits to commit from stdin"
       ;;
     ((#i)svn.strategy)
@@ -3770 +3775 @@
       ;;
     ((#i)svn.showcommit)
-      __git_boolean_settings false 'output git commit SHA-1, as well' 'don'\''t output git commit SHA-1'
+      __git_boolean_settings false 'output git commit SHA-1, as well' "don't output git commit SHA-1"
       ;;
     ((#i)svn.online)
@@ -3806 +3811 @@
 # -t can be used to specify a tag to use (default: booleans).
 # -l can be used to specify a label to use (default: 'boolean').
-#
+# 
 # The first argument is the default value, so that the description of the
 # default value can be suffixed with " (default)".  The second argument
@@ -3815 +3820 @@
 (( $+functions[__git_boolean_settings] )) ||
 __git_boolean_settings () {
-  local tag label garbage
+  local tag label garbage 
 
   zparseopts -D -E -a garba S: M: J: V: 1 2 n F: X: -t=tag -l=label
@@ -3821 +3826 @@
   declare -A descriptions
 
-  descriptions=(true $2 false 'don'\''t '"$2")
+  descriptions=(true $2 false "don't $2")
 
   if (( $# > 2 )); then
@@ -4086 +4091 @@
     '--full-history[undocumented]'
     '--relative-date[show dates relative to the current time]'
-    '--date=-[format of date output]:date format:((relative\:"show dates relative to the current time"
-                                                   local\:"show timestamps in user'\''s local timezone"
-                                                   default\:"show timestamp in the original timezone"))'
+    "--date=-[format of date output]:date format:((relative\:'show dates relative to the current time'
+                                                   local\:\"show timestamps in user's local timezone\"
+                                                   default\:'show timestamp in the original timezone\""
     '--author=-[limit commits to those by the given author]:author'
     '--committer=-[limit commits to those by the given committer]:committer'
@@ -4109 +4114 @@
 
   local curcontext=$curcontext ret=1
-
-  # fun with $words[] and $CURRENT to enable completion for args
-  # to git aliases (eg. git co <TAB>)
-  local -A git_aliases
-  # TODO: filling git_aliases like this is ugly. I didn't get it working elegantly.
-  local oifs=$IFS
-  IFS=$'\0'
-  git_aliases=(${=${(0)${(@)${${${(f)"$(git config --get-regexp alias.\*)"}/(#s)alias./}/ /$'\0'}}}})
-  IFS=$oifs ; unset oifs
-
-  if (( CURRENT >= 3 )) && [[ -n ${git_aliases[$words[2]]} ]] ; then
-    local -a tmpwords
-    tmpwords=(${words[1]} ${(z)git_aliases[$words[2]]})
-    if [[ -z "${words[3,-1]}" ]] ; then
-        tmpwords[$(( ${#tmpwords} + 1 ))]=""
-    else
-        tmpwords+=("${words[3,-1]}")
-    fi
-    words=("${tmpwords[@]}")
-    (( CURRENT += ${#${(z)git_aliases[$words[2]]}} - 1 ))
-    unset tmpwords
-  fi
 
   if [[ $words[1] == git ]]; then