| 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 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import posixpath | 9 import posixpath |
| 10 import re | 10 import re |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 self.UpdateSubmoduleConfig() | 272 self.UpdateSubmoduleConfig() |
| 273 files = self._Capture(['ls-files']).splitlines() | 273 files = self._Capture(['ls-files']).splitlines() |
| 274 file_list.extend([os.path.join(self.checkout_path, f) for f in files]) | 274 file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 275 if not verbose: | 275 if not verbose: |
| 276 # Make the output a little prettier. It's nice to have some whitespace | 276 # Make the output a little prettier. It's nice to have some whitespace |
| 277 # between projects when cloning. | 277 # between projects when cloning. |
| 278 print('') | 278 print('') |
| 279 return | 279 return |
| 280 | 280 |
| 281 if not managed: | 281 if not managed: |
| 282 self.UpdateSubmoduleConfig() |
| 282 print ('________ unmanaged solution; skipping %s' % self.relpath) | 283 print ('________ unmanaged solution; skipping %s' % self.relpath) |
| 283 return | 284 return |
| 284 | 285 |
| 285 if not os.path.exists(os.path.join(self.checkout_path, '.git')): | 286 if not os.path.exists(os.path.join(self.checkout_path, '.git')): |
| 286 raise gclient_utils.Error('\n____ %s%s\n' | 287 raise gclient_utils.Error('\n____ %s%s\n' |
| 287 '\tPath is not a git repo. No .git dir.\n' | 288 '\tPath is not a git repo. No .git dir.\n' |
| 288 '\tTo resolve:\n' | 289 '\tTo resolve:\n' |
| 289 '\t\trm -rf %s\n' | 290 '\t\trm -rf %s\n' |
| 290 '\tAnd run gclient sync again\n' | 291 '\tAnd run gclient sync again\n' |
| 291 % (self.relpath, rev_str, self.relpath)) | 292 % (self.relpath, rev_str, self.relpath)) |
| (...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1188 new_command.append('--force') | 1189 new_command.append('--force') |
| 1189 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1190 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1190 new_command.extend(('--accept', 'theirs-conflict')) | 1191 new_command.extend(('--accept', 'theirs-conflict')) |
| 1191 elif options.manually_grab_svn_rev: | 1192 elif options.manually_grab_svn_rev: |
| 1192 new_command.append('--force') | 1193 new_command.append('--force') |
| 1193 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1194 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1194 new_command.extend(('--accept', 'postpone')) | 1195 new_command.extend(('--accept', 'postpone')) |
| 1195 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: | 1196 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1196 new_command.extend(('--accept', 'postpone')) | 1197 new_command.extend(('--accept', 'postpone')) |
| 1197 return new_command | 1198 return new_command |
| OLD | NEW |