##// END OF EJS Templates
settings: Remove obsolete VCS config value HG_USE_REBASE_FOR_MERGING
Martin Bornhold -
r363:78788d34 default
parent child Browse files
Show More
@@ -56,8 +56,6 b' def configure_vcs(config):'
56 'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
56 'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
57 }
57 }
58
58
59 conf.settings.HG_USE_REBASE_FOR_MERGING = config.get(
60 'rhodecode_hg_use_rebase_for_merging', False)
61 conf.settings.GIT_REV_FILTER = shlex.split(
59 conf.settings.GIT_REV_FILTER = shlex.split(
62 config.get('git_rev_filter', '--all').strip())
60 config.get('git_rev_filter', '--all').strip())
63 conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
61 conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
@@ -29,8 +29,6 b" DEFAULT_ENCODINGS = ['utf8']"
29 # It can also be ['--branches', '--tags']
29 # It can also be ['--branches', '--tags']
30 GIT_REV_FILTER = ['--all']
30 GIT_REV_FILTER = ['--all']
31
31
32 HG_USE_REBASE_FOR_MERGING = False
33
34 # Compatibility version when creating SVN repositories. None means newest.
32 # Compatibility version when creating SVN repositories. None means newest.
35 # Other available options are: pre-1.4-compatible, pre-1.5-compatible,
33 # Other available options are: pre-1.4-compatible, pre-1.5-compatible,
36 # pre-1.6-compatible, pre-1.8-compatible
34 # pre-1.6-compatible, pre-1.8-compatible
@@ -711,12 +711,10 b' TODO: To be written...'
711 source_ref = Reference('book', bookmark_name, source_commit.raw_id)
711 source_ref = Reference('book', bookmark_name, source_commit.raw_id)
712 workspace = 'test-merge'
712 workspace = 'test-merge'
713
713
714 with mock.patch.object(rhodecode.lib.vcs.conf.settings,
715 'HG_USE_REBASE_FOR_MERGING', return_value=True):
716 merge_response = target_repo.merge(
714 merge_response = target_repo.merge(
717 target_ref, source_repo, source_ref, workspace,
715 target_ref, source_repo, source_ref, workspace,
718 'test user', 'test@rhodecode.com', 'merge message 1',
716 'test user', 'test@rhodecode.com', 'merge message 1',
719 dry_run=False)
717 dry_run=False, use_rebase=True)
720
718
721 expected_merge_response = MergeResponse(
719 expected_merge_response = MergeResponse(
722 True, True, merge_response.merge_commit_id,
720 True, True, merge_response.merge_commit_id,
General Comments 0
You need to be logged in to leave comments. Login now