From 4c91a709472a9965d0d8f93ca829eb7347a056a4 Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Sat, 27 Apr 2013 00:47:14 -0300 Subject: [PATCH 1/5] Add git_get_root function which returns root of current repo --- lib/git.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/git.zsh b/lib/git.zsh index 96598cf5f..cd1bff034 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -5,6 +5,10 @@ function git_prompt_info() { echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" } +# returns root of current repo +function git_get_root() { + echo "$(git rev-parse --show-toplevel 2> /dev/null)" +} # Checks if working tree is dirty parse_git_dirty() { From bce83c941e697c662f4929d7b2c071b46e52e7e0 Mon Sep 17 00:00:00 2001 From: Capi Etheriel Date: Sat, 27 Apr 2013 01:03:52 -0300 Subject: [PATCH 2/5] Use in Virtualenvwrapper plugin --- plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 0ed2565b4..a15bff145 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -7,10 +7,10 @@ if [[ -f "$wrapsource" ]]; then # Automatically activate Git projects' virtual environments based on the # directory name of the project. Virtual environment name can be overridden # by placing a .venv file in the project root with a virtualenv name in it - function workon_cwd { + function _workon_cwd { # Check that this is a Git repo - PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` - if (( $? == 0 )); then + PROJECT_ROOT=`git_get_root` + if [[ -n "$PROJECT_ROOT" ]]; then # Check for virtualenv name override ENV_NAME=`basename "$PROJECT_ROOT"` if [[ -f "$PROJECT_ROOT/.venv" ]]; then @@ -28,11 +28,12 @@ if [[ -f "$wrapsource" ]]; then deactivate && unset CD_VIRTUAL_ENV fi unset PROJECT_ROOT + unset ENV_NAME } # New cd function that does the virtualenv magic function cd { - builtin cd "$@" && workon_cwd + builtin cd "$@" && _workon_cwd } fi else From f81913205e963fe0446aebd678b87bc4be83b21a Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Sat, 27 Apr 2013 01:06:48 -0300 Subject: [PATCH 3/5] Fixes venvwrapper deactivate when switching git repos --- .../virtualenvwrapper/virtualenvwrapper.plugin.zsh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index a15bff145..e46cff93a 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -20,17 +20,25 @@ if [[ -f "$wrapsource" ]]; then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" + else + _deactivate fi fi - elif [ $CD_VIRTUAL_ENV ]; then + else # We've just left the repo, deactivate the environment # Note: this only happens if the virtualenv was activated automatically - deactivate && unset CD_VIRTUAL_ENV + _deactivate fi unset PROJECT_ROOT unset ENV_NAME } + function _deactivate() { + if [[ -n $CD_VIRTUAL_ENV ]]; then + deactivate && unset CD_VIRTUAL_ENV + fi + } + # New cd function that does the virtualenv magic function cd { builtin cd "$@" && _workon_cwd From c35e31a2785c90497b9ac2fdfb2b1d65dbc6b73b Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Sat, 27 Apr 2013 01:11:20 -0300 Subject: [PATCH 4/5] Use local variables. --- .../virtualenvwrapper.plugin.zsh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index e46cff93a..2e3ff99c6 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -9,17 +9,17 @@ if [[ -f "$wrapsource" ]]; then # by placing a .venv file in the project root with a virtualenv name in it function _workon_cwd { # Check that this is a Git repo - PROJECT_ROOT=`git_get_root` - if [[ -n "$PROJECT_ROOT" ]]; then + local repo_root=`git_get_root` + if [[ -n "$repo_root" ]]; then # Check for virtualenv name override - ENV_NAME=`basename "$PROJECT_ROOT"` - if [[ -f "$PROJECT_ROOT/.venv" ]]; then - ENV_NAME=`cat "$PROJECT_ROOT/.venv"` + local env_name=`basename "$repo_root"` + if [[ -f "$repo_root/.venv" ]]; then + env_name=`cat "$repo_root/.venv"` fi # Activate the environment only if it is not already active - if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then - if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then - workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" + if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$env_name" ]]; then + if [[ -e "$WORKON_HOME/$env_name/bin/activate" ]]; then + workon "$env_name" && export CD_VIRTUAL_ENV="$env_name" else _deactivate fi @@ -29,8 +29,6 @@ if [[ -f "$wrapsource" ]]; then # Note: this only happens if the virtualenv was activated automatically _deactivate fi - unset PROJECT_ROOT - unset ENV_NAME } function _deactivate() { From 32bacf8d02f98e9a1b139a4ccc90e0f3927fdc0b Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Sat, 27 Apr 2013 01:14:47 -0300 Subject: [PATCH 5/5] Use chpwd hook instead of overriding cd command --- plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 2e3ff99c6..b4f8405db 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -37,10 +37,8 @@ if [[ -f "$wrapsource" ]]; then fi } - # New cd function that does the virtualenv magic - function cd { - builtin cd "$@" && _workon_cwd - } + # Add hook to chpwd function + add-zsh-hook chpwd _workon_cwd fi else print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper_lazy.sh. Please install with \`pip install virtualenvwrapper\`."