On Wed, Jan 13, 2010 at 7:24 AM, Sune Foldager <[email protected]> wrote: > On 01-01-2010 21:23, Steve Borho wrote: >> diffargs - arguments to use for 2-way diffs, variables $parent and >> $child are expanded at runtime >> diff3args - arguments to use for 3-way file comparisons, variables >> $parent1 $parent2 $child expanded at runtime > > Are there any examples of this actually being necessary, i.e. differs > which require a specific switch to enable three-way mode? In kdiff3 one > can always leave out an argument... but then again I guess that the > added flexibility is worth the duplicated code. > </rant>
Yes, especially since we're supplying labels for each file. You do not want to label a non-existant third file. If you look at contrib/mergetools.ini, you can see that diff3args usually diverges from diffargs. >> I may add a dir3diff configurable if there is demand for it. > > Yes please!... but you already did that. I'm playing catch up right now :-). > > As for the kdiff3 config, what's the reason again that dir3diff is > disabled by default? I find kdiff3 nice in that it displays directory > trees instead of a flat list. > > About hgext.extdiff: > Do you plan on backporting or proposing some of this for extdiff? Yes. I sent a patch for the easiest parts (diffargs, labels). Only djc commented on it (asking for examples), so I'll probably push it soon. I figure one more patch to add $ancestor and diff3args, then a final patch to make 'hg extdiff' auto-detect a diff tool so extdiff can be used with zero configuration. -- 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
