Index: gclient_scm.py |
=================================================================== |
--- gclient_scm.py (revision 30264) |
+++ gclient_scm.py (working copy) |
@@ -251,7 +251,7 @@ |
command = ['checkout', url, checkout_path] |
if revision: |
command.extend(['--revision', str(revision)]) |
- RunSVNAndGetFileList(command, self._root_dir, file_list) |
+ RunSVNAndGetFileList(options, command, self._root_dir, file_list) |
return |
# Get the existing scm url and the revision number of the current checkout. |
@@ -309,7 +309,7 @@ |
command = ['checkout', url, checkout_path] |
if revision: |
command.extend(['--revision', str(revision)]) |
- RunSVNAndGetFileList(command, self._root_dir, file_list) |
+ RunSVNAndGetFileList(options, command, self._root_dir, file_list) |
return |
@@ -323,7 +323,7 @@ |
command = ["update", checkout_path] |
if revision: |
command.extend(['--revision', str(revision)]) |
- RunSVNAndGetFileList(command, self._root_dir, file_list) |
+ RunSVNAndGetFileList(options, command, self._root_dir, file_list) |
def revert(self, options, args, file_list): |
"""Reverts local modifications. Subversion specific. |
@@ -374,7 +374,7 @@ |
try: |
# svn revert is so broken we don't even use it. Using |
# "svn up --revision BASE" achieve the same effect. |
- RunSVNAndGetFileList(['update', '--revision', 'BASE'], path, |
+ RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path, |
file_list) |
except OSError, e: |
# Maybe the directory disapeared meanwhile. We don't want it to throw an |
@@ -396,7 +396,7 @@ |
% (' '.join(command), path)) |
# There's no file list to retrieve. |
else: |
- RunSVNAndGetFileList(command, path, file_list) |
+ RunSVNAndGetFileList(options, command, path, file_list) |
def pack(self, options, args, file_list): |
"""Generates a patch file which can be applied to the root of the |
@@ -546,7 +546,7 @@ |
stderr=stderr).communicate()[0] |
-def RunSVNAndGetFileList(args, in_directory, file_list): |
+def RunSVNAndGetFileList(options, 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". |
@@ -556,6 +556,7 @@ |
sys.stdout as in RunSVN. |
Args: |
+ options: command line options to gclient |
args: A sequence of command line parameters to be passed to svn. |
in_directory: The directory where svn is to be run. |
@@ -595,8 +596,8 @@ |
RunSVNAndFilterOutput(args, |
in_directory, |
+ options.verbose, |
True, |
- True, |
CaptureMatchingLines) |
def RunSVNAndFilterOutput(args, |