mergetool--lib: Sort tools alphabetically for easier lookup
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth committed
Feb 26, 2011 at 11:51 UTC
0e0f450427a915f8569dc3dcc0ce7ee48bba9da9
1 file changed
+47
-47
lib/mergetool.tcl
+47
-47
@@ -175,43 +175,49 @@ proc merge_resolve_tool2 {} {
175
176
# Build the command line
177
switch -- $tool {
178
- kdiff3 {
178
+ araxis {
179
if {$base_stage ne {}} {
180
- set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Base)" \
181
- --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE"]
180
+ set cmdline [list "$merge_tool_path" -wait -merge -3 -a1 \
181
+ -title1:"'$MERGED (Base)'" -title2:"'$MERGED (Local)'" \
182
+ -title3:"'$MERGED (Remote)'" \
183
+ "$BASE" "$LOCAL" "$REMOTE" "$MERGED"]
184
} else {
183
- set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Local)" \
184
- --L2 "$MERGED (Remote)" -o "$MERGED" "$LOCAL" "$REMOTE"]
185
+ set cmdline [list "$merge_tool_path" -wait -2 \
186
+ -title1:"'$MERGED (Local)'" -title2:"'$MERGED (Remote)'" \
187
+ "$LOCAL" "$REMOTE" "$MERGED"]
188
}
189
}
187
- tkdiff {
190
+ ecmerge {
191
if {$base_stage ne {}} {
189
- set cmdline [list "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"]
192
+ set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]
193
} else {
191
- set cmdline [list "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"]
194
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"]
195
}
196
}
194
- meld {
195
- set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"]
197
+ emerge {
198
+ if {$base_stage ne {}} {
199
+ set cmdline [list "$merge_tool_path" -f emerge-files-with-ancestor-command \
200
+ "$LOCAL" "$REMOTE" "$BASE" "$basename"]
201
+ } else {
202
+ set cmdline [list "$merge_tool_path" -f emerge-files-command \
203
+ "$LOCAL" "$REMOTE" "$basename"]
204
+ }
205
}
206
gvimdiff {
207
set cmdline [list "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"]
208
}
200
- xxdiff {
209
+ kdiff3 {
210
if {$base_stage ne {}} {
202
- set cmdline [list "$merge_tool_path" -X --show-merged-pane \
203
- -R {Accel.SaveAsMerged: "Ctrl-S"} \
204
- -R {Accel.Search: "Ctrl+F"} \
205
- -R {Accel.SearchForward: "Ctrl-G"} \
206
- --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"]
211
+ set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Base)" \
212
+ --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE"]
213
} else {
208
- set cmdline [list "$merge_tool_path" -X --show-merged-pane \
209
- -R {Accel.SaveAsMerged: "Ctrl-S"} \
210
- -R {Accel.Search: "Ctrl+F"} \
211
- -R {Accel.SearchForward: "Ctrl-G"} \
212
- --merged-file "$MERGED" "$LOCAL" "$REMOTE"]
214
+ set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Local)" \
215
+ --L2 "$MERGED (Remote)" -o "$MERGED" "$LOCAL" "$REMOTE"]
216
}
217
}
218
+ meld {
219
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"]
220
+ }
221
opendiff {
222
if {$base_stage ne {}} {
223
set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"]
@@ -219,22 +225,20 @@ proc merge_resolve_tool2 {} {
225
set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED"]
226
}
227
}
222
- ecmerge {
223
- if {$base_stage ne {}} {
224
- set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]
225
- } else {
226
- set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"]
227
- }
228
+ p4merge {
229
+ set cmdline [list "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"]
230
}
229
- emerge {
231
+ tkdiff {
232
if {$base_stage ne {}} {
231
- set cmdline [list "$merge_tool_path" -f emerge-files-with-ancestor-command \
232
- "$LOCAL" "$REMOTE" "$BASE" "$basename"]
233
+ set cmdline [list "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"]
234
} else {
234
- set cmdline [list "$merge_tool_path" -f emerge-files-command \
235
- "$LOCAL" "$REMOTE" "$basename"]
235
+ set cmdline [list "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"]
236
}
237
}
238
+ vimdiff {
239
+ error_popup [mc "Not a GUI merge tool: '%s'" $tool]
240
+ return
241
+ }
242
winmerge {
243
if {$base_stage ne {}} {
244
# This tool does not support 3-way merges.
@@ -245,25 +249,21 @@ proc merge_resolve_tool2 {} {
249
-dl "Theirs File" -dr "Mine File" "$REMOTE" "$LOCAL" "$MERGED"]
250
}
251
}
248
- araxis {
252
+ xxdiff {
253
if {$base_stage ne {}} {
250
- set cmdline [list "$merge_tool_path" -wait -merge -3 -a1 \
251
- -title1:"'$MERGED (Base)'" -title2:"'$MERGED (Local)'" \
252
- -title3:"'$MERGED (Remote)'" \
253
- "$BASE" "$LOCAL" "$REMOTE" "$MERGED"]
254
+ set cmdline [list "$merge_tool_path" -X --show-merged-pane \
255
+ -R {Accel.SaveAsMerged: "Ctrl-S"} \
256
+ -R {Accel.Search: "Ctrl+F"} \
257
+ -R {Accel.SearchForward: "Ctrl-G"} \
258
+ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"]
259
} else {
255
- set cmdline [list "$merge_tool_path" -wait -2 \
256
- -title1:"'$MERGED (Local)'" -title2:"'$MERGED (Remote)'" \
257
- "$LOCAL" "$REMOTE" "$MERGED"]
260
+ set cmdline [list "$merge_tool_path" -X --show-merged-pane \
261
+ -R {Accel.SaveAsMerged: "Ctrl-S"} \
262
+ -R {Accel.Search: "Ctrl+F"} \
263
+ -R {Accel.SearchForward: "Ctrl-G"} \
264
+ --merged-file "$MERGED" "$LOCAL" "$REMOTE"]
265
}
266
}
260
- p4merge {
261
- set cmdline [list "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"]
262
- }
263
- vimdiff {
264
- error_popup [mc "Not a GUI merge tool: '%s'" $tool]
265
- return
266
- }
267
default {
268
error_popup [mc "Unsupported merge tool '%s'" $tool]
269
return