From 2b3ee48ebd17aad4eae4ddd0db92579a014883a3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 29 Jun 2022 11:11:59 +0200 Subject: [PATCH] [IMP] runbot_merge: staging logging 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. --- runbot_merge/models/pull_requests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 93c5a378..2b189a38 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -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)