| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 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 import argparse | 6 import argparse |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import subprocess | 9 import subprocess |
| 10 import sys | 10 import sys |
| 11 import urllib2 | 11 import urllib2 |
| 12 from utils import commit | 12 from utils import commit |
| 13 from utils import mojo_root_dir | 13 from utils import mojo_root_dir |
| 14 from utils import system | 14 from utils import system |
| 15 | 15 |
| 16 import patch | 16 import patch |
| 17 | 17 |
| 18 # These directories are snapshotted from chromium without modifications. | 18 # These directories are snapshotted from chromium without modifications. |
| 19 dirs_to_snapshot = [ | 19 dirs_to_snapshot = [ |
| 20 "base", | 20 "base", |
| 21 "build", | 21 "build", |
| 22 "cc", | 22 "cc", |
| 23 "gin", | |
| 24 "gpu", | 23 "gpu", |
| 25 "sandbox/linux", | 24 "sandbox/linux", |
| 26 "sdch", | 25 "sdch", |
| 27 "skia", | 26 "skia", |
| 28 "testing", | 27 "testing", |
| 29 "third_party/android_testrunner", | 28 "third_party/android_testrunner", |
| 30 "third_party/ashmem", | 29 "third_party/ashmem", |
| 31 "third_party/binutils", | 30 "third_party/binutils", |
| 32 "third_party/boringssl", | 31 "third_party/boringssl", |
| 33 "third_party/brotli", | 32 "third_party/brotli", |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 128 |
| 130 print "Restoring files whose contents don't track Chromium" | 129 print "Restoring files whose contents don't track Chromium" |
| 131 for f in files_not_to_roll: | 130 for f in files_not_to_roll: |
| 132 system(["git", "checkout", pre_roll_commit, "--", f], cwd=mojo_root_dir) | 131 system(["git", "checkout", pre_roll_commit, "--", f], cwd=mojo_root_dir) |
| 133 if files_not_to_roll: | 132 if files_not_to_roll: |
| 134 commit("Restored pre-roll versions of files that don't get rolled") | 133 commit("Restored pre-roll versions of files that don't get rolled") |
| 135 return 0 | 134 return 0 |
| 136 | 135 |
| 137 if __name__ == "__main__": | 136 if __name__ == "__main__": |
| 138 sys.exit(main()) | 137 sys.exit(main()) |
| OLD | NEW |