tkdiff Code

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

* Added CONFLICTed file handling to each existing SCM having an inquiry mode
* Added new 'finfo' infrastructure to manage ancestorfile manipulations
* Eliminated growth of useless canvas elements in the DiffMap
* Renamed global 'map' to 'w(mapImg)' to unconfuse cmd/var naming
* Naming a line-comparison font pref affects entire window, not just diffs
- inclds more definitive Help data of line-comparison pref attributes
* Re-engineered CONFLICT file error handling as relates to finfo
* Error msg provided involving CVS refusing access to a conflicted WC file
* Repaired a premature firing of a validation proc in newDiff dialog

* The NewDiff interactive Dialog is now the default when no args given
- it permits a simpler startup on graphical desktops via shortcuts
- yet still allows dynamic searching for SCM-based diff candidates, and
- its controls are now inter-related to assist making correct settings
* Users may now specify a preferred SCM system among those detectable
* Additionally, the SCM system may be manually selected during dialog use
* A new autoSrch preference allows immediate SCM startup from the cmdline
* It is now possible to COMBINE usage of two distinct SCMs, if desired;
- this also facilitates comparisons between distinct branches of an SCM
* It is now possible to request a "conflict" diff via the dialog
* Conflict parsing now accepts a diff3-like format (but only as a 2way)
* The (internal) setting of prefs is now managed to prevent lost settings
* Resolved a race condition causing instability in redrawing the DiffMap
* More uniformity of error messaging - particularly fatal errors
* New Help info on the role of the CWD during tool startup, plus the SCM
- features, and interpreting the interactive feedback from the dialog