NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] forwardport: logging & rename during cherrypick

Browse Source 
* add slightly better logging to the cherrypick process (init)
* cherrypick with an infinite renamelimit, seems fine according to
  linus[0] and significantly reduces "unsuccessful" forward ports

[0] http://git.661346.n2.nabble.com/Merging-limitations-after-directory-renames-interesting-test-repo-td6041103.html#a6041833
This commit is contained in:
Xavier Morel 2019-09-11 15:01:13 +02:00
parent 4ce4a3bda7
commit 0e3d873f0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forwardport/models/project.py
View File

@ -537,10 +537,10 @@ stderr:
rev_list = working_copy.lazy().stdout()\
.rev_list('--reverse', '%s..%s' % commits_range)
commits = list(rev_list.stdout)
logger.info("%d commit(s) on %s", len(commits), h.decode())
logger.info("%s: %d commits in %s..%s on %s", self, len(commits), commits_range[0], commits_range[1], h.decode())
for commit in commits:
commit = commit.decode().strip()
r = working_copy.with_config(
r = working_copy.with_params('merge.renamelimit=0').with_config(
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=False,