| 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  |     7  | 
|     8 Files |     8 Files | 
|     9   .gclient      : Current client configuration, written by 'config' command. |     9   .gclient      : Current client configuration, written by 'config' command. | 
|    10                   Format is a Python script defining 'solutions', a list whose |    10                   Format is a Python script defining 'solutions', a list whose | 
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   180     # class instantiation. |   180     # class instantiation. | 
|   181     self.recursion_override = None |   181     self.recursion_override = None | 
|   182     # This is a mutable value which has the list of 'target_os' OSes listed in |   182     # This is a mutable value which has the list of 'target_os' OSes listed in | 
|   183     # the current deps file. |   183     # the current deps file. | 
|   184     self.local_target_os = None |   184     self.local_target_os = None | 
|   185  |   185  | 
|   186     # These are only set in .gclient and not in DEPS files. |   186     # These are only set in .gclient and not in DEPS files. | 
|   187     self._custom_vars = custom_vars or {} |   187     self._custom_vars = custom_vars or {} | 
|   188     self._custom_deps = custom_deps or {} |   188     self._custom_deps = custom_deps or {} | 
|   189  |   189  | 
 |   190     # TODO(iannucci): Remove this when all masters are correctly substituting | 
 |   191     # the new blink url. | 
 |   192     if (self._custom_vars.get('webkit_trunk', '') == | 
 |   193         'svn://svn-mirror.golo.chromium.org/webkit-readonly/trunk'): | 
 |   194       self._custom_vars['webkit_trunk'] = ( | 
 |   195         'svn://svn-mirror.golo.chromium.org/blink/trunk') | 
 |   196  | 
|   190     # Post process the url to remove trailing slashes. |   197     # Post process the url to remove trailing slashes. | 
|   191     if isinstance(self._url, basestring): |   198     if isinstance(self._url, basestring): | 
|   192       # urls are sometime incorrectly written as proto://host/path/@rev. Replace |   199       # urls are sometime incorrectly written as proto://host/path/@rev. Replace | 
|   193       # it to proto://host/path@rev. |   200       # it to proto://host/path@rev. | 
|   194       self._url = self._url.replace('/@', '@') |   201       self._url = self._url.replace('/@', '@') | 
|   195     elif not isinstance(self._url, |   202     elif not isinstance(self._url, | 
|   196         (self.FromImpl, self.FileImpl, None.__class__)): |   203         (self.FromImpl, self.FileImpl, None.__class__)): | 
|   197       raise gclient_utils.Error( |   204       raise gclient_utils.Error( | 
|   198           ('dependency url must be either a string, None, ' |   205           ('dependency url must be either a string, None, ' | 
|   199            'File() or From() instead of %s') % self._url.__class__.__name__) |   206            'File() or From() instead of %s') % self._url.__class__.__name__) | 
| (...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1767   except (gclient_utils.Error, subprocess2.CalledProcessError), e: |  1774   except (gclient_utils.Error, subprocess2.CalledProcessError), e: | 
|  1768     print >> sys.stderr, 'Error: %s' % str(e) |  1775     print >> sys.stderr, 'Error: %s' % str(e) | 
|  1769     return 1 |  1776     return 1 | 
|  1770  |  1777  | 
|  1771  |  1778  | 
|  1772 if '__main__' == __name__: |  1779 if '__main__' == __name__: | 
|  1773   fix_encoding.fix_encoding() |  1780   fix_encoding.fix_encoding() | 
|  1774   sys.exit(Main(sys.argv[1:])) |  1781   sys.exit(Main(sys.argv[1:])) | 
|  1775  |  1782  | 
|  1776 # vim: ts=2:sw=2:tw=80:et: |  1783 # vim: ts=2:sw=2:tw=80:et: | 
| OLD | NEW |