OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Gclient-specific SCM-specific operations.""" | 5 """Gclient-specific SCM-specific operations.""" |
6 | 6 |
7 from __future__ import print_function | 7 from __future__ import print_function |
8 | 8 |
9 import errno | 9 import errno |
10 import logging | 10 import logging |
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1166 | 1166 |
1167 class SVNWrapper(SCMWrapper): | 1167 class SVNWrapper(SCMWrapper): |
1168 """ Wrapper for SVN """ | 1168 """ Wrapper for SVN """ |
1169 name = 'svn' | 1169 name = 'svn' |
1170 _PRINTED_DEPRECATION = False | 1170 _PRINTED_DEPRECATION = False |
1171 | 1171 |
1172 _MESSAGE = ( | 1172 _MESSAGE = ( |
1173 'Oh hai! You are using subversion. Chrome infra is eager to get rid of', | 1173 'Oh hai! You are using subversion. Chrome infra is eager to get rid of', |
1174 'svn support so please switch to git.', | 1174 'svn support so please switch to git.', |
1175 'Tracking bug: http://crbug.com/475320', | 1175 'Tracking bug: http://crbug.com/475320', |
1176 'Request a new git repository at: ', | 1176 'If you are a project owner, you may request git migration assistance at: ', |
1177 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git') | 1177 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git') |
1178 | 1178 |
1179 def __init__(self, *args, **kwargs): | 1179 def __init__(self, *args, **kwargs): |
1180 super(SVNWrapper, self).__init__(*args, **kwargs) | 1180 super(SVNWrapper, self).__init__(*args, **kwargs) |
1181 suppress_deprecated_notice = os.environ.get( | 1181 suppress_deprecated_notice = os.environ.get( |
1182 'SUPPRESS_DEPRECATED_SVN_NOTICE', False) | 1182 'SUPPRESS_DEPRECATED_SVN_NOTICE', False) |
1183 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice: | 1183 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice: |
1184 SVNWrapper._PRINTED_DEPRECATION = True | 1184 SVNWrapper._PRINTED_DEPRECATION = True |
1185 sys.stderr.write('\n'.join(self._MESSAGE) + '\n') | 1185 sys.stderr.write('\n'.join(self._MESSAGE) + '\n') |
1186 | 1186 |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1642 new_command.append('--force') | 1642 new_command.append('--force') |
1643 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1643 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
1644 new_command.extend(('--accept', 'theirs-conflict')) | 1644 new_command.extend(('--accept', 'theirs-conflict')) |
1645 elif options.manually_grab_svn_rev: | 1645 elif options.manually_grab_svn_rev: |
1646 new_command.append('--force') | 1646 new_command.append('--force') |
1647 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1647 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
1648 new_command.extend(('--accept', 'postpone')) | 1648 new_command.extend(('--accept', 'postpone')) |
1649 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1649 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
1650 new_command.extend(('--accept', 'postpone')) | 1650 new_command.extend(('--accept', 'postpone')) |
1651 return new_command | 1651 return new_command |
OLD | NEW |