On Fri, Nov 16, 2012 at 4:14 PM, Haszlakiewicz, Eric <[email protected]
> wrote:
> > -----Original Message-----
> > From: Steve Borho [mailto:[email protected]]
> > On Fri, Nov 16, 2012 at 1:52 PM, Haszlakiewicz, Eric <
> [email protected]> wrote:
> > I'm trying to get the Visual Diff command to use docdiff for .rtf
> files.
> > I've managed to get TortoiseHG to bring up the "Visual Diffs"
> > window, where I can choose whether to use kdiff3 or docdiff, by adding
> this
> > to my mercurial.ini:
> >
> > [diff-patterns]
> > **.rtf = docdiff
> >
> > However, when I double click on the file, the mouse pointer changes
> > for a split second, then nothing happens.
> >
> > What can I do to get this working?
> >
> > docdiff doesn't know about the RTF file extension:
> >
> > https://bitbucket.org/tortoisehg/thg/src/21ec314a78b7/win32/docdiff.py
> >
> > I don't see an easy way to patch this for an existing install of
> TortoiseHg. If
> > you would like to submit a patch which adds rtf as another extension
> handled
> > by MS Word, there's a good chance it will end up in the next release.
>
> ugh, well that's less than idea. Anyway, I managed to get it to work with
> a bit of hackery:
>
> 1) Edit mercurial.ini, copy over and modify the settings from the standard
> MergeTools.rc:
> [diff-patterns]
> **.rtf = docdiff_rtf
>
> [merge-tools]
> docdiff_rtf.priority=-100
> docdiff_rtf.regkey=Software\TortoiseHg
> docdiff_rtf.regappend=\docdiff_rtf.exe
> docdiff_rtf.args=$local $base $other $output
> docdiff_rtf.gui=True
> docdiff_rtf.diffargs=$child $parent
> docdiff_rtf.diff3args=$parent1 $child $parent2 $child
> docdiff_rtf.usewin=True
>
> 2) Copy docdiff.exe to docdiff_rtf.exe
>
> 3) "vim -b docdiff_rtf.exe", look for "doct" (no idea why there's a 't')
> and change it to "rtft"
>
>
> I'll see if I can come up with a patch for the source file, so this can be
> done in a more reasonable way in the future. :)
>
I was generating the 2.6.0 release today, so I added this just before
making the tag:
https://bitbucket.org/tortoisehg/thg/changeset/980b9c4d8d2034b6c09570d7e2e56aa7a578e121
Thanks for testing the theory
--
Steve Borho
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
