From c879921457c5be56cd86da92e68ddccc7bb73ca4 Mon Sep 17 00:00:00 2001 From: Scott Drennan Date: Sat, 15 Mar 2014 11:35:35 -0700 Subject: [PATCH 1/2] Fix virtualenv mkvbranch and wovbranch to include branch name --- plugins/available/virtualenv.plugin.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/available/virtualenv.plugin.bash b/plugins/available/virtualenv.plugin.bash index 651bfec7..006f087c 100644 --- a/plugins/available/virtualenv.plugin.bash +++ b/plugins/available/virtualenv.plugin.bash @@ -19,6 +19,7 @@ function mkvbranch { about 'create a new virtualenv for the current branch' group 'virtualenv' + scm_prompt_info >/dev/null 2>&1 mkvirtualenv --distribute "$(basename `pwd`)@$SCM_BRANCH" } @@ -26,6 +27,7 @@ function wovbranch { about 'sets workon branch' group 'virtualenv' + scm_prompt_info >/dev/null 2>&1 workon "$(basename `pwd`)@$SCM_BRANCH" } From 781fde4fd38ca2efcbb47b2b21f00204830dcc41 Mon Sep 17 00:00:00 2001 From: Scott Drennan Date: Sat, 15 Mar 2014 11:40:37 -0700 Subject: [PATCH 2/2] virtualenv plugin - remove obsolete options --- plugins/available/virtualenv.plugin.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/available/virtualenv.plugin.bash b/plugins/available/virtualenv.plugin.bash index 006f087c..331f6080 100644 --- a/plugins/available/virtualenv.plugin.bash +++ b/plugins/available/virtualenv.plugin.bash @@ -11,7 +11,7 @@ function mkvenv { group 'virtualenv' cwd=`basename \`pwd\`` - mkvirtualenv --distribute $cwd + mkvirtualenv $cwd } @@ -20,7 +20,7 @@ function mkvbranch { group 'virtualenv' scm_prompt_info >/dev/null 2>&1 - mkvirtualenv --distribute "$(basename `pwd`)@$SCM_BRANCH" + mkvirtualenv "$(basename `pwd`)@$SCM_BRANCH" } function wovbranch {