Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

hglib: use detected path for selected tool

This is required in order to take advantage of the registry search, etc

Changeset e9f1f2d33007…

Parent a598edc9be56…

by Steve Borho

Changes to one file · Browse files at e9f1f2d33007 Showing diff from parent a598edc9be56 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
11
12
13
14
 
15
16
17
 
174
175
176
177
178
179
180
 
216
217
218
219
 
220
221
222
 
11
12
13
 
14
15
16
17
 
174
175
176
 
177
178
179
 
215
216
217
 
218
219
220
221
@@ -11,7 +11,7 @@
 import time    from mercurial import ui, util, extensions, match, bundlerepo, url -from mercurial import dispatch, encoding, templatefilters +from mercurial import dispatch, encoding, templatefilters, filemerge    _encoding = encoding.encoding  _encodingmode = encoding.encodingmode @@ -174,7 +174,6 @@
  'returns the configured merge tools and the internal ones'   if values == None:   values = [] - from mercurial import filemerge   for key, value in ui.configitems('merge-tools'):   t = key.split('.')[0]   if t not in values: @@ -216,7 +215,7 @@
  if t.startswith('internal:'):   continue   opts = ui.config('merge-tools', t + '.diffargs', '') - tools[t] = [t, shlex.split(opts)] + tools[t] = [filemerge._findtool(ui, t), shlex.split(opts)]   return tools