Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1.5, 1.1.6, and 1.1.6.1

stable hglib: only check for each tool once

Changeset 48585a7eb075…

Parent a08b73f765bd…

by Steve Borho

Changes to one file · Browse files at 48585a7eb075 Showing diff from parent a08b73f765bd Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
282
283
284
 
285
286
287
 
 
288
289
290
 
282
283
284
285
286
287
 
288
289
290
291
292
@@ -282,9 +282,11 @@
  'returns the configured merge tools and the internal ones'   if values == None:   values = [] + seen = values[:]   for key, value in ui.configitems('merge-tools'):   t = key.split('.')[0] - if t not in values: + if t not in seen: + seen.append(t)   # Ensure the tool is installed   if filemerge._findtool(ui, t):   values.append(t)