[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn/ksvnd
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-06 15:35:51
Message-ID: 1115393751.899118.8051.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 410062 by marchand:

ok this time it should do what we want ;)
=> better handling/check of directories (a directory can be a toplevel working copy \
by itself, or a subdir of a working copy)



 M  +28 -4     trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp  


--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #410061:410062
@@ -55,32 +55,56 @@
 
 bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) {
 	for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it \
                ) {
-		if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" \
) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) \
) +		kdDebug( 7128 ) << "Checking file " << ( *it ) << endl;
+		QDir bdir ( ( *it ).path() );
+		if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 			return true;
+		} else if ( !bdir.exists() ) {
+			if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + \
"/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it \
).directory()+"/.svn/dir-props" ) ) +				return true;
+		}
 	}
 	return false;
 }
 
 bool KSvnd::AreAnyFilesNotInSvn( const KURL::List& wclist ) {
 	for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it \
                ) {
-		if ( !isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + \
"/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it \
).directory()+"/.svn/dir-props" ) ) +		kdDebug( 7128 ) << "Checking file " << ( *it ) \
<< endl; +		QDir bdir ( ( *it ).path() );
+		if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 			return true;
+		} else if ( !bdir.exists() ) {
+			if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + \
"/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it \
).directory()+"/.svn/dir-props" ) )  +				return true;
+		}
 	}
 	return false;
 }
 
 bool KSvnd::AreAllFilesInSvn( const KURL::List& wclist ) {
 	for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it \
                ) {
-		if ( !isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + \
"/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it \
).directory()+"/.svn/dir-props" )  ) +		kdDebug( 7128 ) << "Checking file " << ( *it \
) << endl; +		QDir bdir ( ( *it ).path() );
+		if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 			return false;
+		} else if ( !bdir.exists() ) {
+			if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + \
"/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it \
).directory()+"/.svn/dir-props" )  ) +				return false;
+		}
 	}
 	return true;
 }
 
 bool KSvnd::AreAllFilesNotInSvn( const KURL::List& wclist ) {
 	for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it \
                ) {
-		if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" \
) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) \
) +		kdDebug( 7128 ) << "Checking file " << ( *it ) << endl;
+		QDir bdir ( ( *it ).path() );
+		if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) {
 			return false;
+		} else if ( !bdir.exists() ) {
+			if ( isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" \
) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) \
) +				return false;
+		}
 	}
 	return true;
 }


[prev in list] [next in list] [prev in thread] [next in thread]