Make sure warnings fail the check when may_prompt=False.

scm.py

 # Copyright (c) 2010 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 logging
 import os
@@ skipping 47 matching lines @@
   data.write("@@ -0,0 +1,%d @@\n" % nb_lines)
   # Prepend '+' to every lines.
   for line in file_content:
     data.write('+')
     data.write(line)
   result = data.getvalue()
   data.close()
   return result
 
 
+def determine_scm(root):
+  """Similar to upload.py's version but much simpler.
+
+  Returns 'svn', 'git' or None.
+  """
+  if os.path.isdir(os.path.join(root, '.svn')):
+    return 'svn'
+  elif os.path.isdir(os.path.join(root, '.svn')):
+    return 'git'
+  else:
+    if (0 == subprocess.call(
+          ['git', 'rev-parse', '--show-cdup'],
+          stdout=subprocess.PIPE, cwd=root)):
+      return 'git'
+    else:
+      return None
+
+
 class GIT(object):
   @staticmethod
   def Capture(args, **kwargs):
     return gclient_utils.CheckCall(['git'] + args, print_error=False,
         **kwargs)[0]
 
   @staticmethod
   def CaptureStatus(files, upstream_branch=None):
     """Returns git status.
 
@@ skipping 815 matching lines @@
       if (file_status[0][0] in ('D', 'A', '!') or
           not file_status[0][1:].isspace()):
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except gclient_utils.CheckCallError:
           if not os.path.exists(file_path):
             continue
           raise