113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
grid $win.l3 $win.e3 $win.b3 $win.r3 -sticky we -padx 3 -pady {10 3}
grid $win.l4 $win.e4 $win.b4 $win.r4 -sticky we -padx 3 -pady 3
grid $win.bd - - -padx 3 -pady {10 3}
grid columnconfigure $win $win.el -weight 1
# Set up file dropping in entry windows if TkDnd is available
if {![catch {package require tkdnd}]} {
dnd bindtarget $win text/uri-list <Drop> "[mymethod fileDrop any ] %D"
dnd bindtarget $win.e1 text/uri-list <Drop> "[mymethod fileDrop base1 ] %D"
dnd bindtarget $win.e2 text/uri-list <Drop> "[mymethod fileDrop change1] %D"
dnd bindtarget $win.e3 text/uri-list <Drop> "[mymethod fileDrop base2 ] %D"
dnd bindtarget $win.e4 text/uri-list <Drop> "[mymethod fileDrop change2] %D"
}
}
|
|
|
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
grid $win.l3 $win.e3 $win.b3 $win.r3 -sticky we -padx 3 -pady {10 3}
grid $win.l4 $win.e4 $win.b4 $win.r4 -sticky we -padx 3 -pady 3
grid $win.bd - - -padx 3 -pady {10 3}
grid columnconfigure $win $win.el -weight 1
# Set up file dropping in entry windows if TkDnd is available
if { ! [catch {package require tkdnd}]} {
dnd bindtarget $win text/uri-list <Drop> "[mymethod fileDrop any ] %D"
dnd bindtarget $win.e1 text/uri-list <Drop> "[mymethod fileDrop base1 ] %D"
dnd bindtarget $win.e2 text/uri-list <Drop> "[mymethod fileDrop change1] %D"
dnd bindtarget $win.e3 text/uri-list <Drop> "[mymethod fileDrop base2 ] %D"
dnd bindtarget $win.e4 text/uri-list <Drop> "[mymethod fileDrop change2] %D"
}
}
|
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
set revs($field) [lindex $revList 0]
}
}
}
}
method doFourWayDiff {{skipPrepare 0}} {
if {!$skipPrepare} {
$self PrepareFw
}
# Extract revisions
foreach field $fields {
if {$revs($field) ne ""} {
# Replace with checkout copy
set files($field) [tmpFile]
|
|
|
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
set revs($field) [lindex $revList 0]
}
}
}
}
method doFourWayDiff {{skipPrepare 0}} {
if { ! $skipPrepare} {
$self PrepareFw
}
# Extract revisions
foreach field $fields {
if {$revs($field) ne ""} {
# Replace with checkout copy
set files($field) [tmpFile]
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
lappend matching($side) {*}$rest($side)
}
set [myvar csList1] $matching(1)
set [myvar csList2] $matching(2)
#destroy $win.csf
if {![winfo exists $win.csf]} {
ttk::labelframe $win.csf -text "Change Set" -padding 3
grid $win.csf -columnspan 4 -sticky news -padx 3 -pady 3
grid rowconfigure $win $win.csf -weight 1
listbox $win.csf.lb1 -height 20 -listvariable [myvar csList1] \
-exportselection 0
bind $win.csf.lb1 <<ListboxSelect>> [mymethod csNewSelect]
|
|
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
lappend matching($side) {*}$rest($side)
}
set [myvar csList1] $matching(1)
set [myvar csList2] $matching(2)
#destroy $win.csf
if { ! [winfo exists $win.csf]} {
ttk::labelframe $win.csf -text "Change Set" -padding 3
grid $win.csf -columnspan 4 -sticky news -padx 3 -pady 3
grid rowconfigure $win $win.csf -weight 1
listbox $win.csf.lb1 -height 20 -listvariable [myvar csList1] \
-exportselection 0
bind $win.csf.lb1 <<ListboxSelect>> [mymethod csNewSelect]
|