| 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 """Applies an issue from Rietveld. | 6 """Applies an issue from Rietveld. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 import getpass | 9 import getpass |
| 10 import logging | 10 import logging |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 gclient_root = gclient_utils.FindGclientRoot(full_dir) | 168 gclient_root = gclient_utils.FindGclientRoot(full_dir) |
| 169 if gclient_root and scm_type: | 169 if gclient_root and scm_type: |
| 170 print( | 170 print( |
| 171 'A DEPS file was updated inside a gclient checkout, running gclient ' | 171 'A DEPS file was updated inside a gclient checkout, running gclient ' |
| 172 'sync.') | 172 'sync.') |
| 173 base_rev = 'BASE' if scm_type == 'svn' else 'HEAD' | 173 base_rev = 'BASE' if scm_type == 'svn' else 'HEAD' |
| 174 gclient_path = os.path.join(BASE_DIR, 'gclient') | 174 gclient_path = os.path.join(BASE_DIR, 'gclient') |
| 175 if sys.platform == 'win32': | 175 if sys.platform == 'win32': |
| 176 gclient_path += '.bat' | 176 gclient_path += '.bat' |
| 177 return subprocess.call( | 177 return subprocess.call( |
| 178 [gclient_path, 'sync', '--revision', base_rev, '--nohooks'], | 178 [ |
| 179 gclient_path, 'sync', |
| 180 '--revision', base_rev, |
| 181 '--nohooks', |
| 182 '--delete_unversioned_trees', |
| 183 ], |
| 179 cwd=gclient_root) | 184 cwd=gclient_root) |
| 180 return 0 | 185 return 0 |
| 181 | 186 |
| 182 | 187 |
| 183 if __name__ == "__main__": | 188 if __name__ == "__main__": |
| 184 fix_encoding.fix_encoding() | 189 fix_encoding.fix_encoding() |
| 185 sys.exit(main()) | 190 sys.exit(main()) |
| OLD | NEW |