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: feedback on conflict

Browse Source 
append `git status` data to stderr, should be somewhat more
informative especially when a conflict is a DU (where the file has
been deleted on one side, so there is no conflict marker anywhere).

Fixes #461
This commit is contained in:
Xavier Morel 2021-03-01 09:44:18 +01:00
parent a5f2d14707
commit 952dafa45c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forwardport/models/project.py
View File

@ -871,7 +871,12 @@ This PR targets %s and is part of the forward-port chain. Further PRs will be cr
conf.with_params('merge.renamelimit=0')\ conf.with_params('merge.renamelimit=0')\
.with_config(check=False)\ .with_config(check=False)\
.cherry_pick(squashed, no_commit=True) .cherry_pick(squashed, no_commit=True)
status = conf.stdout().status(short=True, untracked_files='no').stdout.decode()
h, out, err = e.args
if err.strip():
err = err.rstrip() + '\n----------\nstatus:\n' + status
else:
err = 'status:\n' + status
# if there was a single commit, reuse its message when committing # if there was a single commit, reuse its message when committing
# the conflict # the conflict
# TODO: still add conflict information to this? # TODO: still add conflict information to this?
@ -888,8 +893,8 @@ stdout:
%s %s
stderr: stderr:
%s %s
""" % e.args) """ % (h, out, err))
return e.args, working_copy return (h, out, err), working_copy
def _cherry_pick(self, working_copy): def _cherry_pick(self, working_copy):
""" Cherrypicks ``self`` into the working copy """ Cherrypicks ``self`` into the working copy