This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 3f6cd125f fix: Fix wrong merge conflict resolution (#5419)
3f6cd125f is described below
commit 3f6cd125f6ae14b7fd4349bb86b2332f33e812ce
Author: Camille Teruel <[email protected]>
AuthorDate: Fri Jun 9 13:57:30 2023 +0200
fix: Fix wrong merge conflict resolution (#5419)
Co-authored-by: Camille Teruel <[email protected]>
---
backend/python/plugins/azuredevops/azuredevops/main.py | 4 ++--
backend/python/pydevlake/pydevlake/plugin.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/backend/python/plugins/azuredevops/azuredevops/main.py
b/backend/python/plugins/azuredevops/azuredevops/main.py
index f65cde172..cc5f28e2c 100644
--- a/backend/python/plugins/azuredevops/azuredevops/main.py
+++ b/backend/python/plugins/azuredevops/azuredevops/main.py
@@ -128,8 +128,8 @@ class AzureDevOpsPlugin(Plugin):
yield gitextractor(url.geturl(), scope.domain_id(),
connection.proxy)
def extra_stages(self, scope_config_pairs: list[ScopeConfigPair], _):
- if DomainType.CODE in config.entity_types:
- for scope, config in scope_config_pairs:
+ for scope, config in scope_config_pairs:
+ if DomainType.CODE in config.entity_types:
if not scope.is_external():
yield [refdiff(scope.id, config.refdiff)]
diff --git a/backend/python/pydevlake/pydevlake/plugin.py
b/backend/python/pydevlake/pydevlake/plugin.py
index 03a2c5981..3bcfd2dda 100644
--- a/backend/python/pydevlake/pydevlake/plugin.py
+++ b/backend/python/pydevlake/pydevlake/plugin.py
@@ -133,7 +133,6 @@ class Plugin(ABC):
"""
Make a simple pipeline using the scopes declared by the plugin.
"""
- entity_types = entity_types or list(DomainType)
plan = self.make_pipeline_plan(scope_config_pairs, connection)
domain_scopes = []
for tool_scope, _ in scope_config_pairs:
