I think I'm done refactoring the visual diff subsystem on the default branch. I would like for people to try it out and provide feedback.
Highlights: 1) Use [merge-tools] section to provide tuned diff configurations for popular diff tools with the installer 2) Use Mercurial's merge tool detection code to autodetect installed diff tools 3) Use ui.merge if tortoisehg.vdiff is not configured 4) Attempts to support old extdiff configurations, if found In a nutshell, if you've installed BeyondCompare or AraxisMerge, THG will use it (in preference over kdiff3) without any user configuration. If you have TortoiseMerge or P4Merge, it will use them over kdiff3 if you ask it to. All the user has to do is select a tool from among the detected list. THG should already have optimal arguments for merging, 2way diffs, and 3way diffs. 5) Package TSVN's diff scripts for Word, Excel, PowerPoint, and OpenOffice documents 6) Support [diff-patterns] in Mercurial.ini 7) Ship with pre-configured patterns for these document scripts In a nutshell, if you are storing MSOffice or OpenOffice documents in TortoiseHg, we will try to diff them for you without any configuration on the user's part. 8) Provide useful labels for diff tool inputs 'path/filenam...@5342[local]', when the tool supports it 9) Intelligent use of the visual diff dialog. It is only used when necessary. Most of the time your diff tool is used directly. 10) The visual diff window supports copies, renames, and merge changesets. 11) The visual diff window can launch directory diffs, if the user wants them The visual diff window will only be used if: * the changeset you are visualizing has renames * the changeset you are visualizing requires more than one tool * your preferred tool does not support a required feature (directory diffs, etc) As stated in #10, even when the visual diff window is required, you can still get to the raw directory diff view by using the buttons at the bottom of the window. When viewing a merge changeset, there are buttons for 2-way dirdiff to p0, 2-way dirdiff to p1, and 3-way directory diffs. I consider this feature complete. I'll probably be tuning the tool configurations for some time and fixing bugs, but I don't have any more items on my TODO list. Please download an unstable nightly package and give it a test drive. -- Steve Borho ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
