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: check commit liveness on the PR we're porting from

Browse Source 
Check remains a tad dodgy, but since we're actually porting from
`root` (the earliest ancestor of `self`) it makes more sense to
sanity-check that *its* commits remain visible.

Also log that as it makes a tad more sense, hopefully.

Closes #600
This commit is contained in:
Xavier Morel 2022-06-30 12:16:30 +02:00
parent 2b3ee48ebd
commit 2a268d777c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
forwardport/models/project.py
View File

@ -806,6 +806,7 @@ This PR targets %s and is part of the forward-port chain. Further PRs will be cr
:rtype: (None | (str, str, str, list[str]), Repo)
"""
source = self._get_local_directory()
root = self._get_root()
# update all the branches & PRs
r = source.with_params('gc.pruneExpire=1.day.ago')\
.with_config(
@ -814,17 +815,16 @@ This PR targets %s and is part of the forward-port chain. Further PRs will be cr
)\
.fetch('-p', 'origin')
_logger.info("Updated %s:\n%s", source._directory, r.stdout.decode())
# FIXME: check that pr.head is pull/{number}'s head instead?
source.cat_file(e=self.head)
source.cat_file(e=root.head)
# create working copy
_logger.info("Create working copy to forward-port %s:%d to %s",
self.repository.name, self.number, target_branch.name)
_logger.info(
"Create working copy to forward-port %s (really %s) to %s",
self.display_name, root.display_name, target_branch.name)
working_copy = source.clone(
cleanup.enter_context(
tempfile.TemporaryDirectory(
prefix='%s:%d-to-%s-' % (
self.repository.name,
self.number,
prefix='%s-to-%s-' % (
root.display_name,
target_branch.name
),
dir=user_cache_dir('forwardport')
@ -843,7 +843,6 @@ This PR targets %s and is part of the forward-port chain. Further PRs will be cr
_logger.info("Create FP branch %s", fp_branch_name)
working_copy.checkout(b=fp_branch_name)
root = self._get_root()
try:
root._cherry_pick(working_copy)
return None, working_copy