← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

(jelmer) Allow the uses of spaces in merge tools paths. (Gordon Tyler)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
166
166
user_global_option=something
167
167
bzr.mergetool.sometool=sometool {base} {this} {other} -o {result}
168
168
bzr.mergetool.funkytool=funkytool "arg with spaces" {this_temp}
 
169
bzr.mergetool.newtool='"newtool with spaces" {this_temp}'
169
170
bzr.default_mergetool=sometool
170
171
[ALIASES]
171
172
h=help
1296
1297
        self.log(repr(tools))
1297
1298
        self.assertEqual(
1298
1299
            {u'funkytool' : u'funkytool "arg with spaces" {this_temp}',
1299
 
            u'sometool' : u'sometool {base} {this} {other} -o {result}'},
 
1300
            u'sometool' : u'sometool {base} {this} {other} -o {result}',
 
1301
            u'newtool' : u'"newtool with spaces" {this_temp}'},
1300
1302
            tools)
1301
1303
 
1302
1304
    def test_get_merge_tools_empty(self):