← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mergetools.py

  • Committer: Gordon Tyler
  • Date: 2010-12-02 05:08:52 UTC
  • mto: (5321.1.101 mergetools)
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20101202050852-hxpnxxf0eqbxboba
Removed old config functions from mergetools.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mergetools.py
172
172
    tools = [MergeTool(None, commandline) for commandline in _KNOWN_MERGE_TOOLS]
173
173
    return [tool for tool in tools if tool.is_available()]
174
174
 
175
 
 
176
 
def get_merge_tools(conf=None):
177
 
    """Returns list of MergeTool objects."""
178
 
    if conf is None:
179
 
        conf = config.GlobalConfig()
180
 
    return conf.get_merge_tools()
181
 
 
182
 
 
183
 
def set_merge_tools(tools, conf=None):
184
 
    if conf is None:
185
 
        conf = config.GlobalConfig()
186
 
    conf.set_merge_tools(tools)
187
 
 
188
 
 
189
 
def find_merge_tool(name, conf=None):
190
 
    if conf is None:
191
 
        conf = config.GlobalConfig()
192
 
    return conf.find_merge_tool(name)
193
 
 
194
 
 
195
 
def get_default_merge_tool(conf=None):
196
 
    if conf is None:
197
 
        conf = config.GlobalConfig()
198
 
    return conf.get_default_merge_tool()
199
 
 
200
 
 
201
 
def set_default_merge_tool(name, conf=None):
202
 
    if conf is None:
203
 
        conf = config.GlobalConfig()
204
 
    conf.set_default_merge_tool(name)