Change order of automatic virtualenv activation/deactivation (#6687)

When navigating from a virtualenv project directory, first deactivate the virtualenv. Then, check to see if destination directory is also a virtualenv project directory. If it is activate that virtualenv. See #5817.

Change order of automatic virtualenv activation/deactivation (#6687)
1a0500b0 · Jay Tavares · Robby Russell · 3d6be08e · 1a0500b0
Commit 1a0500b0 authored Dec 21, 2019 by Jay Tavares Committed by Robby Russell Dec 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

virtualenvwrapper.plugin.zsh plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +6 -4

No files found.
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -77,6 +77,12 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
      else
        ENV_NAME=""
      fi
+      
+      if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then
+        # We've just left the repo, deactivate the environment
+        # Note: this only happens if the virtualenv was activated automatically
+        deactivate && unset CD_VIRTUAL_ENV
+      fi
      if [[ "$ENV_NAME" != "" ]]; then
        # Activate the environment only if it is not already active
        if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
@@ -86,10 +92,6 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
            source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
          fi
        fi
-      elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
-        # We've just left the repo, deactivate the environment
-        # Note: this only happens if the virtualenv was activated automatically
-        deactivate && unset CD_VIRTUAL_ENV
      fi
    fi
  }