_autoenv_hash_pair: do not use a subshell (#81)

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index 166213a4caa91377d7828e3004f04cb4de254ae9..538e92fcb1db2c30f469f734729ac654934e9216 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -72,14 +72,12 @@ _autoenv_stack_entered_add() {
   # Remove any existing entry.
   _autoenv_stack_entered_remove $env_file
 
-  _autoenv_debug "[stack] adding: $env_file" 2
-
   # Append it to the stack, and remember its mtime.
+  _autoenv_debug "[stack] adding: $env_file" 2
   _autoenv_stack_entered+=($env_file)
   _autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file)
 }
 
-
 # zstat_mime helper, conditionally defined.
 # Load zstat module, but only its builtin `zstat`.
 if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
@@ -102,7 +100,6 @@ else
   }
 fi
 
-
 # Remove an entry from the stack.
 _autoenv_stack_entered_remove() {
   local env_file=$1
@@ -140,11 +137,11 @@ _autoenv_stack_entered_contains() {
 
 # Internal function for debug output. {{{
 _autoenv_debug() {
-  local msg="$1"  # Might trigger a bug in Zsh 5.0.5 with shwordsplit.
   local level=${2:-1}
-  if [[ $AUTOENV_DEBUG -lt $level ]]; then
+  if (( AUTOENV_DEBUG < level )); then
     return
   fi
+  local msg="$1"  # Might trigger a bug in Zsh 5.0.5 with shwordsplit.
   # Load zsh color support.
   if [[ -z $color ]]; then
     autoload colors
@@ -175,6 +172,7 @@ _autoenv_hash_pair() {
   local env_file=${1:A}
   local cksum_version=${2:-2}
   local env_cksum=${3:-}
+  ret_pair=
   if [[ -z $env_cksum ]]; then
     if ! [[ -e $env_file ]]; then
       echo "Missing file argument for _autoenv_hash_pair!" >&2
@@ -190,7 +188,7 @@ _autoenv_hash_pair() {
       return 1
     fi
   fi
-  echo ":${env_file}:${env_cksum}:${cksum_version}"
+  ret_pair=":${env_file}:${env_cksum}:${cksum_version}"
 }
 
 
@@ -204,14 +202,14 @@ _autoenv_authorized_pair() {
 
 _autoenv_authorized_env_file() {
   local env_file=$1
-  local pair
-  pair=$(_autoenv_hash_pair $env_file)
-  _autoenv_debug "v2 pair: ${pair}"
-  if ! _autoenv_authorized_pair $pair; then
+  local ret_pair
+  _autoenv_hash_pair $env_file
+  _autoenv_debug "v2 pair: ${ret_pair}"
+  if ! _autoenv_authorized_pair $ret_pair; then
     # Fallback for v1 (SHA-1) pairs
-    pair=$(_autoenv_hash_pair $env_file 1)
-    _autoenv_debug "v1 pair: ${pair}"
-    if _autoenv_authorized_pair $pair; then
+    _autoenv_hash_pair $env_file 1
+    _autoenv_debug "v1 pair: ${ret_pair}"
+    if _autoenv_authorized_pair $ret_pair; then
       # Upgrade v1 entries to v2
       _autoenv_authorize $env_file
     else
@@ -224,7 +222,10 @@ _autoenv_authorize() {
   local env_file=${1:A}
   _autoenv_deauthorize $env_file
   [[ -d ${AUTOENV_AUTH_FILE:h} ]] || mkdir -p ${AUTOENV_AUTH_FILE:h}
-  _autoenv_hash_pair $env_file >>| $AUTOENV_AUTH_FILE
+  {
+    local ret_pair
+    _autoenv_hash_pair $env_file && echo "$ret_pair"
+  } >>| $AUTOENV_AUTH_FILE
 }
 
 # Deauthorize a given filename, by removing it from the auth file.
@@ -293,27 +294,26 @@ _autoenv_source() {
   # XXX: pollutes environment with e.g. `stash`, and `autostash` will cause
   # an overwritten `stash` function to be called!
   if ! (( $+functions[autostash] )); then
-    if \grep -qE '\b(autostash|autounstash|stash)\b' $autoenv_env_file; then
+    if \grep -qE '\b(autostash|autounstash|stash|unstash)\b' $autoenv_env_file; then
       source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
     fi
-    # NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
-    # ${autoenv_env_file:h}.
   fi
 
   # Source the env file.
-  _autoenv_debug "== SOURCE: ${bold_color:-}$autoenv_env_file${reset_color:-}\n      PWD: $PWD"
-  : $(( _autoenv_debug_indent++ ))
+  _autoenv_debug "== SOURCE: $autoenv_event: ${bold_color:-}$autoenv_env_file${reset_color:-} (in $PWD)"
+  (( ++_autoenv_debug_indent ))
 
   local restore_xtrace
   if [[ $AUTOENV_DEBUG -gt 2 && ! -o xtrace ]]; then
     restore_xtrace=1
     setopt localoptions xtrace
   fi
-  source $autoenv_env_file
+
+  varstash_dir=${autoenv_env_file:h} source $autoenv_env_file
   if (( restore_xtrace )); then
     setopt noxtrace
   fi
-  : $(( _autoenv_debug_indent-- ))
+  (( --_autoenv_debug_indent ))
   _autoenv_debug "== END SOURCE =="
 
   if [[ $autoenv_event == enter ]]; then
@@ -342,7 +342,7 @@ _autoenv_get_file_upwards() {
       if [[ ${parent_file[1,2]} == './' ]]; then
         echo ${parent_file#./}
       else
-        echo ${parent_file:A}
+        echo ${parent_file:a}
       fi
       break
     fi
@@ -396,7 +396,7 @@ _autoenv_chpwd_handler() {
   fi
 
   local env_file="$PWD/$AUTOENV_FILE_ENTER"
-  _autoenv_debug "looking for env_file: $env_file"
+  _autoenv_debug "Looking for env_file: $env_file"
 
   # Handle leave event for previously sourced env files.
   if [[ $AUTOENV_HANDLE_LEAVE == 1 ]] && (( $#_autoenv_stack_entered )); then
@@ -405,6 +405,7 @@ _autoenv_chpwd_handler() {
       prev_dir=${prev_file:h}
       if ! [[ ${PWD}/ == ${prev_dir}/* ]]; then
         local env_file_leave=$prev_dir/$AUTOENV_FILE_LEAVE
+        _autoenv_debug "Handling leave event: $env_file_leave"
         if _autoenv_check_authorized_env_file $env_file_leave; then
           varstash_dir=$prev_dir _autoenv_source $env_file_leave leave $prev_dir
         fi
@@ -442,8 +443,6 @@ _autoenv_chpwd_handler() {
   # Source the enter env file.
   _autoenv_debug "Sourcing from chpwd handler: $env_file"
   _autoenv_source $env_file enter
-
-  : $(( _autoenv_debug_indent++ ))
 }
 # }}}