equal
deleted
inserted
replaced
64 for k,v in ui.configitems("merge-tools"): |
64 for k,v in ui.configitems("merge-tools"): |
65 t = k.split('.')[0] |
65 t = k.split('.')[0] |
66 if t not in tools: |
66 if t not in tools: |
67 tools[t] = int(_toolstr(ui, t, "priority", "0")) |
67 tools[t] = int(_toolstr(ui, t, "priority", "0")) |
68 names = tools.keys() |
68 names = tools.keys() |
69 tools = util.sort([(-p,t) for t,p in tools.items()]) |
69 tools = sorted([(-p,t) for t,p in tools.items()]) |
70 uimerge = ui.config("ui", "merge") |
70 uimerge = ui.config("ui", "merge") |
71 if uimerge: |
71 if uimerge: |
72 if uimerge not in names: |
72 if uimerge not in names: |
73 return (uimerge, uimerge) |
73 return (uimerge, uimerge) |
74 tools.insert(0, (None, uimerge)) # highest priority |
74 tools.insert(0, (None, uimerge)) # highest priority |