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

visdiff: use available merge tools for diff work

Uses Mercurial's merge tool detection logic and configuration files to also
detect diff tools. The user can add tool.diffargs items to their [merge-tools]
sections of their ini files to specify arguments for 2-way diffs. A separate
configurable (perhaps tool.diff3args) will be used for merge diffs.

Much more work needs to be done here, before this feature will be complete.

Changeset ead0992db967…

Parent 6cc7971d87ac…

by Steve Borho

Changes to one file · Browse files at ead0992db967 Showing diff from parent 6cc7971d87ac Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
360
361
362
 
 
 
 
 
 
 
363
364
365
 
360
361
362
363
364
365
366
367
368
369
370
371
372
@@ -360,6 +360,13 @@
  else:   path, diffopts = cmd, []   tools[cmd] = [path, diffopts] + mergetools = [] + hglib.mergetools(ui, mergetools) + for t in mergetools: + if t.startswith('internal:'): + continue + opts = ui.config('merge-tools', t + '.diffargs', '') + tools[t] = [t, shlex.split(opts)]   return tools    def rawextdiff(ui, *pats, **opts):