NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot_merge: staging logging

Browse Source 
The log message only indicated whether the PR was squashed or not, but
that's not actually useful.

Improve the message to log the actual merge method, for
information. The old "squash" (aka squash flag set and no merge
method, since an actual squash merge method was reintroduced a while
ago) has been renamed to "single" for the purpose of this display.
This commit is contained in:
Xavier Morel 2022-06-29 11:11:59 +02:00
parent e8ae5ec263
commit 2b3ee48ebd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runbot_merge/models/pull_requests.py
View File

@ -2026,8 +2026,9 @@ class Batch(models.Model):
gh = meta[pr.repository]['gh']
_logger.info(
"Staging pr %s for target %s; squash=%s",
pr.display_name, pr.target.name, pr.squash
"Staging pr %s for target %s; method=%s",
pr.display_name, pr.target.name,
pr.merge_method or (pr.squash and 'single') or None
)
target = 'tmp.{}'.format(pr.target.name)