From fa41ae0c0bfc99cd0cb3d08b85b17d91ede382cc Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Thu, 10 Nov 2011 12:02:03 +0100 Subject: [PATCH] Only master merges set bugs to FixCommitted Fix bug 888479: Only allow master branch merges to set bug status to FixCommitted. For other branches (think stable/diablo or milestone-proposed), set a in-BRANCHNAME tag instead, to allow for efficient searching. Change-Id: I6401ab4ba92f7983040ac8b2008c88490e2589d8 --- modules/gerrit/files/change-merged | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/gerrit/files/change-merged b/modules/gerrit/files/change-merged index c2bc7cf161..a21165e256 100755 --- a/modules/gerrit/files/change-merged +++ b/modules/gerrit/files/change-merged @@ -105,10 +105,14 @@ def send_bug_mail(bug_number, change_url, project, commit, submitter, branch, gi body = '''Reviewed: %s Committed: %s Submitter: %s -Branch: %s +Branch: %s\n''' % (change_url, gitorious_url, submitter, branch) - status fixcommitted - done\n''' % (change_url, gitorious_url, submitter, branch) + if branch == 'master': + body = body + '\n status fixcommitted\n done\n' + else: + branch_name = branch.replace('/','-') + if branch_name.replace('-','').isalnum(): + body = body + '\n tag in-%s\n done\n' % branch_name body = body + '\n' + git_log