← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Vincent Ladeuil
  • Date: 2010-12-06 10:15:25 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: v.ladeuil+lp@free.fr-20101206101525-4f9xea2yqcak0vlx
Prefix mergetools option names with 'bzr.'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
71
71
gpg_signing_command=gnome-gpg
72
72
log_format=short
73
73
user_global_option=something
74
 
mergetool.kdiff3=kdiff3 {base} {this} {other} -o {result}
75
 
mergetool.winmergeu=winmergeu {result}
76
 
mergetool.funkytool=funkytool "arg with spaces" {this_temp}
77
 
default_mergetool=kdiff3
 
74
bzr.mergetool.kdiff3=kdiff3 {base} {this} {other} -o {result}
 
75
bzr.mergetool.winmergeu=winmergeu {result}
 
76
bzr.mergetool.funkytool=funkytool "arg with spaces" {this_temp}
 
77
bzr.default_mergetool=kdiff3
78
78
[ALIASES]
79
79
h=help
80
80
ll=""" + sample_long_alias + "\n"
1018
1018
                                 'funkytool "arg with spaces" {this_temp}')
1019
1019
            ])
1020
1020
        self.assertEqual('funkytool "arg with spaces" {this_temp}',
1021
 
                          conf.get_user_option('mergetool.funkytool'))
 
1021
                          conf.get_user_option('bzr.mergetool.funkytool'))
1022
1022
        self.assertEqual('kdiff3 {base} {this} {other} -o {result}',
1023
 
                          conf.get_user_option('mergetool.kdiff3'))
 
1023
                          conf.get_user_option('bzr.mergetool.kdiff3'))
1024
1024
        self.assertEqual('winmergeu {result}',
1025
 
                          conf.get_user_option('mergetool.winmergeu'))
 
1025
                          conf.get_user_option('bzr.mergetool.winmergeu'))
1026
1026
 
1027
1027
    def test_set_merge_tools_duplicates(self):
1028
1028
        conf = config.GlobalConfig()
1079
1079
            ]
1080
1080
        conf.set_merge_tools(tools)
1081
1081
        conf.set_default_merge_tool('winmergeu')
1082
 
        self.assertEqual('winmergeu', conf.get_user_option('default_mergetool'))
 
1082
        self.assertEqual('winmergeu',
 
1083
                         conf.get_user_option('bzr.default_mergetool'))
1083
1084
 
1084
1085
    def test_set_default_merge_tool_none(self):
1085
1086
        conf = config.GlobalConfig.from_string(sample_config_text)
1086
1087
        conf.set_default_merge_tool(None)
1087
 
        self.assertEqual(None, conf.get_user_option('default_mergetool'))
 
1088
        self.assertEqual(None, conf.get_user_option('bzr.default_mergetool'))
1088
1089
 
1089
1090
    def test_set_invalid_default_merge_tool(self):
1090
1091
        conf = config.GlobalConfig()