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

settings: Add argument to select rebase as merge strategy.

Browse source
This commit is contained in:
Martin Bornhold 2016-06-27 13:16:10 +02:00
parent d80ead44a9
commit 488bd2df2f
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rhodecode/lib/vcs/backends/base.py
View file

@ -365,7 +365,8 @@ class BaseRepository(object):
raise NotImplementedError
def merge(self, target_ref, source_repo, source_ref, workspace_id,
user_name='', user_email='', message='', dry_run=False):
user_name='', user_email='', message='', dry_run=False,
use_rebase=False):
"""
Merge the revisions specified in `source_ref` from `source_repo`
onto the `target_ref` of this repository.
@ -388,6 +389,8 @@ class BaseRepository(object):
:param user_email: Merge commit `user_email`.
:param message: Merge commit `message`.
:param dry_run: If `True` the merge will not take place.
:param use_rebase: If `True` commits from the source will be rebased
on top of the target instead of being merged.
"""
if dry_run:
message = message or 'sample_message'
@ -407,7 +410,8 @@ class BaseRepository(object):
try:
return self._merge_repo(
shadow_repository_path, target_ref, source_repo,
source_ref, message, user_name, user_email, dry_run=dry_run)
source_ref, message, user_name, user_email, dry_run=dry_run,
use_rebase=use_rebase)
except RepositoryError:
log.exception(
'Unexpected failure when running merge, dry-run=%s',

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

@ -833,7 +833,8 @@ class GitRepository(BaseRepository):
def _merge_repo(self, shadow_repository_path, target_ref,
source_repo, source_ref, merge_message,
merger_name, merger_email, dry_run=False):
merger_name, merger_email, dry_run=False,
use_rebase=False):
if target_ref.commit_id != self.branches[target_ref.name]:
return MergeResponse(
False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)

3
rhodecode/lib/vcs/backends/hg/repository.py
View file

@ -659,7 +659,8 @@ class MercurialRepository(BaseRepository):
def _merge_repo(self, shadow_repository_path, target_ref,
source_repo, source_ref, merge_message,
merger_name, merger_email, dry_run=False):
merger_name, merger_email, dry_run=False,
use_rebase=False):
if target_ref.commit_id not in self._heads():
return MergeResponse(
False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)