← 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: 2011-01-20 04:44:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20110120044414-x8vislng3ukcfr1d
Simplified mergetools module down to functions which deal with command lines -- no MergeTool class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
363
363
        for (oname, value, section, conf_id, parser) in self._get_options():
364
364
            if oname.startswith('bzr.mergetool.'):
365
365
                tool_name = oname[len('bzr.mergetool.'):]
366
 
                tools[tool_name] = mergetools.MergeTool(tool_name, value)
 
366
                tools[tool_name] = value
367
367
        trace.mutter('loaded merge tools: %r' % tools)
368
 
        return tools.values()
 
368
        return tools
369
369
 
370
370
    def find_merge_tool(self, name):
371
371
        # We fake a defaults mechanism here by checking if the given name can 
374
374
        # when it becomes available in the future.
375
375
        command_line = (self.get_user_option('bzr.mergetool.%s' % name) or
376
376
                        mergetools.known_merge_tools.get(name, None))
377
 
        if command_line is None:
378
 
            return None
379
 
        return mergetools.MergeTool(name, command_line)
380
 
 
381
 
    def get_default_merge_tool(self):
382
 
        return self.get_user_option('bzr.default_mergetool')
 
377
        return command_line
383
378
 
384
379
 
385
380
class IniBasedConfig(Config):