Merge ba7a5e68e6 into 367e9381df

Use basename when setting prompt segment text for the conda environment to avoid overly long promps when using an environment created outside the default location.

Co-Authored-By: Avraham Shukron <avraham.shukron@gmail.com>

lib/git.zsh

@@ -163,7 +163,7 @@ function git_current_branch() {
 }
 
 # Outputs the name of the previously checked out branch
-# Usage example: git pull origin $(git_current_branch)
+# Usage example: git pull origin $(git_previous_branch)
 # rev-parse --symbolic-full-name @{-1} only prints if it is a branch
 function git_previous_branch() {
   local ref

themes/agnoster.zsh-theme

@@ -227,6 +227,18 @@ prompt_virtualenv() {
   fi
 }
 
+# Anaconda: current working conda env
+# To replace the conda modification of PS1 do `conda config --set changeps1 False`
+# or add 'changeps1: False' to your .condarc file.
+prompt_conda() {
+  local conda_env="$CONDA_DEFAULT_ENV"
+  if [[ -n $conda_env ]]; then
+    if [[ -z $CONDA_PROMPT_MODIFIER ]]; then
+      prompt_segment blue black "conda:$(basename $conda_env)"
+    fi
+  fi
+}
+
 # Status:
 # - was there an error
 # - am I root
@@ -258,6 +270,7 @@ prompt_aws() {
 build_prompt() {
   RETVAL=$?
   prompt_status
+  prompt_conda
   prompt_virtualenv
   prompt_aws
   prompt_context