You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/20 20:09:17 UTC
svn commit: r1448353 - /subversion/trunk/subversion/libsvn_wc/node.c
Author: rhuijben
Date: Wed Feb 20 19:09:17 2013
New Revision: 1448353
URL: http://svn.apache.org/r1448353
Log:
* subversion/libsvn_wc/node.c
(convert_db_kind_to_node_kind): Use standard function.
(svn_wc__node_get_pre_ng_status_data): Improve the 'svn status' information
shown for the deletes of copies by handling the working-delete case
where we didn't show some information.
Modified:
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1448353&r1=1448352&r2=1448353&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Wed Feb 20 19:09:17 2013
@@ -273,23 +273,7 @@ convert_db_kind_to_node_kind(svn_node_ki
svn_wc__db_status_t db_status,
svn_boolean_t show_hidden)
{
- switch (db_kind)
- {
- case svn_kind_file:
- *node_kind = svn_node_file;
- break;
- case svn_kind_dir:
- *node_kind = svn_node_dir;
- break;
- case svn_kind_symlink:
- *node_kind = svn_node_file;
- break;
- case svn_kind_unknown:
- *node_kind = svn_node_unknown;
- break;
- default:
- SVN_ERR_MALFUNCTION();
- }
+ *node_kind = svn__node_kind_from_kind(db_kind);
/* Make sure hidden nodes return svn_node_none. */
if (! show_hidden)
@@ -741,13 +725,13 @@ svn_wc__node_get_pre_ng_status_data(svn_
NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool));
- else
- {
- /* Sorry, we need a function to peek below the current working and
- the BASE layer. And we don't have one yet.
-
- ### Better to report nothing, than the wrong information */
- }
+ else if (status == svn_wc__db_status_deleted)
+ /* Check the information below a WORKING delete */
+ SVN_ERR(svn_wc__db_read_pristine_info(NULL, NULL, changed_rev,
+ changed_date, changed_author, NULL,
+ NULL, NULL, NULL, NULL,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool));
return SVN_NO_ERROR;
}