On Fri, May 10, 2013 at 11:27 PM, Colin Caughie <[email protected]> wrote:
> On 05/10/2013 7:07 PM, Yuya Nishihara wrote:
> > On Fri, 10 May 2013 10:19:29 -0700, Colin Caughie wrote:
> >> On 5/10/2013 10:18 AM, Colin Caughie wrote:
> >>> After upgrading to TortoiseHg 2.8 I've found that diffs are no longer
> >>> shown correctly in the GUI. We use the eol extension and the
> >>> TortoiseHg doesn't seem to be honoring it. If I make a single-line
> >>> change to any file and try to look at the diff in the Working
> >>> Directory View, it appears that the entire file has changed; opening
> >>> the diff using WinMerge reveals that Tortoise is comparing the
> >>> untranslated file with LF endings with the translated working file
> >>> with CRLF endings.
> >>>
> >>> Is there anything I need to configure to work around this or should I
> >>> raise a bug?
> >>>
> >> I should have said - the problem is definitely with TortoiseHg and not
> >> with Mercurial itself. If I do "hg diff" on the command line it gives
> >> the correct result.
> > Hi,
> >
> > It may be the same issue as #588, but I cannot reproduce.
> >
> > https://bitbucket.org/tortoisehg/thg/issue/588/
> >
> > Could you test with all extensions disabled, except for eol which is
> enabled
> > globally.
> >
> > Regards,
> Hi Yuya,
>
> Thanks for the reply. It does look like 558 - I restarted the workbench
> and it stopped happening. It may indeed be related to configuration
> changes as Steve suggested in his most recent comment on the issue - I
> have been changing my config file lately. But I tried doing so again
> just now and couldn't reproduce the issue.
>
I've taken another look at this and I believe the problem would be resolved
if thg allocated an entirely new repo object when a configuration change is
detected. This triggers reposetup() being called for each loaded extension
and this will properly initialize repo.ui (just calling uisetup would not
be enough).
This may not be feasible until Yuya refactors our thgrepo object, and even
then I shiver at the thought of all the various repo references we keep all
over the thg dialogs.
--
Steve Borho
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
