Revert r106358 "Get rid of RunShell*() functions in gcl.py to finish the conversion to subprocess2"

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 20 matching lines @@
     import simplejson as json  # pylint: disable=F0401
 
 import fix_encoding
 import gclient_utils
 import presubmit_support
 import rietveld
 from scm import SVN
 import subprocess2
 from third_party import upload
 
-__version__ = '1.2.2'
+__version__ = '1.2.1'
 
 
 CODEREVIEW_SETTINGS = {
   # To make gcl send reviews to a server, check in a file named
   # "codereview.settings" (see |CODEREVIEW_SETTINGS_FILE| below) to your
   # project's base directory and add the following line to codereview.settings:
   # CODE_REVIEW_SERVER: codereview.yourserver.org
 }
 
 # globals that store the root of the current repository and the directory where
@@ skipping 10 matching lines @@
 
 # Global cache of files cached in GetCacheDir().
 FILES_CACHE = {}
 
 # Valid extensions for files we want to lint.
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
 DEFAULT_LINT_IGNORE_REGEX = r"$^"
 
 REVIEWERS_REGEX = r'\s*R=(.+)'
 
-
 def CheckHomeForFile(filename):
   """Checks the users home dir for the existence of the given file.  Returns
   the path to the file if it's there, or None if it is not.
   """
   home_vars = ['HOME']
   if sys.platform in ('cygwin', 'win32'):
     home_vars.append('USERPROFILE')
   for home_var in home_vars:
     home = os.getenv(home_var)
     if home != None:
@@ skipping 138 matching lines @@
 
 def Warn(msg):
   print >> sys.stderr, msg
 
 
 def ErrorExit(msg):
   print >> sys.stderr, msg
   sys.exit(1)
 
 
+def RunShellWithReturnCode(command, print_output=False):
+  """Executes a command and returns the output and the return code."""
+  p = subprocess2.Popen(
+      command, stdout=subprocess2.PIPE,
+      stderr=subprocess2.STDOUT, universal_newlines=True)
+  if print_output:
+    output_array = []
+    while True:
+      line = p.stdout.readline()
+      if not line:
+        break
+      if print_output:
+        print line.strip('\n')
+      output_array.append(line)
+    output = "".join(output_array)
+  else:
+    output = p.stdout.read()
+  p.wait()
+  p.stdout.close()
+  return output, p.returncode
+
+
+def RunShell(command, print_output=False):
+  """Executes a command and returns the output."""
+  return RunShellWithReturnCode(command, print_output)[0]
+
+
 def FilterFlag(args, flag):
   """Returns True if the flag is present in args list.
 
   The flag is removed from args if present.
   """
   if flag in args:
     args.remove(flag)
     return True
   return False
 
@@ skipping 740 matching lines @@
   commit_message = change_info.description.replace('\r\n', '\n')
   if change_info.issue:
     server = change_info.rietveld
     if not server.startswith("http://") and not server.startswith("https://"):
       server = "http://" + server
     commit_message += ('\nReview URL: %s/%d' % (server, change_info.issue))
 
   handle, commit_filename = tempfile.mkstemp(text=True)
   os.write(handle, commit_message)
   os.close(handle)
-  try:
-    handle, targets_filename = tempfile.mkstemp(text=True)
-    os.write(handle, "\n".join(change_info.GetFileNames()))
-    os.close(handle)
-    try:
-      commit_cmd += ['--file=' + commit_filename]
-      commit_cmd += ['--targets=' + targets_filename]
-      # Change the current working directory before calling commit.
-      previous_cwd = os.getcwd()
-      os.chdir(change_info.GetLocalRoot())
-      output = ''
-      try:
-        output = subprocess2.check_output(commit_cmd)
-      except subprocess2.CalledProcessError, e:
-        ErrorExit('Commit failed.\n%s' % e)
-    finally:
-      os.remove(commit_filename)
-  finally:
-    os.remove(targets_filename)
+
+  handle, targets_filename = tempfile.mkstemp(text=True)
+  os.write(handle, "\n".join(change_info.GetFileNames()))
+  os.close(handle)
+
+  commit_cmd += ['--file=' + commit_filename]
+  commit_cmd += ['--targets=' + targets_filename]
+  # Change the current working directory before calling commit.
+  previous_cwd = os.getcwd()
+  os.chdir(change_info.GetLocalRoot())
+  output = RunShell(commit_cmd, True)
+  os.remove(commit_filename)
+  os.remove(targets_filename)
   if output.find("Committed revision") != -1:
     change_info.Delete()
 
     if change_info.issue:
       revision = re.compile(".*?\nCommitted revision (\d+)",
                             re.DOTALL).match(output).group(1)
       viewvc_url = GetCodeReviewSetting("VIEW_VC")
       change_info.description += '\n'
       if viewvc_url:
         change_info.description += "\nCommitted: " + viewvc_url + revision
@@ skipping 257 matching lines @@
   if args:
     change_info = ChangeInfo.Load(args.pop(0), GetRepositoryRoot(), True, True)
     files = change_info.GetFileNames()
   else:
     files = [f[1] for f in GetFilesNotInCL()]
 
   root = GetRepositoryRoot()
   cmd = ['svn', 'diff']
   cmd.extend([os.path.join(root, x) for x in files])
   cmd.extend(args)
-  return subprocess2.call(cmd)
+  return RunShellWithReturnCode(cmd, print_output=True)[1]
 
 
 @no_args
 def CMDsettings():
   """Prints code review settings for this checkout."""
   # Force load settings
   GetCodeReviewSetting("UNKNOWN")
   del CODEREVIEW_SETTINGS['__just_initialized']
   print '\n'.join(("%s: %s" % (str(k), str(v))
                     for (k,v) in CODEREVIEW_SETTINGS.iteritems()))
@@ skipping 62 matching lines @@
 def CMDpassthru(args):
   """Everything else that is passed into gcl we redirect to svn.
 
   It assumes a change list name is passed and is converted with the files names.
   """
   args = ["svn", args[0]]
   if len(args) > 1:
     root = GetRepositoryRoot()
     change_info = ChangeInfo.Load(args[1], root, True, True)
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
-  return subprocess2.call(args)
+  return RunShellWithReturnCode(args, print_output=True)[1]
 
 
 def Command(name):
   return getattr(sys.modules[__name__], 'CMD' + name, None)
 
 
 def GenUsage(command):
   """Modify an OptParse object with the function's documentation."""
   obj = Command(command)
   display = command
@@ skipping 76 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:]))