engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr-shadow: Set reference in git shadow repositories on successful merge. #1055

Browse source
This commit is contained in:
Martin Bornhold 2016-10-23 14:33:45 +02:00
parent ae602ef0c2
commit 939cf321a7
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rhodecode/lib/vcs/backends/git/repository.py
View file

@ -876,6 +876,16 @@ class GitRepository(BaseRepository):
shadow_repo._local_merge(merge_message, merger_name, merger_email,
[source_ref.commit_id])
merge_possible = True
# Need to reload repo to invalidate the cache, or otherwise we
# cannot retrieve the merge commit.
shadow_repo = GitRepository(shadow_repository_path)
merge_commit_id = shadow_repo.branches[pr_branch]
# Set a reference pointing to the merge commit. This reference may
# be used to easily identify the last successful merge commit in
# the shadow repository.
shadow_repo.set_refs('refs/heads/pr-merge', merge_commit_id)
except RepositoryError as e:
log.exception('Failure when doing local merge on git shadow repo')
merge_possible = False
@ -887,10 +897,6 @@ class GitRepository(BaseRepository):
pr_branch, self.path, target_ref.name, enable_hooks=True,
rc_scm_data=self.config.get('rhodecode', 'RC_SCM_DATA'))
merge_succeeded = True
# Need to reload repo to invalidate the cache, or otherwise we
# cannot retrieve the merge commit.
shadow_repo = GitRepository(shadow_repository_path)
merge_commit_id = shadow_repo.branches[pr_branch]
except RepositoryError as e:
log.exception(
'Failure when doing local push on git shadow repo')