Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions marge/batch_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,20 @@ def ensure_mr_not_changed(self, merge_request):
if getattr(changed_mr, attr) != getattr(merge_request, attr):
raise CannotMerge(error_message.format(attr.replace('_', ' ')))

def merge_batch(self, target_branch, source_branch, no_ff=False):
def merge_batch(self, target_branch, source_branch, no_ff=False, source_repo_url=None, local=False):
if no_ff:
return self._repo.merge(
target_branch,
source_branch,
'--no-ff',
target_branch,
source_branch,
'--no-ff',
source_repo_url,
local
)

return self._repo.fast_forward(
target_branch,
source_branch,
source_repo_url,
local
)

def update_merge_request(
Expand Down Expand Up @@ -177,6 +180,8 @@ def accept_mr(
merge_request.target_branch,
merge_request.source_branch,
self._options.use_no_ff_batches,
source_repo_url,
merge_request.source_project_id == merge_request.source_project_id

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
merge_request.source_project_id == merge_request.source_project_id
merge_request.target_project_id == merge_request.source_project_id

)
# Don't force push in case the remote has changed.
self._repo.push(merge_request.target_branch, force=False)
Expand Down