← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Gordon Tyler
  • Date: 2010-12-03 05:11:49 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20101203051149-kasi9ee0m23v5u3a
Fixed set_default_merge_tool and added test for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
401
401
        if name is None:
402
402
            self.remove_user_option('default_mergetool')
403
403
        else:
404
 
            if isinstance(name, MergeTool):
 
404
            if isinstance(name, mergetools.MergeTool):
405
405
                name = name.get_name()
406
406
            if self.find_merge_tool(name) is None:
407
407
                raise errors.BzrError('invalid merge tool name: %r' % name)
408
408
            trace.mutter('setting default merge tool: %s', name)
409
 
            conf.set_user_option('default_mergetool', name)
 
409
            self.set_user_option('default_mergetool', name)
410
410
 
411
411
 
412
412
class IniBasedConfig(Config):