| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Meta checkout manager supporting both Subversion and GIT.""" | 6 """Meta checkout manager supporting both Subversion and GIT.""" |
| 7 # Files | 7 # Files |
| 8 # .gclient : Current client configuration, written by 'config' command. | 8 # .gclient : Current client configuration, written by 'config' command. |
| 9 # Format is a Python script defining 'solutions', a list whose | 9 # Format is a Python script defining 'solutions', a list whose |
| 10 # entries each are maps binding the strings "name" and "url" | 10 # entries each are maps binding the strings "name" and "url" |
| (...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1283 The chromium code repository has migrated completely to git. | 1283 The chromium code repository has migrated completely to git. |
| 1284 Your SVN-based checkout is now obsolete; you need to create a brand-new | 1284 Your SVN-based checkout is now obsolete; you need to create a brand-new |
| 1285 git checkout by following these instructions: | 1285 git checkout by following these instructions: |
| 1286 | 1286 |
| 1287 http://www.chromium.org/developers/how-tos/get-the-code | 1287 http://www.chromium.org/developers/how-tos/get-the-code |
| 1288 """) | 1288 """) |
| 1289 if (old_git_re.match(url_val.s.strip())): | 1289 if (old_git_re.match(url_val.s.strip())): |
| 1290 url_val.s = CHROMIUM_SRC_URL | 1290 url_val.s = CHROMIUM_SRC_URL |
| 1291 modified = True | 1291 modified = True |
| 1292 | 1292 |
| 1293 # Check for obsolete deps_file | |
| 1294 if url_val.s == CHROMIUM_SRC_URL: | |
| 1295 deps_file_idx = ast_dict_index(solution, 'deps_file') | |
| 1296 if deps_file_idx == -1: | |
| 1297 continue | |
| 1298 deps_file_val = solution.values[deps_file_idx] | |
| 1299 if type(deps_file_val) is not ast.Str: | |
| 1300 continue | |
| 1301 if deps_file_val.s == '.DEPS.git': | |
| 1302 solution.keys[deps_file_idx:deps_file_idx + 1] = [] | |
| 1303 solution.values[deps_file_idx:deps_file_idx + 1] = [] | |
| 1304 modified = True | |
| 1305 | |
| 1306 if not modified: | 1293 if not modified: |
| 1307 return self | 1294 return self |
| 1308 | 1295 |
| 1309 print( | 1296 print( |
| 1310 """ | 1297 """ |
| 1311 WARNING: gclient detected an obsolete setting in your %s file. The file has | 1298 WARNING: gclient detected an obsolete setting in your %s file. The file has |
| 1312 been automagically updated. The previous version is available at %s.old. | 1299 been automagically updated. The previous version is available at %s.old. |
| 1313 """ % (options.config_filename, options.config_filename)) | 1300 """ % (options.config_filename, options.config_filename)) |
| 1314 | 1301 |
| 1315 # Replace existing .gclient with the updated version. | 1302 # Replace existing .gclient with the updated version. |
| (...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2192 print >> sys.stderr, 'Error: %s' % str(e) | 2179 print >> sys.stderr, 'Error: %s' % str(e) |
| 2193 return 1 | 2180 return 1 |
| 2194 finally: | 2181 finally: |
| 2195 gclient_utils.PrintWarnings() | 2182 gclient_utils.PrintWarnings() |
| 2196 | 2183 |
| 2197 | 2184 |
| 2198 if '__main__' == __name__: | 2185 if '__main__' == __name__: |
| 2199 sys.exit(Main(sys.argv[1:])) | 2186 sys.exit(Main(sys.argv[1:])) |
| 2200 | 2187 |
| 2201 # vim: ts=2:sw=2:tw=80:et: | 2188 # vim: ts=2:sw=2:tw=80:et: |
| OLD | NEW |