OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2009 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 """Client-side script to send a try job to the try server. It communicates to | 5 """Client-side script to send a try job to the try server. It communicates to |
6 the try server by either writting to a svn repository or by directly connecting | 6 the try server by either writting to a svn repository or by directly connecting |
7 to the server by HTTP. | 7 to the server by HTTP. |
8 """ | 8 """ |
9 | 9 |
10 import datetime | 10 import datetime |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 # Small chromium-specific issue here: | 388 # Small chromium-specific issue here: |
389 # git-try uses /usr/bin/python on cygwin but svn.bat will be used | 389 # git-try uses /usr/bin/python on cygwin but svn.bat will be used |
390 # instead of /usr/bin/svn by default. That causes bad things(tm) since | 390 # instead of /usr/bin/svn by default. That causes bad things(tm) since |
391 # Windows' svn.exe has no clue about cygwin paths. Hence force to use | 391 # Windows' svn.exe has no clue about cygwin paths. Hence force to use |
392 # the cygwin version in this particular context. | 392 # the cygwin version in this particular context. |
393 exe = "/usr/bin/svn" | 393 exe = "/usr/bin/svn" |
394 else: | 394 else: |
395 exe = "svn" | 395 exe = "svn" |
396 command = [exe, 'import', '-q', temp_dir, options.svn_repo, '--file', | 396 command = [exe, 'import', '-q', temp_dir, options.svn_repo, '--file', |
397 temp_file.name] | 397 temp_file.name] |
| 398 if scm.SVN.AssertVersion("1.5")[0]: |
| 399 command.append('--no-ignore') |
| 400 |
398 gclient_utils.CheckCall(command) | 401 gclient_utils.CheckCall(command) |
399 except gclient_utils.CheckCallError, e: | 402 except gclient_utils.CheckCallError, e: |
400 out = e.stdout | 403 out = e.stdout |
401 if e.stderr: | 404 if e.stderr: |
402 out += e.stderr | 405 out += e.stderr |
403 raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + out) | 406 raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + out) |
404 finally: | 407 finally: |
405 temp_file.close() | 408 temp_file.close() |
406 shutil.rmtree(temp_dir, True) | 409 shutil.rmtree(temp_dir, True) |
407 | 410 |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
754 print >> sys.stderr, e | 757 print >> sys.stderr, e |
755 return 1 | 758 return 1 |
756 except gclient_utils.Error, e: | 759 except gclient_utils.Error, e: |
757 print >> sys.stderr, e | 760 print >> sys.stderr, e |
758 return 1 | 761 return 1 |
759 return 0 | 762 return 0 |
760 | 763 |
761 | 764 |
762 if __name__ == "__main__": | 765 if __name__ == "__main__": |
763 sys.exit(TryChange(None, [], False)) | 766 sys.exit(TryChange(None, [], False)) |
OLD | NEW |