| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 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 """ Create (if needed) and sync a nested checkout of Skia inside of Chrome. """ | 6 """ Create (if needed) and sync a nested checkout of Skia inside of Chrome. """ |
| 7 | 7 |
| 8 from config_private import SKIA_GIT_URL | 8 from config_private import SKIA_GIT_URL |
| 9 from optparse import OptionParser | 9 from optparse import OptionParser |
| 10 from py.utils.git_utils import GIT |
| 11 from py.utils import git_utils |
| 12 from py.utils import misc |
| 13 from py.utils import shell_utils |
| 10 | 14 |
| 11 from git_utils import GIT | |
| 12 import gclient_utils | 15 import gclient_utils |
| 13 import git_utils | |
| 14 import misc | |
| 15 import os | 16 import os |
| 16 import re | 17 import re |
| 17 import shell_utils | |
| 18 import shlex | 18 import shlex |
| 19 import sys | 19 import sys |
| 20 import urllib2 | 20 import urllib2 |
| 21 | 21 |
| 22 | 22 |
| 23 CHROME_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git' | 23 CHROME_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git' |
| 24 CHROME_LKGR_URL = 'http://chromium-status.appspot.com/git-lkgr' | 24 CHROME_LKGR_URL = 'http://chromium-status.appspot.com/git-lkgr' |
| 25 FETCH = 'fetch.bat' if os.name == 'nt' else 'fetch' | 25 FETCH = 'fetch.bat' if os.name == 'nt' else 'fetch' |
| 26 GCLIENT = 'gclient.bat' if os.name == 'nt' else 'gclient' | 26 GCLIENT = 'gclient.bat' if os.name == 'nt' else 'gclient' |
| 27 GCLIENT_FILE = '.gclient' | 27 GCLIENT_FILE = '.gclient' |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 actual_skia_rev, actual_chrome_rev = Sync( | 185 actual_skia_rev, actual_chrome_rev = Sync( |
| 186 skia_revision=options.skia_revision or SKIA_REV_MASTER, | 186 skia_revision=options.skia_revision or SKIA_REV_MASTER, |
| 187 chrome_revision=options.chrome_revision or CHROME_REV_MASTER, | 187 chrome_revision=options.chrome_revision or CHROME_REV_MASTER, |
| 188 fetch_target=options.fetch_target) | 188 fetch_target=options.fetch_target) |
| 189 print 'Chrome synced to %s' % actual_chrome_rev | 189 print 'Chrome synced to %s' % actual_chrome_rev |
| 190 print 'Skia synced to %s' % actual_skia_rev | 190 print 'Skia synced to %s' % actual_skia_rev |
| 191 | 191 |
| 192 | 192 |
| 193 if __name__ == '__main__': | 193 if __name__ == '__main__': |
| 194 sys.exit(Main()) | 194 sys.exit(Main()) |
| OLD | NEW |