On Thu, 06 Jan 2005 12:45:09 +0000, Will Dean <svn@indcomp.co.uk> wrote:
> At 13:26 06/01/2005 +0100, you wrote:
>
> >That's what I mean: I don't want to disable the menu if it's a clean
> >add - TMerge can handle non-existing files and just shows an empty
> >file on the left and the added file on the right. Maybe other visual
> >diff tool can do that too - or they will be able to do so one day.
>
> I'm lost now! Isn't that exactly what the OP's patch did? Anyway, I'll
> leave it to you.
Hmm - almost, yes. I didn't realize that TMerge can handle that
because I have tested it with WinMerge (I'm currently testing some
other things so I just had set it up that way).
Tha patch sent earlier activates the context menu in the explorer. But
if we allow diffs of added files then we also have to enable them in
all the other places too (CSVNStatusListCtrl, ...).
> >If you remember: it was you who created the function GetCachedItem()
> >for speed reasons: that way we can prevent a call to PathIsFolder if
> >the item already is in the cache. Only if it's not in the cache, then
> >we have to call that.
>
> Oops! I don't think that's a great improvement now. I didn't understand
> the code very well then.
>
> With hindsight, it would have been better just to move the
>
> BOOL bHasAdminDir = g_ShellCache.HasSVNAdminDir(filepath, bIsFolder);
>
> //no overlay for unversioned folders
> if ((!bColumnProvider)&&(!bHasAdminDir))
> return &invalidstatus;
>
> bit below the cache lookup in GetFullStatus.
>
> I don't think having the cache-lookup in its own function is a bad idea,
> especially as it's got more complicated.
I'll check what I can do here. Just don't expect it to be done today -
have some errands to run...
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 6 14:05:43 2005