Move code starting the editor into a common function.

gcl.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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 715 matching lines @@
   if (files.get('') or (show_unknown_files and len(unknown_files))):
     print "\n--- Not in any changelist:"
     for item in files.get('', []):
       print "".join(item)
     if show_unknown_files:
       for filename in unknown_files:
         print "?      %s" % filename
   return 0
 
 
-def GetEditor():
-  editor = os.environ.get("SVN_EDITOR")
-  if not editor:
-    editor = os.environ.get("EDITOR")
-
-  if not editor:
-    if sys.platform.startswith("win"):
-      editor = "notepad"
-    else:
-      editor = "vi"
-
-  return editor
-
-
 def GenerateDiff(files, root=None):
   return SVN.GenerateDiff(files, root=root)
 
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     return presubmit_support.PresubmitOutput()
   return DoPresubmitChecks(change_info, committing, True)
 
 
@@ skipping 287 matching lines @@
 
   Only scans the current directory and subdirectories."""
   if len(args) == 0:
     # Generate a random changelist name.
     changename = GenerateChangeName()
   elif args[0] == '--force':
     changename = GenerateChangeName()
   else:
     changename = args[0]
   change_info = ChangeInfo.Load(changename, GetRepositoryRoot(), False, True)
-  silent = FilterFlag(args, "--silent")
 
   # Verify the user is running the change command from a read-write checkout.
   svn_info = SVN.CaptureInfo('.')
   if not svn_info:
     ErrorExit("Current checkout is unversioned.  Please retry with a versioned "
               "directory.")
 
   if len(args) == 2:
     if not os.path.isfile(args[1]):
       ErrorExit('The change "%s" doesn\'t exist.' % args[1])
@@ skipping 28 matching lines @@
   affected_files = [x for x in other_files if file_re.match(x[0])]
   unaffected_files = [x for x in other_files if not file_re.match(x[0])]
 
   description = description.rstrip() + '\n'
 
   separator1 = ("\n---All lines above this line become the description.\n"
                 "---Repository Root: " + change_info.GetLocalRoot() + "\n"
                 "---Paths in this changelist (" + change_info.name + "):\n")
   separator2 = "\n\n---Paths modified but not in any changelist:\n\n"
   
-  description_to_write = description
-  if sys.platform == 'win32':
-    description_to_write = description.replace('\n', '\r\n')
-  
-  text = (description_to_write + separator1 + '\n' +
+  text = (description + separator1 + '\n' +
           '\n'.join([f[0] + f[1] for f in change_info.GetFiles()]))
 
   if change_info.Exists():
     text += (separator2 +
             '\n'.join([f[0] + f[1] for f in affected_files]) + '\n')
   else:
     text += ('\n'.join([f[0] + f[1] for f in affected_files]) + '\n' +
             separator2)
   text += '\n'.join([f[0] + f[1] for f in unaffected_files]) + '\n'
 
-  handle, filename = tempfile.mkstemp(text=True)
-  os.write(handle, text)
-  os.close(handle)
-
-  # Open up the default editor in the system to get the CL description.
-  try:
-    if not silent:
-      cmd = '%s %s' % (GetEditor(), filename)
-      if sys.platform == 'win32' and os.environ.get('TERM') == 'msys':
-        # Msysgit requires the usage of 'env' to be present.
-        cmd = 'env ' + cmd
-      try:
-        # shell=True to allow the shell to handle all forms of quotes in
-        # $EDITOR.
-        subprocess2.check_call(cmd, shell=True)
-      except subprocess2.CalledProcessError, e:
-        ErrorExit('Editor returned %d' % e.returncode)
-    result = gclient_utils.FileRead(filename)
-  finally:
-    os.remove(filename)
-
+  result = gclient_utils.RunEditor(text, False)
   if not result:
-    return 0
+    ErrorExit('Running editor failed')
 
   split_result = result.split(separator1, 1)
   if len(split_result) != 2:
-    ErrorExit("Don't modify the text starting with ---!\n\n" + result)
+    ErrorExit("Don't modify the text starting with ---!\n\n%r" % result)
 
   # Update the CL description if it has changed.
   new_description = split_result[0]
-  
-  if sys.platform == 'win32':
-    new_description = new_description.replace('\r\n', '\n')
-  
   cl_files_text = split_result[1]
   if new_description != description or override_description:
     change_info.description = new_description
     change_info.needs_upload = True
 
   new_cl_files = []
   for line in cl_files_text.splitlines():
     if not len(line):
       continue
     if line.startswith("---"):
@@ skipping 312 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))