Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: gclient_scm.py

Issue 3421013: Add --ignore-externals to svn update and svn checkout invocations. (Closed)
Patch Set: also delete externals when reverting Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index b5e88617367623b7e5fdea5d220ac1fbdebd3550..0a1bbf12deba1d31379ed20726216f5dcfa7725b 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -840,10 +840,12 @@ class SVNWrapper(SCMWrapper):
for file_status in scm.SVN.CaptureStatus(self.checkout_path):
file_path = os.path.join(self.checkout_path, file_status[1])
- if file_status[0][0] == 'X':
- # Ignore externals.
- logging.info('Ignoring external %s' % file_path)
- continue
+ # Temporarily forcibly delete externals to make sure chromium can build
+ # without svn:external's.
+ #if file_status[0][0] == 'X':
+ # # Ignore externals.
+ # logging.info('Ignoring external %s' % file_path)
+ # continue
if logging.getLogger().isEnabledFor(logging.INFO):
logging.info('%s%s' % (file[0], file[1]))
@@ -916,7 +918,10 @@ class SVNWrapper(SCMWrapper):
def _RunAndGetFileList(self, args, options, file_list, cwd=None):
"""Runs a commands that goes to stdout and grabs the file listed."""
cwd = cwd or self.checkout_path
- scm.SVN.RunAndGetFileList(options.verbose, args, cwd=cwd,
+ scm.SVN.RunAndGetFileList(
+ options.verbose,
+ args + ['--ignore-externals'],
+ cwd=cwd,
file_list=file_list)
@staticmethod
« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698