[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Possible Bug in Working Copy Detection for root directories?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-17 18:30:11 CET

Will Dean wrote:
> At 18:17 17/01/2005 +0100, you wrote:
>
>> Fixed in revision 2464.
>
>
> Thanks! I *did* look at it, but I couldn't see anything obvious.
>
> I shall be interested to see the changes...
>
Author: steveking
Date: Mon Jan 17 11:11:20 2005
New Revision: 2464

Modified:
    trunk/src/SVN/SVNFolderStatus.cpp
Log:
Fix broken status cache for SUBST'ed drives where a working copy was
located in that drive root.

Modified: trunk/src/SVN/SVNFolderStatus.cpp
Url:
http://svn.collab.net/viewcvs/tortoisesvn/trunk/src/SVN/SVNFolderStatus.cpp?view=diff&rev=2464&p1=trunk/src/SVN/SVNFolderStatus.cpp&r1=2463&p2=trunk/src/SVN/SVNFolderStatus.cpp&r2=2464
==============================================================================
--- trunk/src/SVN/SVNFolderStatus.cpp (original)
+++ trunk/src/SVN/SVNFolderStatus.cpp Mon Jan 17 11:11:20 2005
@@ -233,6 +233,23 @@
                  m_mostRecentPath = filepath;
                  m_mostRecentStatus = ret;
          }
+ else
+ {
+ // for SUBST'ed drives, Subversion doesn't return a path with a backslash
+ // e.g. G:\ but only G: when fetching the status. So search for that
+ // path too before giving up.
+ // This is especially true when right-clicking directly on a SUBST'ed
+ // drive to get the context menu
+ if (_tcslen(filepath)==3)
+ {
+ if ((iter = m_cache.find(pathbuf)) != m_cache.end())
+ {
+ ret = &iter->second;
+ m_mostRecentPath = filepath;
+ m_mostRecentStatus = ret;
+ }
+ }
+ }
          ClearPool();
          if (ret)
                  return ret;

-- 
        ___
   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 Mon Jan 17 18:31:14 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.