NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: ensure co-authored-by are at the bottom

Browse Source 
Sometimes people add co-authored-by lines in the middle of their
message, where github ignores them.

Since we previously added properly handling existing (correct) C-A-B
lines in the case where we're adding fixes and signed-off-by, we might
as well fix-up existing but mispalced co-authored-by lines.

Fixes #107
This commit is contained in:
Xavier Morel 2019-05-07 13:22:13 +02:00
parent c9f9b3050b
commit 76ea2a4f5d
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runbot_merge/models/pull_requests.py
View File

@ -901,18 +901,18 @@ class PullRequests(models.Model):
def _build_merge_message(self, message): def _build_merge_message(self, message):
# handle co-authored commits (https://help.github.com/articles/creating-a-commit-with-multiple-authors/) # handle co-authored commits (https://help.github.com/articles/creating-a-commit-with-multiple-authors/)
lines = message.splitlines() original = message.splitlines()
lines = []
coauthors = [] coauthors = []
for idx, line in enumerate(reversed(lines)): for line in original:
if line.startswith('Co-authored-by:'): if line.startswith('Co-authored-by:'):
# remove all empty lines before C-A-B
coauthors.append(line) coauthors.append(line)
continue while lines and not lines[-1]:
if not line.strip(): lines.pop()
continue continue
if idx: lines.append(line.strip())
del lines[-idx:]
break
m = re.search(r'( |{repository})#{pr.number}\b'.format( m = re.search(r'( |{repository})#{pr.number}\b'.format(
pr=self, pr=self,
@ -925,7 +925,7 @@ class PullRequests(models.Model):
if coauthors: if coauthors:
lines.extend(['', '']) lines.extend(['', ''])
lines.extend(reversed(coauthors)) lines.extend(coauthors)
return '\n'.join(lines) return '\n'.join(lines)
def _stage(self, gh, target): def _stage(self, gh, target):

7
runbot_merge/tests/test_basic.py
View File

@ -220,10 +220,13 @@ class TestCommitMessage:
def test_commit_coauthored(self, env, repo, users): def test_commit_coauthored(self, env, repo, users):
""" verify 'closes ...' and 'Signed-off-by' are added before co-authored-by tags. """ verify 'closes ...' and 'Signed-off-by' are added before co-authored-by tags.
Also checks that all co-authored-by are moved at the end of the
message
""" """
c1 = repo.make_commit(None, 'first!', None, tree={'f': 'm1'}) c1 = repo.make_commit(None, 'first!', None, tree={'f': 'm1'})
repo.make_ref('heads/master', c1) repo.make_ref('heads/master', c1)
c2 = repo.make_commit(c1, 'simple commit message\n\n\nCo-authored-by: Bob <bob@example.com>', None, tree={'f': 'm2'}) c2 = repo.make_commit(c1, 'simple commit message\n\n\nCo-authored-by: Bob <bob@example.com>\n\nFixes a thing', None, tree={'f': 'm2'})
prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user') prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
@ -237,7 +240,7 @@ class TestCommitMessage:
run_crons(env) run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.message == "simple commit message\n\ncloses {repo.name}#1"\ assert master.message == "simple commit message\n\nFixes a thing\n\ncloses {repo.name}#1"\
"\n\nSigned-off-by: {reviewer.formatted_email}"\ "\n\nSigned-off-by: {reviewer.formatted_email}"\
"\n\n\nCo-authored-by: Bob <bob@example.com>"\ "\n\n\nCo-authored-by: Bob <bob@example.com>"\
.format(repo=repo, reviewer=get_partner(env, users['reviewer'])) .format(repo=repo, reviewer=get_partner(env, users['reviewer']))