Reland "Make gclient ready for the Blink (DEPS to main project)"

scm.py

 # Copyright (c) 2012 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 425 matching lines @@
     return os.path.abspath(GIT.Capture(['rev-parse', '--git-dir'], cwd=cwd))
 
   @staticmethod
   def IsInsideWorkTree(cwd):
     try:
       return GIT.Capture(['rev-parse', '--is-inside-work-tree'], cwd=cwd)
     except (OSError, subprocess2.CalledProcessError):
       return False
 
   @staticmethod
+  def IsDirectoryVersioned(cwd, relative_dir):
+    """Checks whether the given |relative_dir| is part of cwd's repo."""
+    return bool(GIT.Capture(['ls-tree', 'HEAD', relative_dir], cwd=cwd))
+
+  @staticmethod
+  def CleanupDir(cwd, relative_dir):
+    """Cleans up untracked file inside |relative_dir|."""
+    return bool(GIT.Capture(['clean', '-df', relative_dir], cwd=cwd))
+
+  @staticmethod
   def GetGitSvnHeadRev(cwd):
     """Gets the most recently pulled git-svn revision."""
     try:
       output = GIT.Capture(['svn', 'info'], cwd=cwd)
       match = re.search(r'^Revision: ([0-9]+)$', output, re.MULTILINE)
       return int(match.group(1)) if match else None
     except (subprocess2.CalledProcessError, ValueError):
       return None
 
   @staticmethod
@@ skipping 704 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise