[GME-commit] GMESRC/GME/XmlBackEnd/SVNCode HiClient.cpp,1.2,1.3

[Log messages of CVS commits]

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode
In directory escher:/tmp/cvs-serv29705/SVNCode

Modified Files:
	HiClient.cpp 
Log Message:
-loading credentials from the cache (e.g. from files like C:\DocumentsAndSettings\Username\Subversion\Auth\svn.simple\o495239847529384)
with matching hostnames.

-applyLockSVN now throws if could not apply the lock onto the file


-rollback performed if checkout fails (SVN, CC, SS) during operation




CVS User: Zoltan Molnar, ISIS (zolmol)

Index: HiClient.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/HiClient.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HiClient.cpp	13 Feb 2008 18:54:57 -0000	1.2
--- HiClient.cpp	15 Feb 2008 21:06:43 -0000	1.3
***************
*** 84,87 ****
--- 84,101 ----
  	for( ClientUtil::InfoHelp::InfoVecConIter it = inf.begin(), en = inf.end(); suc && it != en; ++it)
  	{
+ #if(USESERF)
+ 		if( it->m_info && it->m_info->lock && it->m_info->lock->token) // it seems that lock->token != 0 means for SERF the locked status
+ 		{ // while for neon the lock != 0 means there is lock
+ 			// locked
+ 			res = true;
+ 			
+ 			// by whom
+ 			ASSERT( it->m_info->lock->owner);
+ 			if( it->m_info->lock->owner)
+ 				p_username = it->m_info->lock->owner;
+ 			else
+ 				p_username = "";
+ 		}
+ #else // for all other cases: 'svn://', 'svn+ssh://' or 'https://' with USENEON (USENEON could be 1 or 0) this would work:
  		if( it->m_info && it->m_info->lock)
  		{
***************
*** 96,99 ****
--- 110,114 ----
  				p_username = "";
  		}
+ #endif
  	}
  
***************
*** 144,148 ****
  					msg.append( "\n\tVersioned as (URL): "); 
  					msg.append( ClientUtil::charstar2str( it->m_info->URL, "Url"));
! 					
  					if( it->m_info->lock)
  					{
--- 159,176 ----
  					msg.append( "\n\tVersioned as (URL): "); 
  					msg.append( ClientUtil::charstar2str( it->m_info->URL, "Url"));
! #if(USESERF)
! 					if( it->m_info->lock && it->m_info->lock->token)
! 					{
! 						msg.append( "\n\tLocked by "); 
! 						if( !own.empty()) own.append( ", "); // if multiple entries in inf, then separate owners by ,
! 
! 						own.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! 						msg.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! 					}
! 					else
! 						msg.append( "\n\tNot Locked");
! 
! #else // for all other cases: 'svn://', 'svn+ssh://' or 'https://' with USENEON (USENEON could be 1 or 0) this would work:
! 
  					if( it->m_info->lock)
  					{
***************
*** 155,158 ****
--- 183,187 ----
  					else
  						msg.append( "\n\tNot Locked");
+ #endif
  				}
  				else