Revert 195363

trunk/tools/depot_tools/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 779 matching lines @@
                                        ["diff", "--internal-diff"])
     else:
       # On svn < 1.7, the "--internal-diff" flag doesn't exist.  Using
       # --diff-cmd=diff doesn't always work, since e.g. Windows cmd users may
       # not have a "diff" executable in their path at all.  So we use an empty
       # temporary directory as the config directory, which bypasses any user
       # settings for the diff-cmd.
       bogus_dir = tempfile.mkdtemp()
       try:
         return SVN._GenerateDiffInternal(filenames, cwd, full_move, revision,
-                                         ["diff", "--config-dir", bogus_dir])
+                                         ["diff", "--config_dir", bogus_dir])
       finally:
         gclient_utils.RemoveDirectory(bogus_dir)
 
   @staticmethod
   def _GenerateDiffInternal(filenames, cwd, full_move, revision, diff_command):
     root = os.path.normcase(os.path.join(cwd, ''))
     def RelativePath(path, root):
       """We must use relative paths."""
       if os.path.normcase(path).startswith(root):
         return path[len(root):]
@@ skipping 267 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