tkdiff Code

* V5.1
* Major overhaul of bindings: how setup, managed, allowing personalization and platform independence
* 4th prefs Tab - merge/nav/generic-ops keymapping prefs w/defaults as classicly defined.
* Scrollable bookmarks: allows access to all created, when they cant all fit on screen.
* Annotation of bookmarks (user specified identities - more than just the hunk index)
* Bookmark menu w/report 'participation' checkbutton (beyond annotation initiation item)
* New report fmt - based on interactive bookmark establishment for content
* Increased report STATS info, and a way to view them without forcing an ACTUAL report
* Keyboard scrolling (and more) restored by redesign of Read-Only text widget implementation
* Replaced "wm manage" with "partial window construction" restoring AQUA latency support
* Failure-modes for user supplied preference specifications re-architected (more forgiving)
* Re-architecture of internal debug mechanisms, w/expanded cmdline settings
* Simplified call chain that initiates/recomputes Diffs (+ Dbg now notes 'forced' reasons)
*
* Tkt#73 - repaired typo (shortnM -> shortNm) causing crash of "conflict" file processing
* Tkt#74 - scrolling w/autoselect ON crashed when scrolled prior to the 1st hunk min-bound
* + autoselect now operates passively (no EXTRA scrolling; eg. autocenter NOT triggered)
* Tkt#75 - a syntactic repair resolves crash of COMBINED merge choice (L+R or R+L) usage
* Repaired crash caused by situational ancestral-data corner condition (proper 'flush-mode')
* Addressed bug displaying a combobox when using multiple monitors, w/a NON-virtual window-manager
* Same issue affected Tooltip location placements jumping to wrong monitor.
* Internally incorrect mainwindow MANUAL-resizing logic repaired (improper "gridding")
* Minor fix prevents 'Status' subwin (& others) from squeezing shut during manual resizings to smaller
* Fix (yet again) un-raised Tooltip windows on Mac (raise MUST occur AFTER deiconify)
* Dropped Monochrome support (revivable, but pointless; has NEVER been capable as TkDiff evolved).
*
* Internal one-shot 'initOK' flag now subsumed by 'startPhase' for overall design consistency.
* Created internal Dialog factory to ensure uniformity of handling/management and safer Aqua integration
* Several other constructive processes (prefs/menus/toolbar) also converted to 'factory' paradigm
* Suppressed excess repainting of "Info" subwins when horiz-scroll activates
* Similar excess updating of Line Comparison window when NEW insert cursor pos STAYS on the same line
* Relaxed popup-position management on 2nd+ usage - will generally re-appear at its most recent location
* Excess 'wipe' call removed during pgm-startup: simply nothing to purge
* Wiping of mergeText failed due to a misspelling; but was being HIDDEN behind unneeded 'catch'
* Linearity (+other) tag/mark DEFS now PURGED when WIPING textwin data (PRIOR to reloading)
* Repair unintended session-long ASYNc behavior due to failure to remove trigger properly
* Ensure Text window focus-highlighting remains visible when Text FG/BG is altered
* Oldcode cleanup (conditionals<V8.5; $tcl_xxxx usages; lang deprecations: ".win yview lnum" syntax)
* Internal renamings of several objects (vars, procs) to make their usage less "vague/arbitrary/misleading"

"tag the 5.0 release"

Inserted Diff region interactive ignore feature

diff error recovery missed key element

mis-applied trimright statement semantics

* Upgraded version to V5.0
* newDiffDialog now handles URLs for ANY of the 3 Filespecs w,w/o Revs
* Tool icon provided for use to window manager (all platforms)
* Ancestral delete markers are now detected and provided as needed.
* Automatic 3way merge choice selection now uses newly detected deletions
* Extended conflict parser to not crash on diff3-style markup and permits 3way
* Diff now has stronger return code checks, AND fewer tool-fatal outcomes
* Additional popup notifications utilized to explain improper user operation
* Wrong linenumbers following final hunk (which reqd padding) now correct
* CDR Split boundary-move buttons bug fixed for single-line "push" case
* A 2-line view horizon is maintained when adjusting Split/Combine edges
* Repaired Line numbers BEYOND the FINAL hunk, when it contained padding
* A 1-line diff edge-case having NO newline no longer crashes the DiffMap
* Tooltip windows are now explicitly 'raised' when created (reqd for Mac)
* DblClick (for 'find nearest hunk') now works within Info windows
* Return (for same 'find-nearest' purpose) NO LONGER bound for Info windows
* TCL sensitive chars, ($ [ ]), in user filenames no longer crashes
* Passive "relativization" (to CWD) of displayed-only filename use now done
* CBar/Lnum hiliting no longer interacts badly when suppressed hunks exist
* Text window hiliting of final N hunks now proper when N hunks suppressed
* Setting a '-I regex' cmdline option also now activates it on startup
* Properly respecified Default Filebrowser "filetypes" viewing filter option
* Added Help explanation of Ancestral delete marks, and how to utilize
* DiffMap event handling architecture redesigned to eliminate ALL 'races'.
* Online Help brought current, whether new modification or outdated info
* Minor documentation typos (help, comment), clarifications, renamings, etc.

trim the initial r from a git rev label because it's indistinguishable from the rest of the hash

little logic problem in SVN case

Allow command line like
tkdiff -r<r1> -r<r2> <http://svn_repo/path/to/file/on/server>
(support request #26)

Also fixed a filename-with-spaces problem

Fixed more MacOS problems. Filetype pref was crashing again