commit eceda5af1e6bc119cecc25f54450153f8b33ed53
author mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sun Mar 13 00:02:24 2011 +0000
committer mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sun Mar 13 00:02:24 2011 +0000
tree 13d2d95a0f7f16fb22ad7318fd704c425a3b0486
parent 1edee69142be931bdaa5b3ae760e1c4c02cbaf1a

Use TERM to distinguish between console and msysgit.

It is cleaner this way since in Win32 console, the
value is always "dumb" while in msysgit it is always
"msys" The user shouldn't change the value of $TERM
in msysgit otherwise their whole copy of msysgit
will be flaky.

BUG=70548
TEST=check $TERM in windows

Review URL: http://codereview.chromium.org/6686027

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77954 0039d316-1c4b-4281-b951-d872f2087c98

git_cl/git_cl.py

diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
index 3b7ca33..0c50651 100644
--- a/git_cl/git_cl.py
+++ b/git_cl/git_cl.py
@@ -712,9 +712,8 @@
 
   # Open up the default editor in the system to get the CL description.
   cmd = [editor, filename]
-  if sys.platform == 'win32' and 'mingw\\bin' in os.environ['PATH']:
-    # Msysgit requires the usage of 'env' to be present. The only way to
-    # accomplish that is by reading the environment variable for mingw\bin.
+  if sys.platform == 'win32' and os.environ['TERM'] == 'msys':
+    # Msysgit requires the usage of 'env' to be present.
     cmd.insert(0, 'env')
   try:
     subprocess.check_call(cmd)