Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from common import git_repository | 5 from common import git_repository |
| 6 from common import http_client_appengine | 6 from common import http_client_appengine |
| 7 from common import dependency | 7 from common import dependency |
| 8 from common import deps_parser | 8 from common import deps_parser |
| 9 | 9 |
| 10 | 10 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 dependency.DependencyRoll( | 107 dependency.DependencyRoll( |
| 108 path, new_dep.repo_url, old_revision, new_dep.revision)) | 108 path, new_dep.repo_url, old_revision, new_dep.revision)) |
| 109 | 109 |
| 110 for path, old_dep in old_deps.iteritems(): | 110 for path, old_dep in old_deps.iteritems(): |
| 111 if path not in new_deps: | 111 if path not in new_deps: |
| 112 rolls.append( | 112 rolls.append( |
| 113 dependency.DependencyRoll( | 113 dependency.DependencyRoll( |
| 114 path, old_dep.repo_url, old_dep.revision, None)) | 114 path, old_dep.repo_url, old_dep.revision, None)) |
| 115 | 115 |
| 116 return rolls | 116 return rolls |
| 117 | |
| 118 | |
| 119 def GetDEPSRollsDict(old_cr_revision, new_cr_revision, os_platform): | |
| 120 """Gets dep_path to DependencyRoll dictionary for deps in | |
| 121 (old_cr_revision, new_cr_revision]. | |
| 122 | |
| 123 Args: | |
| 124 old_cr_revision (str): The Git commit hash for the old Chromium revision. | |
| 125 new_cr_revision (str): The Git commit hash for the new Chromium revision. | |
| 126 os_platform (str): The target OS platform of the Chrome or test binary. | |
|
Martin Barbella
2016/04/19 22:21:28
|platform| would probably have the same meaning he
Sharu Jiang
2016/04/20 18:54:24
This is to be consist with other functions in this
| |
| 127 | |
| 128 Returns: | |
| 129 A dict, mapping dep path to DependencyRoll. | |
| 130 """ | |
| 131 deps_rolls = GetChromiumDEPSRolls(old_cr_revision, new_cr_revision, | |
| 132 os_platform) | |
| 133 # Add chromium as dependency roll. | |
| 134 deps_rolls.append(dependency.DependencyRoll( | |
| 135 _CHROMIUM_ROOT_DIR, _CHROMIUM_REPO_MASTER, | |
| 136 old_cr_revision, new_cr_revision)) | |
| 137 | |
| 138 deps_rolls_dict = {} | |
| 139 for dep_roll in deps_rolls: | |
| 140 deps_rolls_dict[dep_roll.path] = dep_roll | |
| 141 | |
| 142 return deps_rolls_dict | |
| OLD | NEW |