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 2011/08/10 15:26:14 UTC
svn commit: r1156173 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/merge.c libsvn_wc/node.c
Author: rhuijben
Date: Wed Aug 10 13:26:13 2011
New Revision: 1156173
URL: http://svn.apache.org/viewvc?rev=1156173&view=rev
Log:
Remove an unused argument from a working copy library function that has just
one user.
* subversion/include/private/svn_wc_private.h
(svn_wc__check_for_obstructions): Remove conflicted argument.
* subversion/libsvn_client/merge.c
(svn_wc__check_for_obstructions): Update caller.
* subversion/libsvn_wc/node.c
(svn_wc__check_for_obstructions): Remove conflicted argument and the code
to generate its value.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1156173&r1=1156172&r2=1156173&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed Aug 10 13:26:13 2011
@@ -1010,9 +1010,6 @@ svn_wc__get_not_present_descendants(cons
* If DELETED is not NULL, set *DELETED to TRUE if the node is marked as
* deleted in the working copy.
*
- * If CONFLICTED is not NULL, set *CONFLICTED to TRUE if the node is somehow
- * conflicted.
- *
* All output arguments except OBSTRUCTION_STATE can be NULL to ommit the
* result.
*
@@ -1023,7 +1020,6 @@ svn_wc__check_for_obstructions(svn_wc_no
svn_node_kind_t *kind,
svn_boolean_t *added,
svn_boolean_t *deleted,
- svn_boolean_t *conflicted,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_boolean_t no_wcroot_check,
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1156173&r1=1156172&r2=1156173&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Aug 10 13:26:13 2011
@@ -427,7 +427,6 @@ perform_obstruction_check(svn_wc_notify_
kind,
added,
deleted,
- NULL,
wc_ctx, local_abspath,
check_root,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1156173&r1=1156172&r2=1156173&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Wed Aug 10 13:26:13 2011
@@ -1647,7 +1647,6 @@ svn_wc__check_for_obstructions(svn_wc_no
svn_node_kind_t *kind,
svn_boolean_t *added,
svn_boolean_t *deleted,
- svn_boolean_t *conflicted,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_boolean_t no_wcroot_check,
@@ -1656,7 +1655,6 @@ svn_wc__check_for_obstructions(svn_wc_no
svn_wc__db_status_t status;
svn_wc__db_kind_t db_kind;
svn_node_kind_t disk_kind;
- svn_boolean_t conflicted_p;
svn_error_t *err;
*obstruction_state = svn_wc_notify_state_inapplicable;
@@ -1666,14 +1664,12 @@ svn_wc__check_for_obstructions(svn_wc_no
*added = FALSE;
if (deleted)
*deleted = FALSE;
- if (conflicted)
- *conflicted = FALSE;
SVN_ERR(svn_io_check_path(local_abspath, &disk_kind, scratch_pool));
err = svn_wc__db_read_info(&status, &db_kind, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, &conflicted_p, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool);
@@ -1779,17 +1775,6 @@ svn_wc__check_for_obstructions(svn_wc_no
SVN_ERR_MALFUNCTION();
}
- if (conflicted_p && (conflicted != NULL))
- {
- svn_boolean_t text_c, prop_c, tree_c;
-
- SVN_ERR(svn_wc__internal_conflicted_p(&text_c, &prop_c, &tree_c,
- wc_ctx->db, local_abspath,
- scratch_pool));
-
- *conflicted = (text_c || prop_c || tree_c);
- }
-
return SVN_NO_ERROR;
}