Merge "Rename repo_diff_android.py workspace directories"
This commit is contained in:
@@ -16,8 +16,8 @@ import repo_diff_downstream
|
|||||||
|
|
||||||
HELP_MSG = "Diff a repo (downstream) and its upstream"
|
HELP_MSG = "Diff a repo (downstream) and its upstream"
|
||||||
|
|
||||||
WORKSPACE = "workspace"
|
DOWNSTREAM_WORKSPACE = "downstream"
|
||||||
UPSTREAM_WORKSPACE = "upstream_workspace"
|
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 = "oreo-dev"
|
||||||
@@ -126,7 +126,7 @@ def diff(manifest_url, manifest_branch, tag, upstream_manifest_url,
|
|||||||
upstream_manifest_branch, exclusions_file):
|
upstream_manifest_branch, exclusions_file):
|
||||||
"""Syncs and diffs an Android workspace against an upstream workspace."""
|
"""Syncs and diffs an Android workspace against an upstream workspace."""
|
||||||
|
|
||||||
workspace = os.path.abspath(WORKSPACE)
|
workspace = os.path.abspath(DOWNSTREAM_WORKSPACE)
|
||||||
upstream_workspace = os.path.abspath(UPSTREAM_WORKSPACE)
|
upstream_workspace = os.path.abspath(UPSTREAM_WORKSPACE)
|
||||||
# repo sync downstream source tree
|
# repo sync downstream source tree
|
||||||
repo_sync_specific_release(
|
repo_sync_specific_release(
|
||||||
|
|||||||
Reference in New Issue
Block a user