Chromium Code Reviews| 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 """ Check out the Skia sources. """ | 6 """ Check out the Skia sources. """ |
| 7 | 7 |
| 8 | 8 |
| 9 from utils import file_utils | 9 from utils import file_utils |
| 10 from utils import gclient_utils | 10 from utils import gclient_utils |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 | 56 |
| 57 # Run "gclient config" with the spec we just built. | 57 # Run "gclient config" with the spec we just built. |
| 58 gclient_utils.Config(spec=gclient_spec) | 58 gclient_utils.Config(spec=gclient_spec) |
| 59 | 59 |
| 60 # Run "gclient sync" | 60 # Run "gclient sync" |
| 61 try: | 61 try: |
| 62 if self._is_try: | 62 if self._is_try: |
| 63 # Clean our checkout to make sure we don't have a patch left over. | 63 # Clean our checkout to make sure we don't have a patch left over. |
| 64 gclient_utils.Revert() | 64 gclient_utils.Revert() |
| 65 gclient_utils.Sync( | 65 gclient_utils.Sync( |
| 66 branches=[solution['name'] for solution in solution_dicts], | 66 branches=[solution['name'] for solution in solution_dicts |
| 67 if not solution['url'].endswith('.git')], | |
|
scroggo
2013/06/24 17:43:16
I assume there is some other method we'll be using
borenet
2013/06/25 18:19:12
Does this actually cause the git repository to be
scroggo
2013/06/25 19:28:56
It does, but I agree with your concern about keepi
| |
| 67 revision=self._revision, | 68 revision=self._revision, |
| 68 verbose=True, | 69 verbose=True, |
| 69 manually_grab_svn_rev=True, | 70 manually_grab_svn_rev=True, |
| 70 force=True, | 71 force=True, |
| 71 delete_unversioned_trees=True) | 72 delete_unversioned_trees=True) |
| 72 got_revision = gclient_utils.GetCheckedOutRevision() | 73 got_revision = gclient_utils.GetCheckedOutRevision() |
| 73 except Exception: | 74 except Exception: |
| 74 # If the sync fails, clear the checkout and try again. | 75 # If the sync fails, clear the checkout and try again. |
| 75 build_dir = os.path.abspath(os.curdir) | 76 build_dir = os.path.abspath(os.curdir) |
| 76 os.chdir(os.pardir) | 77 os.chdir(os.pardir) |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 91 if self._revision and got_revision != self._revision: | 92 if self._revision and got_revision != self._revision: |
| 92 raise BuildStepFailure('Actually-synced revision is different from the ' | 93 raise BuildStepFailure('Actually-synced revision is different from the ' |
| 93 'requested revision.') | 94 'requested revision.') |
| 94 | 95 |
| 95 # Print the obtained revision number so that the master can parse it. | 96 # Print the obtained revision number so that the master can parse it. |
| 96 print 'Skia updated to revision %d' % got_revision | 97 print 'Skia updated to revision %d' % got_revision |
| 97 | 98 |
| 98 | 99 |
| 99 if '__main__' == __name__: | 100 if '__main__' == __name__: |
| 100 sys.exit(BuildStep.RunBuildStep(Update)) | 101 sys.exit(BuildStep.RunBuildStep(Update)) |
| OLD | NEW |