Skip to content

C
Chromium_Depot_tools
Commit fbfa601e authored by agable's avatar agable Committed by Commit bot
Browse files
Options

Remove svn from gclient recipe module example 

R=martiniss@chromium.org
BUG=640251

Review-Url: https://codereview.chromium.org/2318843002
parent 045d107c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 33 deletions
recipe_modules/gclient/api.py
View file @ fbfa601e
...@@ -133,8 +133,8 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -133,8 +133,8 @@ class GclientApi(recipe_api.RecipeApi):
revisions = [] revisions = []
self.set_patch_project_revision(self.m.properties.get('patch_project'), cfg) self.set_patch_project_revision(self.m.properties.get('patch_project'), cfg)
for i, s in enumerate(cfg.solutions): for i, s in enumerate(cfg.solutions):
if s.safesync_url: # prefer safesync_url in gclient mode if s.safesync_url: # pragma: no cover
continue continue # prefer safesync_url in gclient mode
if i == 0 and s.revision is None: if i == 0 and s.revision is None:
s.revision = RevisionFallbackChain() s.revision = RevisionFallbackChain()
......
recipe_modules/gclient/example.expected/basic.json
View file @ fbfa601e
...@@ -85,13 +85,13 @@ ...@@ -85,13 +85,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
], ],
"cwd": "[SLAVE_BUILD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient setup" "name": "[spec: Angle] gclient setup"
}, },
{ {
"cmd": [ "cmd": [
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"--no-nag-max", "--no-nag-max",
"--delete_unversioned_trees", "--delete_unversioned_trees",
"--revision", "--revision",
"third_party/WebKit@123", "src/third_party/angle@refs/heads/lkgr",
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient sync", "name": "[spec: Angle] gclient sync",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"WebKit/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"Angle/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.name)" "name": "[spec: Angle] gclient recurse (git config user.name)"
}, },
{ {
"cmd": [ "cmd": [
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.email)" "name": "[spec: Angle] gclient recurse (git config user.email)"
}, },
{ {
"cmd": [ "cmd": [
......
recipe_modules/gclient/example.expected/revision.json
View file @ fbfa601e
...@@ -87,13 +87,13 @@ ...@@ -87,13 +87,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
], ],
"cwd": "[SLAVE_BUILD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient setup" "name": "[spec: Angle] gclient setup"
}, },
{ {
"cmd": [ "cmd": [
...@@ -111,7 +111,9 @@ ...@@ -111,7 +111,9 @@
"--no-nag-max", "--no-nag-max",
"--delete_unversioned_trees", "--delete_unversioned_trees",
"--revision", "--revision",
"third_party/WebKit@123", "Angle@abc",
"--revision",
"src/third_party/angle@refs/heads/lkgr",
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
...@@ -119,12 +121,12 @@ ...@@ -119,12 +121,12 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient sync", "name": "[spec: Angle] gclient sync",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"WebKit/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"Angle/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
...@@ -150,7 +152,7 @@ ...@@ -150,7 +152,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.name)" "name": "[spec: Angle] gclient recurse (git config user.name)"
}, },
{ {
"cmd": [ "cmd": [
...@@ -167,7 +169,7 @@ ...@@ -167,7 +169,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.email)" "name": "[spec: Angle] gclient recurse (git config user.email)"
}, },
{ {
"cmd": [ "cmd": [
......
recipe_modules/gclient/example.expected/tryserver.json
View file @ fbfa601e
...@@ -87,13 +87,13 @@ ...@@ -87,13 +87,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
], ],
"cwd": "[SLAVE_BUILD]/src/third_party", "cwd": "[SLAVE_BUILD]/src/third_party",
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient setup" "name": "[spec: Angle] gclient setup"
}, },
{ {
"cmd": [ "cmd": [
...@@ -111,7 +111,9 @@ ...@@ -111,7 +111,9 @@
"--no-nag-max", "--no-nag-max",
"--delete_unversioned_trees", "--delete_unversioned_trees",
"--revision", "--revision",
"third_party/WebKit@123", "Angle@HEAD",
"--revision",
"src/third_party/angle@refs/heads/lkgr",
"--output-json", "--output-json",
"/path/to/tmp/json" "/path/to/tmp/json"
], ],
...@@ -119,12 +121,12 @@ ...@@ -119,12 +121,12 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient sync", "name": "[spec: Angle] gclient sync",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"WebKit/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"Angle/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src/blatley/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
...@@ -150,7 +152,7 @@ ...@@ -150,7 +152,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.name)" "name": "[spec: Angle] gclient recurse (git config user.name)"
}, },
{ {
"cmd": [ "cmd": [
...@@ -167,7 +169,7 @@ ...@@ -167,7 +169,7 @@
"env": { "env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
}, },
"name": "[spec: WebKit] gclient recurse (git config user.email)" "name": "[spec: Angle] gclient recurse (git config user.email)"
}, },
{ {
"cmd": [ "cmd": [
......
recipe_modules/gclient/example.py
View file @ fbfa601e
...@@ -70,15 +70,12 @@ def RunSteps(api): ...@@ -70,15 +70,12 @@ def RunSteps(api):
api.gclient.c = src_cfg api.gclient.c = src_cfg
api.gclient.checkout() api.gclient.checkout()
api.gclient.spec_alias = 'WebKit' api.gclient.spec_alias = 'Angle'
bl_cfg = api.gclient.make_config() bl_cfg = api.gclient.make_config()
soln = bl_cfg.solutions.add() soln = bl_cfg.solutions.add()
soln.name = 'WebKit' soln.name = 'Angle'
soln.url = 'svn://svn.chromium.org/blink/trunk' soln.url = 'https://chromium.googlesource.com/angle/angle.git'
bl_cfg.revisions['third_party/WebKit'] = '123' bl_cfg.revisions['src/third_party/angle'] = 'refs/heads/lkgr'
# Use safesync url for lkgr.
soln.safesync_url = 'https://blink-status.appspot.com/lkgr'
bl_cfg.got_revision_mapping['src/blatley'] = 'got_blatley_revision' bl_cfg.got_revision_mapping['src/blatley'] = 'got_blatley_revision'
api.gclient.checkout( api.gclient.checkout(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment