| 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 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 "third_party/jstemplate", | 41 "third_party/jstemplate", |
| 42 "third_party/khronos", | 42 "third_party/khronos", |
| 43 "third_party/libXNVCtrl", | 43 "third_party/libXNVCtrl", |
| 44 "third_party/libevent", | 44 "third_party/libevent", |
| 45 "third_party/libjpeg", | 45 "third_party/libjpeg", |
| 46 "third_party/libpng", | 46 "third_party/libpng", |
| 47 "third_party/libxml", | 47 "third_party/libxml", |
| 48 "third_party/markupsafe", | 48 "third_party/markupsafe", |
| 49 "third_party/mesa", | 49 "third_party/mesa", |
| 50 "third_party/modp_b64", | 50 "third_party/modp_b64", |
| 51 "third_party/ots", | |
| 52 "third_party/ply", | 51 "third_party/ply", |
| 53 "third_party/protobuf", | 52 "third_party/protobuf", |
| 54 "third_party/pymock", | 53 "third_party/pymock", |
| 55 "third_party/qcms", | 54 "third_party/qcms", |
| 56 "third_party/re2", | 55 "third_party/re2", |
| 57 "third_party/sfntly", | 56 "third_party/sfntly", |
| 58 "third_party/smhasher", | 57 "third_party/smhasher", |
| 59 "third_party/tcmalloc", | 58 "third_party/tcmalloc", |
| 60 "third_party/yasm", | 59 "third_party/yasm", |
| 61 "third_party/zlib", | 60 "third_party/zlib", |
| (...skipping 67 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 |
|---|
Chromium Code Reviews
Issue 951673002:
Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed)
Base URL: git@github.com:domokit/mojo.git@master