From d073f62b65229ba970aa01c2308b90b0d7ddfe63 Mon Sep 17 00:00:00 2001 From: Frank Steffahn Date: Mon, 21 Jun 2021 14:59:52 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Add=20owner/name=20prefix=20to=20PR=20numbe?= =?UTF-8?q?r=20in=20=E2=80=9CAuto=20merge=20of=20=E2=80=A6=E2=80=9D=20mess?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homu/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homu/main.py b/homu/main.py index 7353f91..c0b2948 100644 --- a/homu/main.py +++ b/homu/main.py @@ -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, '' if state.try_ else state.approved_by, From 235af235d2863c9ea11db74c07f2f3098e8875b0 Mon Sep 17 00:00:00 2001 From: Frank Steffahn Date: Mon, 21 Jun 2021 15:09:59 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Add=20owner/name=20prefix=20to=20PR=20numbe?= =?UTF-8?q?r=20in=20=E2=80=9CRollup=20merge=20of=20=E2=80=A6=E2=80=9D=20me?= =?UTF-8?q?ssage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homu/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homu/server.py b/homu/server.py index 5a607b3..5c1e409 100644 --- a/homu/server.py +++ b/homu/server.py @@ -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,