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

hglib: fixup_extdiff() should operate on argument lists

Changeset 8d6777908b1e…

Parent 220a79fa118c…

by Steve Borho

Changes to one file · Browse files at 8d6777908b1e Showing diff from parent 220a79fa118c Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
234
235
236
237
 
 
238
239
240
 
 
241
242
 
243
244
245
 
249
250
251
 
252
253
254
 
260
261
262
263
 
264
265
266
 
234
235
236
 
237
238
239
 
 
240
241
242
 
243
244
245
246
 
250
251
252
253
254
255
256
 
262
263
264
 
265
266
267
268
@@ -234,12 +234,13 @@
    def fixup_extdiff(diffopts):   if '$child' not in diffopts: - diffopts += ' $parent1 $child' + diffopts.append('$parent1') + diffopts.append('$child')   if '$parent2' in diffopts: - mergeopts = diffopts - diffopts = diffopts.replace('$parent2', '') + mergeopts = diffopts[:] + diffopts.remove('$parent2')   else: - mergeopts = None + mergeopts = []   return diffopts, mergeopts     tools = {} @@ -249,6 +250,7 @@
  if not path:   path = cmd   diffopts = ui.config('extdiff', 'opts.' + cmd, '') + diffopts = shlex.split(diffopts)   diffopts, mergeopts = fixup_extdiff(diffopts)   tools[cmd] = [path, diffopts, mergeopts]   elif cmd.startswith('opts.'): @@ -260,7 +262,7 @@
  path = diffopts.pop(0)   else:   path, diffopts = cmd, [] - diffopts, mergeopts = fixup_extdiff(' '.join(diffopts)) + diffopts, mergeopts = fixup_extdiff(diffopts)   tools[cmd] = [path, diffopts, mergeopts]   mt = []   mergetools(ui, mt)