Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add owner/name prefix to PR number in “Auto merge of …”/“Rollup merge of …” message #145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add owner/name prefix to PR number in “Auto merge of …”/“Rollup merge of …” message #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d073f62
Add owner/name prefix to PR number in “Auto merge of …” message
steffahn Jun 21, 2021
235af23
Add owner/name prefix to PR number in “Rollup merge of …” message
steffahn Jun 21, 2021
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
4 changes: 3 additions & 1 deletion homu/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,9 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg,
lambda: "create_merge: attempting merge {} into {} on {!r}"
.format(state.head_sha, branch, state.get_repo()))

merge_msg = 'Auto merge of #{} - {}, r={}\n\n{}\n\n{}'.format(
merge_msg = 'Auto merge of {}/{}#{} - {}, r={}\n\n{}\n\n{}'.format(
state.owner,
state.name,
state.num,
state.head_ref,
'<try>' if state.try_ else state.approved_by,
Expand Down
4 changes: 3 additions & 1 deletion homu/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@ def rollup(user_gh, state, repo_label, repo_cfg, repo):
state.body = suppress_pings(state.body)
state.body = suppress_ignore_block(state.body)

merge_msg = 'Rollup merge of #{} - {}, r={}\n\n{}\n\n{}'.format(
merge_msg = 'Rollup merge of {}/{}#{} - {}, r={}\n\n{}\n\n{}'.format(
state.owner,
state.name,
state.num,
state.head_ref,
state.approved_by,
Expand Down