File tree Expand file tree Collapse file tree
cumulusci_ado/vcs/ado/dependencies Expand file tree Collapse file tree Original file line number Diff line number Diff line change 99 add_dependency_pin_class ,
1010)
1111from cumulusci .core .exceptions import DependencyResolutionError
12- from cumulusci .core .utils import deep_merge_plugins
1312from cumulusci .vcs .bootstrap import get_remote_project_config
1413from pydantic .v1 import AnyUrl , root_validator
1514
@@ -47,19 +46,7 @@ def get_ado_repo(project_config, url) -> ADORepository:
4746 f"Branch { project_config .repo_branch } not found in repository { repo .clone_url } : { e } "
4847 )
4948
50- remote_config = get_remote_project_config (repo , branch )
51-
52- # Remote config does not have the plugin configuration. Copying it from local it does not exist.
53- # Else update the missing key values.
54- if remote_config .plugins is None :
55- remote_config .config ["plugins" ] = project_config .plugins
56- else :
57- # Merge project plugins into remote plugins, keeping remote values for existing keys
58- remote_config .config ["plugins" ] = deep_merge_plugins (
59- remote_config .config ["plugins" ], project_config .plugins
60- )
61-
62- repo .project_config = remote_config
49+ repo .project_config = get_remote_project_config (repo , branch )
6350
6451 return repo
6552 except ADOApiNotFoundError as e :
You can’t perform that action at this time.
0 commit comments