Move code starting the editor into a common function.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import logging
 import optparse
 import os
 import re
 import sys
-import tempfile
 import textwrap
 import urlparse
 import urllib2
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
 try:
   import simplejson as json  # pylint: disable=F0401
 except ImportError:
   try:
     import json  # pylint: disable=F0401
   except ImportError:
     # Fall back to the packaged version.
     sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
     import simplejson as json  # pylint: disable=F0401
 
 
 from third_party import upload
 import breakpad  # pylint: disable=W0611
 import fix_encoding
+import gclient_utils
 import presubmit_support
 import rietveld
 import scm
 import subprocess2
 import watchlists
 
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
@@ skipping 592 matching lines @@
 # This will displayed on the codereview site.
 # The first line will also be used as the subject of the review.
 """
     initial_text += self.description
     if 'R=' not in self.description and self.reviewers:
       initial_text += '\nR=' + self.reviewers
     if 'BUG=' not in self.description:
       initial_text += '\nBUG='
     if 'TEST=' not in self.description:
       initial_text += '\nTEST='
-    self._ParseDescription(UserEditedLog(initial_text))
+    content = gclient_utils.RunEditor(initial_text, True)
+    if not content:
+      DieWithError('Running editor failed')
+    content = re.compile(r'^#.*$', re.MULTILINE).sub('', content).strip()
+    if not content:
+      DieWithError('No CL description, aborting')
+    self._ParseDescription(content)
 
   def _ParseDescription(self, description):
     if not description:
       self.description = description
       return
 
     parsed_lines = []
     reviewers_regexp = re.compile('\s*R=(.+)')
     reviewers = ''
     subject = ''
@@ skipping 155 matching lines @@
     log_args = [args[0] + '..']
   elif len(args) == 1 and args[0].endswith('...'):
     log_args = [args[0][:-1]]
   elif len(args) == 2:
     log_args = [args[0] + '..' + args[1]]
   else:
     log_args = args[:]  # Hope for the best!
   return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
 
 
-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()
-
-  # Open up the default editor in the system to get the CL description.
-  try:
-    cmd = '%s %s' % (editor, filename)
-    if sys.platform == 'win32' and os.environ.get('TERM') == 'msys':
-      # Msysgit requires the usage of 'env' to be present.
-      cmd = 'env ' + cmd
-    # shell=True to allow the shell to handle all forms of quotes in $EDITOR.
-    try:
-      subprocess2.check_call(cmd, shell=True)
-    except subprocess2.CalledProcessError, e:
-      DieWithError('Editor returned %d' % e.returncode)
-    fileobj = open(filename)
-    text = fileobj.read()
-    fileobj.close()
-  finally:
-    os.remove(filename)
-
-  if not text:
-    return
-
-  stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
-  return stripcomment_re.sub('', text).strip()
-
-
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
 
 
 def CMDpresubmit(parser, args):
   """run presubmit tests on the current changelist"""
@@ skipping 570 matching lines @@
              '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__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))