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

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn
From:       Mickael Marchand <marchand () kde ! org>
Date:       2009-02-05 17:34:31
Message-ID: 1233855271.789529.11934.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 921795 by marchand:

don't fire finished() when error() was used

 M  +46 -40    svn.cpp  
 M  +1 -1      svnhelper/kio_svn_helper.cpp  


--- trunk/KDE/kdesdk/kioslave/svn/svn.cpp #921794:921795
@@ -532,11 +532,10 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_copy(&commit_info, srcsvn.toUtf8(), &rev, \
                destsvn.toUtf8(), ctx, subpool);
-	if ( err ) {
+	if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-	}
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -560,11 +559,10 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
-	if ( err ) {
+	if ( err )
 		error( KIO::ERR_COULD_NOT_MKDIR, err->message );
-	}
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -583,11 +581,10 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
-	if ( err ) {
+	if ( err )
 		error( KIO::ERR_COULD_NOT_MKDIR, err->message );
-	}
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -606,11 +603,10 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_delete(&commit_info,targets,false/*force remove \
                locally modified files in wc*/,ctx,subpool);
-	if ( err ) {
+	if ( err )
 		error( KIO::ERR_CANNOT_DELETE, err->message );
-	}
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -652,11 +648,10 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_move(&commit_info, srcsvn.toUtf8(), &rev, \
                destsvn.toUtf8(), false/*force remove locally modified files in wc*/, \
                ctx, subpool);
-	if ( err ) {
+	if ( err )
 		error( KIO::ERR_CANNOT_RENAME, err->message );
-	}
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -931,8 +926,11 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_diff (options, path1, &revision1, path2, &revision2, \
                recurse, false, true, outfile, NULL, ctx, subpool);
-	if ( err )
+	if ( err ) {
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		svn_pool_destroy (subpool);
+		return;
+	}
 	//read the content of the outfile now
 	QStringList tmp;
 	apr_file_close(outfile);
@@ -979,8 +977,8 @@
 	svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, \
recurse, ctx, subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -995,12 +993,17 @@
 
 	svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool );
 
+//	apr_array_header_t *targets = apr_array_make(subpool, 1, sizeof(const char *));
+//	const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( \
target.toUtf8() , subpool ) ); +//	(*(( const char ** )apr_array_push(( \
apr_array_header_t* )targets)) ) = _target; +
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_update (NULL, svn_path_canonicalize( target.toUtf8(), \
subpool ), &rev, true, ctx, subpool); +//	svn_error_t *err = svn_client_update2 \
(NULL, targets, &rev, true, false, ctx, subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1027,8 +1030,8 @@
 	svn_error_t *err = \
svn_client_import(&commit_info,path,url,nonrecursive,ctx,subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1051,8 +1054,8 @@
 	svn_error_t *err = svn_client_checkout (NULL/* rev actually checkedout */, \
svn_path_canonicalize( target.toUtf8(), subpool ), svn_path_canonicalize ( \
dpath.toUtf8(), subpool ), &rev, true, ctx, subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1074,8 +1077,11 @@
 
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = \
                svn_client_commit(&commit_info,targets,nonrecursive,ctx,subpool);
-	if ( err )
+	if ( err ) {
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		svn_pool_destroy (subpool);
+		return;
+	}
 
 	if ( commit_info ) {
 		for ( QList<KUrl>::const_iterator it = wc.begin(); it != wc.end() ; ++it ) {
@@ -1116,8 +1122,8 @@
 	svn_error_t *err = svn_client_add(svn_path_canonicalize( nurl.path().toUtf8(), \
subpool ),nonrecursive,ctx,subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1142,8 +1148,8 @@
 
 	if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1166,8 +1172,8 @@
 	svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool);
 	if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1188,8 +1194,8 @@
 	svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( \
nurl.path().toUtf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, \
getAll, checkRepos, no_ignore, ctx, subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
@@ -1554,8 +1560,8 @@
 	svn_error_t *err = svn_client_resolved(svn_path_canonicalize( nurl.path().toUtf8(), \
subpool ), recurse,ctx,subpool);  if ( err )
 		error( KIO::ERR_SLAVE_DEFINED, err->message );
-
-	finished();
+	else
+		finished();
 	svn_pool_destroy (subpool);
 }
 
--- trunk/KDE/kdesdk/kioslave/svn/svnhelper/kio_svn_helper.cpp #921794:921795
@@ -252,7 +252,7 @@
 		connect( job, SIGNAL( result( KJob * ) ), this, SLOT( slotResult( KJob * ) ) );
 		KIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("R")) {
-		kDebug(7128) << "rename TODO " << list;
+		kDebug(7128) << "rename/move TODO " << list;
 	} else if (args->isSet("C")) {
 		kDebug(7128) << "checkout " << list;
 		SubversionCheckoutDialog d;


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