Reland - Support msysgit in gcl and git-cl...

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import StringIO
@@ skipping 692 matching lines @@
 
 def UserEditedLog(starting_text):
   """Given some starting text, let the user edit it and return the result."""
   editor = os.getenv('EDITOR', 'vi')
 
   (file_handle, filename) = tempfile.mkstemp()
   fileobj = os.fdopen(file_handle, 'w')
   fileobj.write(starting_text)
   fileobj.close()
 
-  result = None
+  # 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.
+    cmd.insert(0, 'env')
   try:
-    subprocess.check_call(['env', editor, filename], shell=True)
+    subprocess.check_call(cmd)

[TVL, 2011/03/14 13:31:54]

this has broken macosx and probably link when folks have editor set to things
like 'edit -w --resume'.  They needed to bounce through env to handle the fact
that editor is a command and not a single path.

[TVL, 2011/03/14 13:42:16]

Sorry, it's not env as much as shell=True.

[Mohamed Mansour, 2011/03/14 14:01:33]

Hi TVL, would changing cmd = [editor, filename] to "cmd = editor.split() +
[filename]" work ?

     fileobj = open(filename)
     result = fileobj.read()
     fileobj.close()
   finally:
     os.remove(filename)
 
   if not result:
     return
 
   stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
@@ skipping 682 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))