tkdiff Code

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

Add inquire-cvs proc so tkdiff with no arguments queries cvs for modified files to load, like git and svn

* Added ability to recognize 3way mode is active and view the Ancestor file
* Builtin editor now provides Line numbers for displayed files

Provide clear feedback when a three-way merge is in effect

Fix minor graphic feedback artifacts (particularly w/zero hunks) when doing a new Diff

Repaired internal variable renaming oversight (1 instance)