Author: rhuijben Date: Mon May 9 21:42:14 2011 New Revision: 1101235 URL: http://svn.apache.org/viewvc?rev=1101235&view=rev Log: Stop handling an old entry error message that will never be returned from our new apis.
* subversion/libsvn_client/status.c (svn_client_status5): SVN_ERR_WC_MISSING won't be returned... ever. * subversion/libsvn_wc/update_editor.c (open_root): Just check the result of the function instead of performing a db call. Modified: subversion/trunk/subversion/libsvn_client/status.c subversion/trunk/subversion/libsvn_wc/update_editor.c Modified: subversion/trunk/subversion/libsvn_client/status.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1101235&r1=1101234&r2=1101235&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/status.c (original) +++ subversion/trunk/subversion/libsvn_client/status.c Mon May 9 21:42:14 2011 @@ -294,18 +294,7 @@ svn_client_status5(svn_revnum_t *result_ svn_node_kind_t kind, disk_kind; SVN_ERR(svn_io_check_path(target_abspath, &disk_kind, pool)); - err = svn_wc_read_kind(&kind, ctx->wc_ctx, target_abspath, FALSE, pool); - - if (err && (err->apr_err == SVN_ERR_WC_MISSING)) - { - /* Calling code expects SVN_ERR_WC_NOT_WORKING_COPY. */ - svn_error_clear(err); - return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, - _("'%s' is not a working copy"), - svn_dirent_local_style(path, pool)); - } - else if (err) - return err; + SVN_ERR(svn_wc_read_kind(&kind, ctx->wc_ctx, target_abspath, FALSE, pool)); /* Dir must be an existing directory or the status editor fails */ if (kind == svn_node_dir && disk_kind == svn_node_dir) Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1101235&r1=1101234&r2=1101235&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon May 9 21:42:14 2011 @@ -953,25 +953,18 @@ open_root(void *edit_baton, SVN_ERR(make_dir_baton(&db, NULL, eb, NULL, FALSE, pool)); *dir_baton = db; - SVN_ERR(svn_wc__db_read_kind(&kind, eb->db, db->local_abspath, TRUE, pool)); + err = already_in_a_tree_conflict(&already_conflicted, eb->db, + db->local_abspath, pool); - if (kind == svn_wc__db_kind_dir) + if (err) { - err = already_in_a_tree_conflict(&already_conflicted, eb->db, - db->local_abspath, pool); + if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND) + return svn_error_return(err); - if (err && err->apr_err == SVN_ERR_WC_MISSING) - { - svn_error_clear(err); - already_conflicted = FALSE; - } - else - SVN_ERR(err); + svn_error_clear(err); + already_conflicted = FALSE; } - else - already_conflicted = FALSE; - - if (already_conflicted) + else if (already_conflicted) { db->skip_this = TRUE; db->already_notified = TRUE;