On the remote-only-status branch: Restore whitespace and formatting
in parts of the implementation that ended up being the same as
on trunk.
No functional change.
* subversion/libsvn_wc/status.c (get_dir_status): Remove empty line.
* subversion/libsvn_wc/wc_db.c
(get_info_for_copy, remove_node_txn,
read_info, relocate_txn, svn_wc__db_node_hidden): Restore formatting.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/remote-only-status@1586058 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_wc/status.c b/subversion/libsvn_wc/status.c
index 57de36b..4fc76fa 100644
--- a/subversion/libsvn_wc/status.c
+++ b/subversion/libsvn_wc/status.c
@@ -1335,7 +1335,6 @@
sorted_children = svn_sort__hash(all_children,
svn_sort_compare_items_lexically,
scratch_pool);
-
for (i = 0; i < sorted_children->nelts; i++)
{
const void *key;
diff --git a/subversion/libsvn_wc/wc_db.c b/subversion/libsvn_wc/wc_db.c
index 6a2eb72..9275420 100644
--- a/subversion/libsvn_wc/wc_db.c
+++ b/subversion/libsvn_wc/wc_db.c
@@ -4174,8 +4174,7 @@
NULL /* have_base */,
NULL /* have_more_work */,
NULL /* have_work */,
- src_wcroot, local_relpath,
- result_pool, scratch_pool));
+ src_wcroot, local_relpath, result_pool, scratch_pool));
if (op_root)
*op_root = is_op_root;
@@ -7249,7 +7248,8 @@
SVN_ERR(read_info(&status, &kind, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- wcroot, local_relpath, scratch_pool, scratch_pool));
+ wcroot, local_relpath,
+ scratch_pool, scratch_pool));
if (status == svn_wc__db_status_normal
|| status == svn_wc__db_status_added
@@ -8415,11 +8415,9 @@
/* Obtain the most likely to exist record first, to make sure we don't
have to obtain the SQLite read-lock multiple times */
- SVN_ERR(svn_sqlite__get_statement(
- &stmt_info, wcroot->sdb,
- (lock
- ? STMT_SELECT_NODE_INFO_WITH_LOCK
- : STMT_SELECT_NODE_INFO)));
+ SVN_ERR(svn_sqlite__get_statement(&stmt_info, wcroot->sdb,
+ lock ? STMT_SELECT_NODE_INFO_WITH_LOCK
+ : STMT_SELECT_NODE_INFO));
SVN_ERR(svn_sqlite__bindf(stmt_info, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step(&have_info, stmt_info));
@@ -10832,7 +10830,8 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL,
&have_base_node, NULL, NULL,
- wcroot, local_relpath, scratch_pool, scratch_pool));
+ wcroot, local_relpath,
+ scratch_pool, scratch_pool));
if (status == svn_wc__db_status_excluded)
{
@@ -10846,7 +10845,8 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
- wcroot, parent_relpath, scratch_pool, scratch_pool));
+ wcroot, parent_relpath,
+ scratch_pool, scratch_pool));
local_dir_relpath = parent_relpath;
}
@@ -13726,7 +13726,8 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
- wcroot, local_relpath, scratch_pool, scratch_pool));
+ wcroot, local_relpath,
+ scratch_pool, scratch_pool));
*hidden = (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_not_present
