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

hglib: improve support for hg-1.4 style 3-way extdiff config

Changeset 274e1ae1598a…

Parent e479ff36a915…

by Steve Borho

Changes to one file · Browse files at 274e1ae1598a Showing diff from parent e479ff36a915 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
239
240
241
242
 
 
 
 
 
 
243
244
245
 
249
250
251
252
 
 
 
 
 
 
253
254
255
 
239
240
241
 
242
243
244
245
246
247
248
249
250
 
254
255
256
 
257
258
259
260
261
262
263
264
265
@@ -239,7 +239,12 @@
  path = cmd   diffopts = ui.config('extdiff', 'opts.' + cmd, '')   diffopts = diffopts and [diffopts] or [] - tools[cmd] = [path, diffopts, None] + if '$parent2' in diffopts: + mergeopts = diffopts + diffopts = diffopts.replace('$parent2', '') + else: + mergeopts = None + tools[cmd] = [path, diffopts, mergeopts]   elif cmd.startswith('opts.'):   continue   else: @@ -249,7 +254,12 @@
  path = diffopts.pop(0)   else:   path, diffopts = cmd, [] - tools[cmd] = [path, diffopts, None] + if '$parent2' in diffopts: + mergeopts = diffopts + diffopts = diffopts.replace('$parent2', '') + else: + mergeopts = None + tools[cmd] = [path, diffopts, mergeopts]   mt = []   mergetools(ui, mt)   for t in mt: