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

[IMP] forwardport: unweird singleton conflicting commits

Browse Source 
When creating the conflicting commit of a single commit PR, reuse the
original commit's meta-information so the developer / fixer can more
easily update it in-place.

Closes #204
This commit is contained in:
Xavier Morel 2019-09-20 16:07:22 +02:00
parent 446b11a28f
commit 8de6273498
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
forwardport/models/project.py
View File

@ -605,8 +605,7 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
working_copy.checkout('-bsquashed', root_branch) working_copy.checkout('-bsquashed', root_branch)
root_commits = root.commits() root_commits = root.commits()
# squash to a single commit: reset to the first parent of the pr's # squash to a single commit
# first commit
working_copy.reset('--soft', root_commits[0]['parents'][0]['sha']) working_copy.reset('--soft', root_commits[0]['parents'][0]['sha'])
working_copy.commit(a=True, message="temp") working_copy.commit(a=True, message="temp")
squashed = working_copy.stdout().rev_parse('HEAD').stdout.strip().decode() squashed = working_copy.stdout().rev_parse('HEAD').stdout.strip().decode()
@ -616,9 +615,15 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
# cherry-pick the squashed commit # cherry-pick the squashed commit
working_copy.with_params('merge.renamelimit=0').with_config(check=False).cherry_pick(squashed) working_copy.with_params('merge.renamelimit=0').with_config(check=False).cherry_pick(squashed)
working_copy.commit( # if there was a single commit, reuse its message when committing
a=True, allow_empty=True, # the conflict
message="""Cherry pick of %s failed # TODO: still add conflict information to this?
if len(root_commits) == 1:
working_copy.commit(all=True, allow_empty=True, reuse_message=root_commits[0]['sha'])
else:
working_copy.commit(
all=True, allow_empty=True,
message="""Cherry pick of %s failed
stdout: stdout:
%s %s