LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "repo_diff: sync tip of branches of no tag is given" am: c18174e3c2 am: 2ca86f070c

Browse Source 
am: 4f5d3e1f30

Change-Id: Ib1b63799f2e6a2352c5926c9b32efd175d16c85a
This commit is contained in:
Diego Wilson
2017-09-15 19:28:01 +00:00
committed by android-build-merger
parent 833ed7329e 4f5d3e1f30
commit dbffdbf817
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/repo_diff/repo_diff_android.py
View File

@@ -20,9 +20,9 @@ DOWNSTREAM_WORKSPACE = "downstream"
UPSTREAM_WORKSPACE = "upstream" UPSTREAM_WORKSPACE = "upstream"
DEFAULT_MANIFEST_URL = "https://android.googlesource.com/platform/manifest" DEFAULT_MANIFEST_URL = "https://android.googlesource.com/platform/manifest"
DEFAULT_MANIFEST_BRANCH = "oreo-dev" DEFAULT_MANIFEST_BRANCH = "android-8.0.0_r10"
DEFAULT_UPSTREAM_MANIFEST_URL = "https://android.googlesource.com/platform/manifest" DEFAULT_UPSTREAM_MANIFEST_URL = "https://android.googlesource.com/platform/manifest"
DEFAULT_UPSTREAM_MANIFEST_BRANCH = "master" DEFAULT_UPSTREAM_MANIFEST_BRANCH = "android-8.0.0_r1"
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
DEFAULT_EXCLUSIONS_FILE = os.path.join(SCRIPT_DIR, "exclusions.txt") DEFAULT_EXCLUSIONS_FILE = os.path.join(SCRIPT_DIR, "exclusions.txt")
@@ -118,6 +118,8 @@ def repo_sync_specific_release(url, branch, tag, workspace):
repo_init(url, branch, workspace) repo_init(url, branch, workspace)
if tag: if tag:
rev = get_commit_with_keyword(manifest_path, tag) rev = get_commit_with_keyword(manifest_path, tag)
if not rev:
raise(ValueError("could not find a manifest revision for tag " + tag))
repo_init(url, rev, workspace) repo_init(url, rev, workspace)
repo_sync(workspace) repo_sync(workspace)
@@ -135,8 +137,12 @@ def diff(manifest_url, manifest_branch, tag, upstream_manifest_url,
tag, tag,
workspace) workspace)
# get the build_id so that we know which rev of upstream we need build_id = None
build_id = get_build_id(workspace) if tag:
# get the build_id so that we know which rev of upstream we need
build_id = get_build_id(workspace)
if not build_id:
raise(ValueError("Error: could not find the Build ID of " + workspace))
# repo sync upstream source tree # repo sync upstream source tree
repo_sync_specific_release( repo_sync_specific_release(