Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Printing followed by redo diff closed Eskil. Fixed this. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4400d4437f65501c515f18e8152e3b98 |
| User & Date: | peter 2015-07-02 07:48:39.280 |
Context
|
2015-10-12
| ||
| 22:29 | Use tablelist 5.14 that includes -colorizecommand, for table diff. check-in: 668aeaacc3 user: peter tags: trunk | |
|
2015-07-02
| ||
| 07:48 | Printing followed by redo diff closed Eskil. Fixed this. check-in: 4400d4437f user: peter tags: trunk | |
|
2015-06-03
| ||
| 23:28 | Handle when table cells are cut off. Added -maxwidth to limit table column width. check-in: 7ec7dbb565 user: peter tags: trunk | |
Changes
Changes to Changes.
1 2 3 4 5 6 7 | 2015-06-02 Made a patched version of tablelist for table diff. Patch stored in src dir. Table diff works reasonable now 2015-04-19 Started working on table diff. Added grep plugin. | > > > | 1 2 3 4 5 6 7 8 9 10 | 2015-07-02 Printing followed by redo diff closed Eskil. Fixed this. 2015-06-02 Made a patched version of tablelist for table diff. Patch stored in src dir. Table diff works reasonable now 2015-04-19 Started working on table diff. Added grep plugin. |
| ︙ | ︙ |
Changes to src/eskil.tcl.
| ︙ | ︙ | |||
1612 1613 1614 1615 1616 1617 1618 |
set w $::widgets($top,$item)
$w configure -state disabled
}
update idletasks
wm title $top "Eskil: [file tail $::eskil($top,patchFile)]"
# TBD TABLE
$::widgets($top,wLine2) see 1.0
| | | 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 |
set w $::widgets($top,$item)
$w configure -state disabled
}
update idletasks
wm title $top "Eskil: [file tail $::eskil($top,patchFile)]"
# TBD TABLE
$::widgets($top,wLine2) see 1.0
if {$::eskil($top,printFileCmd) && $::eskil($top,printFile) ne ""} {
after idle "doPrint $top 1 ; cleanupAndExit all"
}
normalCursor $top
return
} else {
prepareFiles $top
}
|
| ︙ | ︙ | |||
1850 1851 1852 1853 1854 1855 1856 |
makeMergeWin $top
}
} elseif {$::eskil($top,ancestorFile) ne ""} {
if {$::widgets($top,eqLabel) != "="} {
makeMergeWin $top
}
}
| | | 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 |
makeMergeWin $top
}
} elseif {$::eskil($top,ancestorFile) ne ""} {
if {$::widgets($top,eqLabel) != "="} {
makeMergeWin $top
}
}
if {$::eskil($top,printFileCmd) && $::eskil($top,printFile) ne ""} {
# TBD TABLE
after idle "doPrint $top 1 ; cleanupAndExit all"
}
}
# This is the entrypoint to do a diff via DDE or Send
proc remoteDiff {file1 file2} {
|
| ︙ | ︙ | |||
3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 |
# Fill in default data for a diff window
proc initDiffData {top} {
set ::eskil($top,leftOK) 0
set ::eskil($top,rightOK) 0
set ::eskil($top,mode) ""
set ::eskil($top,view) ""
set ::eskil($top,printFile) ""
set ::eskil($top,mergeFile) ""
set ::eskil($top,ancestorFile) ""
set ::eskil($top,separator) ""
set ::eskil($top,conflictFile) ""
set ::eskil($top,limitlines) 0
set ::eskil($top,maxwidth) 0
| > | 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 |
# Fill in default data for a diff window
proc initDiffData {top} {
set ::eskil($top,leftOK) 0
set ::eskil($top,rightOK) 0
set ::eskil($top,mode) ""
set ::eskil($top,view) ""
set ::eskil($top,printFileCmd) 0
set ::eskil($top,printFile) ""
set ::eskil($top,mergeFile) ""
set ::eskil($top,ancestorFile) ""
set ::eskil($top,separator) ""
set ::eskil($top,conflictFile) ""
set ::eskil($top,limitlines) 0
set ::eskil($top,maxwidth) 0
|
| ︙ | ︙ | |||
4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 |
} elseif {$nextArg eq "ancestorFile"} {
set opts(ancestorFile) [file join [pwd] $arg]
} elseif {$nextArg eq "separator"} {
# Handle if separator is given e.g. as '\t'
set opts(separator) [subst -nocommands -novariables $arg]
} elseif {$nextArg eq "printFile"} {
set opts(printFile) [file join [pwd] $arg]
} elseif {$nextArg eq "printFont"} {
set ::Pref(printFont) $arg
} elseif {$nextArg eq "printHeaderSize"} {
if {![string is double -strict $arg] || $arg <= 0} {
puts "Argument -printHeaderSize must be a positive number"
exit
}
| > | 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 |
} elseif {$nextArg eq "ancestorFile"} {
set opts(ancestorFile) [file join [pwd] $arg]
} elseif {$nextArg eq "separator"} {
# Handle if separator is given e.g. as '\t'
set opts(separator) [subst -nocommands -novariables $arg]
} elseif {$nextArg eq "printFile"} {
set opts(printFile) [file join [pwd] $arg]
set opts(printFileCmd) 1
} elseif {$nextArg eq "printFont"} {
set ::Pref(printFont) $arg
} elseif {$nextArg eq "printHeaderSize"} {
if {![string is double -strict $arg] || $arg <= 0} {
puts "Argument -printHeaderSize must be a positive number"
exit
}
|
| ︙ | ︙ |