Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 30388:8819b63732b9
filemerge: avoid shadowing a variable in a list comprehension
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 10 Nov 2016 16:33:07 -0500 |
| parents | aa23c93e636d |
| children | ce3a133f71b3 |
comparison
equal
deleted
inserted
replaced
| 30387:ca74c076710e | 30388:8819b63732b9 |
|---|---|
| 187 if t not in tools: | 187 if t not in tools: |
| 188 tools[t] = int(_toolstr(ui, t, "priority", "0")) | 188 tools[t] = int(_toolstr(ui, t, "priority", "0")) |
| 189 if _toolbool(ui, t, "disabled", False): | 189 if _toolbool(ui, t, "disabled", False): |
| 190 disabled.add(t) | 190 disabled.add(t) |
| 191 names = tools.keys() | 191 names = tools.keys() |
| 192 tools = sorted([(-p, t) for t, p in tools.items() if t not in disabled]) | 192 tools = sorted([(-p, tool) for tool, p in tools.items() |
| 193 if tool not in disabled]) | |
| 193 uimerge = ui.config("ui", "merge") | 194 uimerge = ui.config("ui", "merge") |
| 194 if uimerge: | 195 if uimerge: |
| 195 # external tools defined in uimerge won't be able to handle | 196 # external tools defined in uimerge won't be able to handle |
| 196 # change/delete conflicts | 197 # change/delete conflicts |
| 197 if uimerge not in names and not changedelete: | 198 if uimerge not in names and not changedelete: |