| OLD | NEW |
| 1 @echo off | 1 @echo off |
| 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 :: This batch file will try to sync the root directory. | 6 :: This batch file will try to sync the root directory. |
| 7 | 7 |
| 8 setlocal | 8 setlocal |
| 9 | 9 |
| 10 :: Windows freaks out if a file is overwritten while it's being executed. Copy | 10 :: Windows freaks out if a file is overwritten while it's being executed. Copy |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 IF not "%%x" == "%GIT_URL%" ( | 53 IF not "%%x" == "%GIT_URL%" ( |
| 54 echo Your depot_tools checkout is configured to fetch from an obsolete URL | 54 echo Your depot_tools checkout is configured to fetch from an obsolete URL |
| 55 choice /N /T 60 /D N /M "Would you like to update it? [y/N]: " | 55 choice /N /T 60 /D N /M "Would you like to update it? [y/N]: " |
| 56 IF not errorlevel 2 ( | 56 IF not errorlevel 2 ( |
| 57 call git config remote.origin.url "%GIT_URL%" | 57 call git config remote.origin.url "%GIT_URL%" |
| 58 ) | 58 ) |
| 59 ) | 59 ) |
| 60 ) | 60 ) |
| 61 call git fetch -q origin > NUL | 61 call git fetch -q origin > NUL |
| 62 call git rebase -q origin/master > NUL | 62 call git rebase -q origin/master > NUL |
| 63 if errorlevel 1 echo Failed to update depot_tools. |
| 64 |
| 63 goto :EOF | 65 goto :EOF |
| 64 | 66 |
| 65 :GIT_SVN_UPDATE | 67 :GIT_SVN_UPDATE |
| 66 cd /d "%DEPOT_TOOLS_DIR%." | 68 cd /d "%DEPOT_TOOLS_DIR%." |
| 67 call git svn rebase -q -q | 69 call git svn rebase -q -q |
| 68 goto :EOF | 70 goto :EOF |
| OLD | NEW |