Merge branch 'master' into bugfix/2078a-allow-locking-in-virtualenv

pypa · May 15, 2018 · 0d958da · 0d958da
2 parents 4e2fe01 + da5a8b3
commit 0d958da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pipenv/patched/pew/pew.py b/pipenv/patched/pew/pew.py
@@ -215,6 +215,8 @@ def shell(env, cwd=None):
             inve(env, shell, '-c', shell_check)
         except CalledProcessError:
             return
+    if shell_name in ('Cmder', 'cmd'):
+        os.environ['PROMPT'] = '({0}) {1}'.format(env, os.environ['PROMPT'])
     if shell_name == 'bash':
         fork_bash(env, cwd)
     elif shell_name == 'Cmder':

diff --git a/tasks/vendoring/patches/patched/pew-windows-env-name-in-prompt.patch b/tasks/vendoring/patches/patched/pew-windows-env-name-in-prompt.patch
@@ -0,0 +1,13 @@
+diff --git a/pipenv/patched/pew/pew.py b/pipenv/patched/pew/pew.py
+index 2d3889a0..07dbdf4f 100644
+--- a/pipenv/patched/pew/pew.py
++++ b/pipenv/patched/pew/pew.py
+@@ -215,6 +215,8 @@ def shell(env, cwd=None):
+             inve(env, shell, '-c', shell_check)
+         except CalledProcessError:
+             return
++    if shell_name in ('Cmder', 'cmd'):
++        os.environ['PROMPT'] = '({0}) {1}'.format(env, os.environ['PROMPT'])
+     if shell_name == 'bash':
+         fork_bash(env, cwd)
+     elif shell_name == 'Cmder':