Remove code duplication and improve style.

scm.py

 # Copyright (c) 2006-2009 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import os
 import re
@@ skipping 197 matching lines @@
     svn_branch = ''
     if len(svn_refs) == 1:
       # Only one svn branch exists -- seems like a good candidate.
       svn_branch = svn_refs.values()[0]
     elif len(svn_refs) > 1:
       # We have more than one remote branch available.  We don't
       # want to go through all of history, so read a line from the
       # pipe at a time.
       # The -100 is an arbitrary limit so we don't search forever.
       cmd = ['git', 'log', '-100', '--pretty=medium']
-      proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
+      proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE, cwd=cwd)
       for line in proc.stdout:
         match = git_svn_re.match(line)
         if match:
           url = match.group(1)
           if url in svn_refs:
             svn_branch = svn_refs[url]
             proc.stdout.close()  # Cut pipe.
             break
     return svn_branch
 
@@ skipping 135 matching lines @@
 
     Args:
       args: A sequence of command line parameters to be passed to svn.
       in_directory: The directory where svn is to be run.
 
     Returns:
       The output sent to stdout as a string.
     """
     c = [SVN.COMMAND]
     c.extend(args)
-
-    # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for
-    # the svn.exe executable, but shell=True makes subprocess on Linux fail
-    # when it's called with a list because it only tries to execute the
-    # first string ("svn").
     stderr = None
     if not print_error:
       stderr = subprocess.PIPE
-    return subprocess.Popen(c,
-                            cwd=in_directory,
-                            shell=(sys.platform == 'win32'),
-                            stdout=subprocess.PIPE,
-                            stderr=stderr).communicate()[0]
+    return gclient_utils.Popen(c, cwd=in_directory, stdout=subprocess.PIPE,
+        stderr=stderr).communicate()[0]
 
   @staticmethod
   def RunAndGetFileList(verbose, args, in_directory, file_list):
     """Runs svn checkout, update, or status, output to stdout.
 
     The first item in args must be either "checkout", "update", or "status".
 
     svn's stdout is parsed to collect a list of files checked out or updated.
     These files are appended to file_list.  svn's stdout is also printed to
     sys.stdout as in Run.
@@ skipping 540 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)