From 1824a54c6d043f76cf1ff960c58159d2b58ef753 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Mon, 27 Jun 2016 13:18:25 +0200 Subject: [PATCH] settings: Use the new 'use_rebase' argument to decide between rebase or merge. --- rhodecode/lib/vcs/backends/hg/repository.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py index 9d8081ea..b9364666 100644 --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -577,7 +577,7 @@ class MercurialRepository(BaseRepository): push_branches=push_branches) def _local_merge(self, target_ref, merge_message, user_name, user_email, - source_ref): + source_ref, use_rebase=False): """ Merge the given source_revision into the checked out revision. @@ -597,7 +597,7 @@ class MercurialRepository(BaseRepository): # In this case we should force a commit message return source_ref.commit_id, True - if settings.HG_USE_REBASE_FOR_MERGING: + if use_rebase: try: bookmark_name = 'rcbook%s%s' % (source_ref.commit_id, target_ref.commit_id) @@ -691,7 +691,7 @@ class MercurialRepository(BaseRepository): try: merge_commit_id, needs_push = shadow_repo._local_merge( target_ref, merge_message, merger_name, merger_email, - source_ref) + source_ref, use_rebase=use_rebase) merge_possible = True except RepositoryError as e: log.exception('Failure when doing local merge on hg shadow repo')