zuul/zuul
Code Issues Proposed changes

Remove unused arguments in merger

Browse Source 
These function arguments are unused.

Change-Id: Ie807e9366a6c3fb9ea4aee8cb1ad82e553d9ef45
This commit is contained in:
James E. Blair 2024-08-19 09:57:24 -07:00
parent 1fddbdb959
commit fe8e3dfc02
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul/executor/server.py
View File

@ -3938,8 +3938,7 @@ class ExecutorServer(BaseMergeServer):
self.merger.updateRepo(
task.connection_name, task.project_name,
repo_state=task.repo_state,
zuul_event_id=task.zuul_event_id, build=task.build,
process_worker=self.process_worker)
zuul_event_id=task.zuul_event_id, build=task.build)
source = self.connections.getSource(task.connection_name)
project = source.getProject(task.project_name)
task.canonical_name = project.canonical_name

4
zuul/merger/merger.py
View File

@ -616,7 +616,7 @@ class Repo(object):
branch)
Repo._setRef(f"refs/remotes/origin/{branch}", hexsha, repo)
def deleteRef(self, path, repo=None, zuul_event_id=None):
def deleteRef(self, path, zuul_event_id=None):
# This is only used in tests
ref_log = get_annotated_logger(
logging.getLogger("zuul.Repo.Ref"), zuul_event_id)
@ -1139,7 +1139,7 @@ class Merger(object):
retry_timeout=retry_timeout)
def updateRepo(self, connection_name, project_name, repo_state=None,
zuul_event_id=None, build=None, process_worker=None):
zuul_event_id=None, build=None):
"""Fetch from origin if needed
If repo_state is None, then this will always git fetch.