On 07.01.2010 18:59, Steve Borho wrote: > On Thu, Jan 7, 2010 at 11:31 AM, Adrian Buehlmann <adr...@cadifra.com> wrote: >> On 07.01.2010 18:10, Steve Borho wrote: >>> On Thu, Jan 7, 2010 at 10:53 AM, Adrian Buehlmann <adr...@cadifra.com> >>> wrote: >>>> On 07.01.2010 17:44, Steve Borho wrote: >>>>> On Thu, Jan 7, 2010 at 10:37 AM, Adrian Buehlmann <adr...@cadifra.com> >>>>> wrote: >>>>>> On 07.01.2010 15:53, Steve Borho wrote: >>>>>>> On Thu, Jan 7, 2010 at 4:28 AM, Adrian Buehlmann <adr...@cadifra.com> >>>>>>> wrote: >>>>>>>> On 07.01.2010 07:21, Steve Borho wrote: >>>>>>>>> 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. >>>>>>>> >>>>>>>> Starting with >>>>>>>> >>>>>>>> changeset: 5411:04cbc9485753 >>>>>>>> user: Steve Borho <st...@borho.org> >>>>>>>> date: Wed Jan 06 23:01:10 2010 -0600 >>>>>>>> summary: hglib: further fixup logic for hg-1.4 extdiff >>>>>>>> configurations >>>>>>>> >>>>>>>> http://bitbucket.org/tortoisehg/stable/changeset/04cbc9485753/ >>>>>>>> >>>>>>>> if I try to do a visual diff in hgtk log, I just get the error box >>>>>>>> >>>>>>>> http://bitbucket.org/abuehl/thg-abuehl/downloads/visdiff-error-using-04cbc9485753.PNG >>>>>>>> >>>>>>>> from kdiff3 complaining about failing to open files. >>>>>>>> >>>>>>>> Using the parent of 04cbc9485753 (3ee74d16161b) it works fine. >>>>>>>> >>>>>>>> I'm on Windows 7 Ultimate 64bit. >>>>>>> >>>>>>> Can you send your kdiff extdiff config? >>>>>> >>>>>> Might well be that I have stupid settings in there. >>>>>> >>>>>> In C:\users\adi\Mercurial.ini I see ('adi' is my login name): >>>>>> >>>>>> <snip> >>>>>> [extdiff] >>>>>> cmd.vdiff = C:\Program Files\TortoiseHg\kdiff3 >>>>>> #opts.vdiff = $parent1 $child $parent2 >>>>>> </snip> >>>>>> >>>>>> [extdiff] in C:\Program Files\TortoiseHg\Mercurial.ini is empty. >>>>>> >>>>> >>>>> I want old working configurations to keep working. I'll figure out >>>>> what's up. >>>>> FWIW: you can work around this in the short term by commenting out >>>>> cmd.vdiff >>>> >>>> If I do that, I get a window with title "TortoiseHg" and text: >>>> >>>> <paste> >>>> No diff tool found >>>> >>>> No visual diff tools were detected >>>> </paste> >>> >>> Do you not allow the installer to put THG in your system path? If >>> not, you'll have to put lines like these in your user Mercurial.ini >>> >>> [merge-tools] >>> kdiff3.executable=C:\Program Files\TortoiseHg\kdiff3.exe >> >> I have just downloaded and installed the newest unstable installer >> >> tortoisehg-unstable-0.9.2+72-9a8319557bf9-hg-1.4.2+17-3ab391dd5ec5.exe >> >> and ran the installer as an admin (it is requesting UAC rights elevation on >> Windows 7 and I granted that, which means it can do anything an admin can >> do). >> >> If I run hgtk.exe from that and comment out cmd.vdiff like you said, it >> works fine. >> >> So there must be a problem with my hgtk developer setup then. (The error with >> my original extdiff setting is still there though when I use hgtk.exe from >> the binary installer). > > Running from Python source, you are at the mercy of the version of Hg > you have locally installed. It usually lags behind the nightly > builds.
Yes, I know. But what I had was pretty new, I specifically took a cset that you pushed to hg-crew: I had installed mercurial-1.4.1_124_c31ac3f7fd8f (I installed that on 2009-12-31): changeset: 10154:c31ac3f7fd8f user: Steve Borho <st...@borho.org> date: Tue Dec 29 23:59:41 2009 -0600 summary: windows: expand environment vars in find_exe I just installed mercurial-1.4.2_21_843f6ee6d14b now. >> If I want to run from the sources, I rename C:\Program >> Files\TortoiseHg\hgtk.exe >> to hgtk-hidden.exe and have a file hgtk.cmd in that directory containing the >> line >> >> python C:\Users\adi\hgrepos\thg-default\hgtk %* >> >> This used to work together with >> >> <snip> >> [extdiff] >> cmd.vdiff = C:\Program Files\TortoiseHg\kdiff3 >> #opts.vdiff = $parent1 $child $parent2 >> </snip> >> >> in C:\users\adi\Mercurial.ini > > I pushed a fix for this extdiff parsing bug. Much better now using a10ecd84c171, thanks (even works with original mercurial-1.4.1_124_c31ac3f7fd8f). But I still need [extdiff] cmd.vdiff = C:\Program Files\TortoiseHg\kdiff3 in C:\users\adi\Mercurial.ini to run hgtk from sources (as before 04cbc9485753). But at least it now works as before 04cbc9485753. ------------------------------------------------------------------------------ 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 Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss