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

hglib: return separate 3way diff option

Changeset 0795e9b73f3f…

Parent fbb71a911dca…

by Steve Borho

Changes to one file · Browse files at 0795e9b73f3f Showing diff from parent fbb71a911dca Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
235
236
237
238
 
239
240
241
 
245
246
247
248
 
249
250
251
252
253
254
255
 
 
 
 
256
257
258
 
235
236
237
 
238
239
240
241
 
245
246
247
 
248
249
250
251
252
253
 
 
254
255
256
257
258
259
260
@@ -235,7 +235,7 @@
  path = cmd   diffopts = ui.config('extdiff', 'opts.' + cmd, '')   diffopts = diffopts and [diffopts] or [] - tools[cmd] = [path, diffopts] + tools[cmd] = [path, diffopts, None]   elif cmd.startswith('opts.'):   continue   else: @@ -245,14 +245,16 @@
  path = diffopts.pop(0)   else:   path, diffopts = cmd, [] - tools[cmd] = [path, diffopts] + tools[cmd] = [path, diffopts, None]   mt = []   mergetools(ui, mt)   for t in mt:   if t.startswith('internal:'):   continue - opts = ui.config('merge-tools', t + '.diffargs', '') - tools[t] = [filemerge._findtool(ui, t), shlex.split(opts)] + dopts = ui.config('merge-tools', t + '.diffargs', '') + mopts = ui.config('merge-tools', t + '.diff3args', '') + dopts, mopts = shlex.split(dopts), shlex.split(mopts) + tools[t] = [filemerge._findtool(ui, t), dopts, mopts]   return tools