linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 32bacf8d02 into b6ea876971

Browse source
This commit is contained in:
Capi Etheriel 2013-04-26 21:22:23 -07:00
commit bcab3f3235
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/git.zsh
View file

@ -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" 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 # Checks if working tree is dirty
parse_git_dirty() { parse_git_dirty() {

35
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -7,33 +7,38 @@ if [[ -f "$wrapsource" ]]; then
# Automatically activate Git projects' virtual environments based on the # Automatically activate Git projects' virtual environments based on the
# directory name of the project. Virtual environment name can be overridden # 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 # 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 # Check that this is a Git repo
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` local repo_root=`git_get_root`
if (( $? == 0 )); then if [[ -n "$repo_root" ]]; then
# Check for virtualenv name override # Check for virtualenv name override
ENV_NAME=`basename "$PROJECT_ROOT"` local env_name=`basename "$repo_root"`
if [[ -f "$PROJECT_ROOT/.venv" ]]; then if [[ -f "$repo_root/.venv" ]]; then
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` env_name=`cat "$repo_root/.venv"`
fi fi
# Activate the environment only if it is not already active # Activate the environment only if it is not already active
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$env_name" ]]; then
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then if [[ -e "$WORKON_HOME/$env_name/bin/activate" ]]; then
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" workon "$env_name" && export CD_VIRTUAL_ENV="$env_name"
else
_deactivate
fi fi
fi fi
elif [ $CD_VIRTUAL_ENV ]; then else
# We've just left the repo, deactivate the environment # We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically # Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV _deactivate
fi fi
unset PROJECT_ROOT
} }
# New cd function that does the virtualenv magic function _deactivate() {
function cd { if [[ -n $CD_VIRTUAL_ENV ]]; then
builtin cd "$@" && workon_cwd deactivate && unset CD_VIRTUAL_ENV
fi
} }
# Add hook to chpwd function
add-zsh-hook chpwd _workon_cwd
fi fi
else else
print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper_lazy.sh. Please install with \`pip install virtualenvwrapper\`." print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper_lazy.sh. Please install with \`pip install virtualenvwrapper\`."