On 10/5/2012 1:12 PM, Steve Borho wrote: > On Fri, Oct 5, 2012 at 2:32 PM, Ross Boylan <[email protected]> wrote: >> I have output files that tend to differ in ways I don't care about >> between runs; in particular there is date stamp at the top of every page. >> I would like to be able to avoid having those differences detected, so >> that it is easier to tell if anything has changed. >> >> If I could process the file before the diff tools get it, that would >> solve the problem. I think doing this extra processing based on the >> file extension would suffice, though it might be nice to have some other >> way to control it. >> >> How can I do this? I can write a little python script to do the >> transform, but I don't know how to hook it up. >> >> The GUI seems to permit only the tools that tortoisehg autodetects. If I >> could tell it to run my script I think I'd have a solution. > You need to register your script as a diff/merge tool. See > contrib/mergetools.rc in the TortoiseHg repo > > https://bitbucket.org/tortoisehg/thg/src/tip/contrib/mergetools.rc Thanks. I forgot to mention that in my earlier post, though I managed to track it down in c:\Program Files\TortoiseHg\hgrc.d (Windows 7). I guess I can sort of figure out what an entry should look like, but is there any guidance? In particular, I'm not clear how Tortoise knows which programs are 2 vs 3 way or diff vs merge. Sometimes there seem to be different entries, e.g., beyondcompare2 vs beyondcompare3, while other times there are individual lines like
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2 Also, do I have to create a registry entry? I'm guessing priority -9 is lower than priority -3. Finally, what args are available through the $xxx syntax? BTW, this is another area the documentation is a bit terse: 4.1 says "If there are no options in either drop-down list, you must install a diff/merge tool that is supported by our mergetools.rc or configure your own tool." How to configure your own tool, or even the location of mergetools.rc, are left to the imagination. > > I don't think you can do this on Windows in such a way that it uses > thg's Python interpreter, you will need to have Python installed > separately. > ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
